尝试修复客户端崩溃问题

also config for join message

LICENSE

@@ -1 +1,21 @@
-This mod and its source code is now in public domain. Feel free to do whatever you want with it; make forks, distribute it... whatever I would appreciate it, of course, if you credited me 😊 Thank you!
+MIT License
+
+Copyright (c) 2023 CinemaMod Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,15 +1,25 @@
-# WebDisplays for Minecraft 1.19.2
-This is a fork of the Web Displays mod from 1.12, updated to work on 1.19, and with some bug fixes and reworking.
+# WebDisplays
+WebDisplays is a mod for creating and interacting with web browsers in Minecraft. You can create screens in your world and browse the internet.
 
-### Wiki
-* The Wiki that details all blocks/items can be found on my website https://montoyo.net/wdwiki/
+WebDisplays was originally written by montoyo. It is currently maintained by CinemaMod Group.
 
-### Delayed things
-* Plugin API
-* The Shop
-* CC Interface, if CC gets updated...
-* Center camera to screen when using keyboard
-* minePad management: check GuiContainer.draggedStack for minePad
-* In-game command to add/remove blacklisted domains
-* Config: RPMP (Real pixels per Minecraft pixels)
-* Disable miniserv in solo
+Discussion: https://discord.gg/rNrh5kW8Ty
+
+## Install
+Download WebDisplays from either:
+- CurseForge: https://legacy.curseforge.com/minecraft/mc-mods/webdisplays
+- Modrinth: https://modrinth.com/mod/webdisplays
+
+**WebDisplays Requires MCEF!** You must install MCEF in order for WebDisplays to work.
+
+Download MCEF from either:
+- CurseForge: https://legacy.curseforge.com/minecraft/mc-mods/mcef
+- Modrinth: https://modrinth.com/mod/mcef
+
+<img src='https://github.com/CinemaMod/webdisplays/assets/30220598/2acfd365-fa87-4adb-970a-33bb5c79f7ba' width='500'>
+<img src='https://github.com/CinemaMod/webdisplays/assets/30220598/4e9985a3-d09f-4ab4-8016-37733d4f4a99' width='500'>
+
+## Wiki
+[Outdated Wiki from the original creator](https://montoyo.net/wdwiki/index.php?title=Main_Page)
+
+[Outdated Getting Started](https://montoyo.net/wdwiki/index.php?title=Screen)

TODO.md

@@ -0,0 +1,12 @@
+### Delayed things
+* Plugin API
+* Center camera to screen when using keyboard
+  * Allow actual cursor to be used via aiming it at the screen
+  * maybe aim at the focused element instead of the center of the screen, depends on if that information can be extracted
+* minePad management: check GuiContainer.draggedStack for minePad
+* In-game command to add/remove blacklisted domains
+* CC Interface (for when it's actually possible, since the screens are client only currently, but a config option is planned to change that)
+* Redstone controls (same reason as CC interface)
+* Potentially redo minisrv logic?
+  * Perhaps hook it up to vanilla networking
+  * Maybe don't use it at all in single player

build.gradle

@@ -1,140 +1,179 @@
 plugins {
-    id 'eclipse'
+    id 'java'
+    id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
-    id 'org.spongepowered.mixin' version '0.7.+'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'net.neoforged.moddev.legacyforge' version '2.0.103'
 }
 
-version = mod_version
-group = maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = archives_base_name
+// Only add ProGuard if building with it
+def enableProguard = project.hasProperty("enableProguard") && project.enableProguard.toBoolean()
+if (enableProguard) {
+    buildscript {
+        repositories {
+            mavenCentral()
+        }
+        dependencies {
+            classpath 'com.guardsquare:proguard-gradle:7.7.0'
+        }
+    }
+}
+
+base {
+    archivesName = mod_id
+}
+
+group = mod_group_id
+version = "${minecraft_version}-${mod_version}"
+
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-minecraft {
-    mappings channel: 'official', version: '1.19.2'
+println "Java: ${System.getProperty 'java.version'}"
 
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+repositories {
+    mavenCentral()
+    maven { url = "https://libraries.minecraft.net/" }
+    maven { url = "https://cursemaven.com" }
+    maven { url = "https://maven.parchmentmc.org" }
+    maven { url = 'https://mcef-download.cinemamod.com/repositories/releases/' }
+    maven { url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/" }
+    maven { url = "https://maven.theillusivec4.top/" }
+    maven { url = "https://repo.lucko.me/" }
+    maven { url = "https://maven.kosmx.dev/" }
+    maven { url = "https://modmaven.dev" }
+    flatDir { dir "libs" }
+}
+
+legacyForge {
+    version = "${minecraft_version}-${forge_version}"
+
+    // Access transformer
+    accessTransformers = files("src/main/resources/META-INF/accesstransformer.cfg")
+
+    // Parchment mappings
+    parchment {
+        minecraftVersion = minecraft_version
+        mappingsVersion = mapping_lasting_version
+    }
 
     runs {
-        client {
-            properties 'mixin.env.remapRefMap': 'true'
-            property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
-            workingDirectory project.file('run')
-            arg "-mixin.config=webdisplays.mixins.json"
-            property 'forge.logging.console.level', 'debug'
+        configureEach {
+            systemProperty 'forge.logging.console.level', 'debug'
+            logLevel = org.slf4j.event.Level.DEBUG
+        }
 
-            mods {
-                webdisplays {
-                    source sourceSets.main
-                }
-            }
+        client {
+            client()
+            programArgument "-mixin.config=${mod_id}.mixins.json"
+            systemProperty 'mixin.debug.export', 'true'
         }
 
         server {
-            properties 'mixin.env.remapRefMap': 'true'
-            property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
-            workingDirectory project.file('run')
-            arg "-mixin.config=webdisplays.mixins.json"
-
-
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                webdisplays {
-                    source sourceSets.main
-                }
-            }
+            server()
+            programArgument "-mixin.config=${mod_id}.mixins.json"
         }
 
         data {
-            workingDirectory project.file('run')
-            properties 'mixin.env.remapRefMap': 'true'
-            property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'webdisplays', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0]
-            mods {
-                webdisplays {
-                    source sourceSets.main
-                }
-            }
+            data()
+            programArguments.addAll '--mod', mod_id, '--all',
+                    '--output', file('src/generated/resources/').absolutePath,
+                    '--existing', file('src/main/resources/').absolutePath
+        }
+    }
+
+    mods {
+        "${mod_id}" {
+            sourceSet sourceSets.main
         }
     }
 }
 
-repositories{
-    maven { url "https://maven.shedaniel.me/" }
-    maven { url 'https://jitpack.io' }
-    maven {
-        name = "cursemaven"
-        url = "https://www.cursemaven.com"
-    }
-    flatDir { dirs 'libs' }
+sourceSets.main.resources {
+    srcDir 'src/generated/resources'
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.2-43.2.10'
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    
-    implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:2ec6581622")
-    implementation fg.deobf("curse.maven:SU-370704:4485052")
-    implementation fg.deobf("curse.maven:spark-361579:4381167")
+    // MCEF dependency
+    modImplementation("com.cinemamod:mcef-forge:2.1.1-1.20.1") {
+        transitive = false
+    }
 
-//    implementation fg.deobf("flatdir.lib:mcef:1.2.4")
-//    implementation fg.deobf("flatdir.lib:smallerunits:2.1.3")
+    // Optional mods (make sure versions exist)
+    modRuntimeOnly "curse.maven:spark-361579:4738952"
+    modCompileOnly "curse.maven:vivecraft-667903:4794431"
+    modImplementation "software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}"
+    modCompileOnly "top.theillusivec4.curios:curios-forge:${curios_version}:api"
+    modRuntimeOnly "top.theillusivec4.curios:curios-forge:${curios_version}"
 
-    compileOnly fg.deobf("curse.maven:vivecraft-667903:4409427")
+    // Mixin Extras
+    compileOnly annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1")
+    modImplementation "io.github.llamalad7:mixinextras-forge:0.4.1"
 }
 
-sourceSets {
-    main.resources.srcDirs += 'src/generated/resources'
-}
-
-// Example for how to get properties into the manifest for reading by the runtime..
-jar {
+tasks.named('jar', Jar) {
     manifest {
         attributes([
-                "Specification-Title": "webdisplays",
-                "Specification-Vendor": "webdisplays",
-                "Specification-Version": "1", // We are version 1 of ourselves
-                "Implementation-Title": project.name,
-                "Implementation-Version": "${version}",
-                "Implementation-Vendor" :"webdisplays",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                "MixinConfigs": "webdisplays.mixins.json"
+                'Specification-Title': mod_name,
+                'Specification-Vendor': mod_authors,
+                'Specification-Version': '1',
+                'Implementation-Title': project.name,
+                'Implementation-Version': project.version,
+                'Implementation-Vendor': mod_authors,
+                'MixinConfigs': "${mod_id}.mixins.json"
         ])
     }
+
+    // Exclude ProGuard renamed files if ProGuard is used
+    if (enableProguard) {
+        exclude 'META-INF/versions/**'
+    }
 }
 
-// Example configuration to allow publishing using the maven-publish task
-// we define a custom artifact that is sourced from the reobfJar output task
-// and then declare that to be published
-// Note you'll need to add a repository here
-def reobfFile = file("$buildDir/reobfJar/output.jar")
-def reobfArtifact = artifacts.add('default', reobfFile) {
-    type 'jar'
-    builtBy 'reobfJar'
+// Generate sources jar
+tasks.register('sourcesJar', Jar) {
+    dependsOn classes
+    archiveClassifier = 'sources'
+    from sourceSets.main.allSource
 }
+
+// Reobfuscation handling
+tasks.named('reobfJar') {
+    if (enableProguard) {
+        dependsOn 'proguard'
+        input = file("${buildDir}/libs/${mod_id}-${minecraft_version}-${mod_version}-proguard.jar")
+    } else {
+        dependsOn 'jar'
+        input = tasks.jar.archiveFile.get().asFile
+    }
+}
+
+// ProGuard configuration (if enabled)
+if (enableProguard) {
+    tasks.register('proguard', proguard.gradle.ProGuardTask) {
+        dependsOn tasks.jar
+        configuration 'proguard.pro'
+
+        libraryjars "${System.getProperty('java.home')}/jmods"
+
+        def inputJar = tasks.jar.archiveFile.get().asFile
+        injars inputJar
+        outjars "${buildDir}/libs/${mod_id}-${minecraft_version}-${mod_version}-proguard.jar"
+    }
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact reobfArtifact
+            artifactId = mod_id
+            artifact reobfJar
+            artifact sourcesJar
         }
     }
+
     repositories {
         maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
+            name = "local"
+            url = layout.buildDirectory.dir("repo")
         }
     }
-}
-
-apply plugin: 'org.spongepowered.mixin'
-
-mixin {
-    add sourceSets.main, "webdisplays.refmap.json"
-}
-
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'deobf'
 }

gradle.properties

@@ -1,17 +1,36 @@
-# Done to increase the memory available to gradle.
+# Gradle settings
 org.gradle.jvmargs=-Xmx3G
-loom.platform=forge
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.caching=true
 
-# Fabric Properties
-# check these on https://fabricmc.net/develop
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.28
-loader_version=0.14.14
+# ProGuard
+enableProguard=false
 
-# Mod Properties
-mod_version = 1.3.3
-maven_group = net.montoyo.wd
-archives_base_name = webdisplays
+# Mod properties
+mod_id=webdisplays
+mod_name=WebDisplays
+mod_version=2.0.3
+mod_group_id=com.cinemamod
+mod_authors=CinemaMod Group
+mod_description=Web browser displays for Minecraft
+mod_license=All Rights Reserved
+mod_credits=CinemaMod Group
 
-# Dependencies
-forge_version=1.19.2-43.2.6
+# Minecraft/Forge versions
+minecraft_version=1.20.1
+forge_version=47.3.4
+minecraft_version_range=[1.20.1,1.21)
+forge_version_range=[47,)
+loader_version_range=[47,)
+
+# Parchment mappings
+mapping_channel=parchment
+mapping_version=2023.09.03-1.20.1
+mapping_lasting_version=2023.09.03
+
+# Other mod versions
+jei_version=15.20.0.112
+player_anim_version=1.0.2-rc1+1.20
+geckolib_version=4.2.1
+curios_version=5.5.0+1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip

settings.gradle

@@ -1,20 +1,11 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
-    }
-    resolutionStrategy {
-        eachPlugin {
-            switch (requested.id.toString()) {
-                case "net.minecraftforge.gradle": {
-                    useModule("${requested.id}:ForgeGradle:${requested.version}")
-                    break
-                }
-                case "org.spongepowered.mixin": {
-                    useModule("org.spongepowered:mixingradle:${requested.version}")
-                    break;
-                }
-            }
-        }
+        maven { url = 'https://maven.neoforged.net/releases' }
+        maven { url = 'https://maven.parchmentmc.org' } // Add this line
     }
+}
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }

src/main/java/net/montoyo/wd/SharedProxy.java

@@ -4,6 +4,7 @@
 
 package net.montoyo.wd;
 
+import com.cinemamod.mcef.MCEF;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;
@@ -13,15 +14,21 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.network.NetworkEvent;
 import net.minecraftforge.server.ServerLifecycleHooks;
-import net.montoyo.mcef.api.CefInitEvent;
 import net.montoyo.wd.core.HasAdvancement;
 import net.montoyo.wd.core.JSServerRequest;
 import net.montoyo.wd.data.GuiData;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
 import net.montoyo.wd.utilities.*;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.math.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.data.Rotation;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
+import org.joml.Vector3d;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;
@@ -31,22 +38,22 @@ public class SharedProxy {
     }
 
     public void init() {
-        MinecraftForge.EVENT_BUS.addListener(this::onCefInit);
+        MCEF.scheduleForInit((cef) -> onCefInit());
     }
-    
+
     public void postInit() {
     }
-    
-    public void onCefInit(CefInitEvent event) {
+
+    public void onCefInit() {
     }
-    
+
     @Deprecated(forRemoval = true)
     public Level getWorld(ResourceKey<Level> dim) {
         return getServer().getLevel(dim);
     }
-    
+
     public BlockGetter getWorld(NetworkEvent.Context context) {
-        if (context.getSender() != null) return context.getSender().level;
+        if (context.getSender() != null) return context.getSender().level();
         return null;
     }
 
@@ -58,7 +65,7 @@ public class SharedProxy {
         Log.error("Called SharedProxy.displayGui() on server side...");
     }
 
-    public void trackScreen(TileEntityScreen tes, boolean track) {
+    public void trackScreen(ScreenBlockEntity tes, boolean track) {
     }
 
     public void onAutocompleteResult(NameUUIDPair pairs[]) {
@@ -121,4 +128,21 @@ public class SharedProxy {
     public boolean isShiftDown() {
         return false;
     }
+
+    public double distanceTo(ScreenBlockEntity tes, Vec3 position) {
+        double dist = Double.POSITIVE_INFINITY;
+        for (int i = 0; i < tes.screenCount(); i++) {
+            ScreenData scrn = tes.getScreen(i);
+
+            Vector3d pos = new Vector3d(
+                    scrn.side.right.x * scrn.size.x / 2d + scrn.size.y * scrn.side.up.x / 2d,
+                    scrn.side.right.y * scrn.size.x / 2d + scrn.size.y * scrn.side.up.y / 2d,
+                    scrn.side.right.z * scrn.size.x / 2d + scrn.size.y * scrn.side.up.z / 2d
+            ).add(tes.getBlockPos().getX(), tes.getBlockPos().getY(), tes.getBlockPos().getZ());
+
+            double dist2 = position.distanceToSqr(pos.x, pos.y, pos.z);
+            dist = Math.min(dist, dist2);
+        }
+        return dist;
+    }
 }

src/main/java/net/montoyo/wd/WebDisplays.java

@@ -38,20 +38,21 @@ import net.minecraftforge.network.PacketDistributor;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.montoyo.wd.client.ClientProxy;
+import net.montoyo.wd.client.gui.camera.KeyboardCamera;
 import net.montoyo.wd.config.ClientConfig;
 import net.montoyo.wd.config.CommonConfig;
 import net.montoyo.wd.controls.ScreenControlRegistry;
 import net.montoyo.wd.core.*;
-import net.montoyo.wd.init.BlockInit;
-import net.montoyo.wd.init.ItemInit;
-import net.montoyo.wd.init.TileInit;
 import net.montoyo.wd.miniserv.server.Server;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.client_bound.S2CMessageServerInfo;
+import net.montoyo.wd.registry.BlockRegistry;
+import net.montoyo.wd.registry.ItemRegistry;
+import net.montoyo.wd.registry.TileRegistry;
+import net.montoyo.wd.registry.WDTabs;
 import net.montoyo.wd.utilities.DistSafety;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.Util;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
+import net.montoyo.wd.utilities.serialization.Util;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -66,14 +67,6 @@ public class WebDisplays {
 
     public static SharedProxy PROXY = null;
     
-    public static final boolean cursorSupport;
-    
-    static {
-        ArtifactVersion ver = ModList.get().getModFileById("forgecef").getMods().get(0).getVersion();
-        cursorSupport = (ver.getMajorVersion() >= 1 && ver.getMinorVersion() >= 2 && ver.getIncrementalVersion() >= 4);
-    }
-    
-    public static WDCreativeTab CREATIVE_TAB;
     public static final ResourceLocation ADV_PAD_BREAK = new ResourceLocation("webdisplays", "webdisplays/pad_break");
     public static final String BLACKLIST_URL = "mod://webdisplays/blacklisted.html";
     public static final Gson GSON = new Gson();
@@ -122,13 +115,13 @@ public class WebDisplays {
             // proxies are annoying, so from now on, I'mma be just registering stuff in here
             FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientProxy::onKeybindRegistry);
             MinecraftForge.EVENT_BUS.addListener(ClientProxy::onDrawSelection);
+            MinecraftForge.EVENT_BUS.addListener(KeyboardCamera::updateCamera);
+            MinecraftForge.EVENT_BUS.addListener(KeyboardCamera::gameTick);
             ClientConfig.init();
         }
         
         CommonConfig.init();
-
-        CREATIVE_TAB = new WDCreativeTab();
-
+        
         //Criterions
         criterionPadBreak = new Criterion("pad_break");
         criterionUpgradeScreen = new Criterion("upgrade_screen");
@@ -140,9 +133,10 @@ public class WebDisplays {
         WDNetworkRegistry.init();
         SOUNDS.register(bus);
         onRegisterSounds();
-        BlockInit.init(bus);
-        ItemInit.init(bus);
-        TileInit.init(bus);
+        WDTabs.init(bus);
+        BlockRegistry.init(bus);
+        ItemRegistry.init(bus);
+        TileRegistry.init(bus);
         
         PROXY.preInit();
         
@@ -178,12 +172,12 @@ public class WebDisplays {
     }
 
     public void onRegisterSounds() {
-        registerSound("keyboard_type");
-        registerSound( "upgrade_add");
-        registerSound( "upgrade_del");
-        registerSound("screencfg_open");
-        registerSound("server");
-        registerSound("ironic");
+        soundTyping = registerSound("keyboard_type");
+        soundUpgradeAdd = registerSound("upgrade_add");
+        soundUpgradeDel = registerSound("upgrade_del");
+        soundScreenCfg = registerSound("screencfg_open");
+        soundServer = registerSound("server");
+        soundIronic = registerSound("ironic");
     }
 
     ArrayList<ResourceKey<Level>> serverStartedDimensions = new ArrayList<>();
@@ -259,10 +253,10 @@ public class WebDisplays {
 
     @SubscribeEvent
     public void onToss(ItemTossEvent ev) {
-        if(!ev.getEntity().getLevel().isClientSide) {
+        if(!ev.getEntity().level().isClientSide) {
             ItemStack is = ev.getEntity().getItem();
 
-            if(is.getItem() == ItemInit.MINEPAD.get()) {
+            if(is.getItem() == ItemRegistry.MINEPAD.get()) {
                 CompoundTag tag = is.getTag();
 
                 if(tag == null) {
@@ -280,12 +274,12 @@ public class WebDisplays {
 
     @SubscribeEvent
     public void onPlayerCraft(PlayerEvent.ItemCraftedEvent ev) {
-        if(CommonConfig.hardRecipes && ItemInit.isCompCraftItem(ev.getCrafting().getItem()) && (CraftComponent.EXTCARD.makeItemStack().is(ev.getCrafting().getItem()))) {
+        if(CommonConfig.hardRecipes && ItemRegistry.isCompCraftItem(ev.getCrafting().getItem()) && (CraftComponent.EXTCARD.makeItemStack().is(ev.getCrafting().getItem()))) {
             if((ev.getEntity() instanceof ServerPlayer && !hasPlayerAdvancement((ServerPlayer) ev.getEntity(), ADV_PAD_BREAK)) || PROXY.hasClientPlayerAdvancement(ADV_PAD_BREAK) != HasAdvancement.YES) {
                 ev.getCrafting().setDamageValue(CraftComponent.BADEXTCARD.ordinal());
 
-                if(!ev.getEntity().getLevel().isClientSide)
-                    ev.getEntity().getLevel().playSound(null, ev.getEntity().getX(), ev.getEntity().getY(), ev.getEntity().getZ(), SoundEvents.ITEM_BREAK, SoundSource.MASTER, 1.0f, 1.0f);
+                if(!ev.getEntity().level().isClientSide)
+                    ev.getEntity().level().playSound(null, ev.getEntity().getX(), ev.getEntity().getY(), ev.getEntity().getZ(), SoundEvents.ITEM_BREAK, SoundSource.MASTER, 1.0f, 1.0f);
             }
         }
     }
@@ -297,7 +291,11 @@ public class WebDisplays {
 
     @SubscribeEvent
     public void onLogIn(PlayerEvent.PlayerLoggedInEvent ev) {
-        if(!ev.getEntity().getLevel().isClientSide && ev.getEntity() instanceof ServerPlayer) {
+        if (!CommonConfig.joinMessage) {
+            return;
+        }
+
+        if(!ev.getEntity().level().isClientSide && ev.getEntity() instanceof ServerPlayer) {
             IWDDCapability cap = ev.getEntity().getCapability(WDDCapability.Provider.cap, null).orElseThrow(RuntimeException::new);
 
             if(cap.isFirstRun()) {
@@ -320,7 +318,7 @@ public class WebDisplays {
 
     @SubscribeEvent
     public void onLogOut(PlayerEvent.PlayerLoggedOutEvent ev) {
-        if(!ev.getEntity().getLevel().isClientSide)
+        if(!ev.getEntity().level().isClientSide)
             Server.getInstance().getClientManager().revokeClientKey(ev.getEntity().getGameProfile().getId());
     }
 
@@ -361,7 +359,7 @@ public class WebDisplays {
 
         if(sb.toString().equals("ironic he could save others from death but not himself")) {
             Player ply = ev.getPlayer();
-            ply.getLevel().playSound(null, ply.getX(), ply.getY(), ply.getZ(), soundIronic, SoundSource.PLAYERS, 1.0f, 1.0f);
+            ply.level().playSound(null, ply.getX(), ply.getY(), ply.getZ(), soundIronic, SoundSource.PLAYERS, 1.0f, 1.0f);
         }
     }
 
@@ -386,11 +384,12 @@ public class WebDisplays {
 
     public static DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, "webdisplays");
 
-    private static void registerSound(String resName) {
+    private static SoundEvent registerSound(String resName) {
         ResourceLocation resLoc = new ResourceLocation("webdisplays", resName);
-        SoundEvent ret = new SoundEvent(resLoc);
+        SoundEvent ret = SoundEvent.createVariableRangeEvent(resLoc);
 
         SOUNDS.register(resName, () -> ret);
+        return ret;
     }
 
     private static void registerTrigger(Criterion ... criteria) {

src/main/java/net/montoyo/wd/block/KeyboardBlockLeft.java

@@ -26,14 +26,13 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.network.PacketDistributor;
 import net.montoyo.wd.core.DefaultPeripheral;
-import net.montoyo.wd.entity.TileEntityKeyboard;
+import net.montoyo.wd.entity.KeyboardBlockEntity;
 import net.montoyo.wd.item.ItemLinker;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.client_bound.S2CMessageCloseGui;
 import org.jetbrains.annotations.NotNull;
 
-public class BlockKeyboardLeft extends BlockPeripheral {
-
+public class KeyboardBlockLeft extends PeripheralBlock {
     public static final EnumProperty<DefaultPeripheral> TYPE = EnumProperty.create("type", DefaultPeripheral.class);
     public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST);
 //    public static final DirectionProperty HALF = DirectionProperty.create("facing", Direction.EAST, Direction.WEST);
@@ -47,25 +46,25 @@ public class BlockKeyboardLeft extends BlockPeripheral {
     
     private static final Property<?>[] properties = new Property<?>[] {TYPE, FACING};
 
-    public BlockKeyboardLeft() {
+    public KeyboardBlockLeft() {
         super(DefaultPeripheral.KEYBOARD);
     }
     
     // TODO: make non static (for extensibility purposes)
-    public static TileEntityKeyboard getTileEntity(BlockState state, Level world, BlockPos pos) {
-        if (state.getBlock() instanceof BlockKeyboardLeft) {
+    public static KeyboardBlockEntity getTileEntity(BlockState state, Level world, BlockPos pos) {
+        if (state.getBlock() instanceof KeyboardBlockLeft) {
             BlockEntity te = world.getBlockEntity(pos); // TODO: check?
-            if (te instanceof TileEntityKeyboard)
-                return (TileEntityKeyboard) te;
+            if (te instanceof KeyboardBlockEntity)
+                return (KeyboardBlockEntity) te;
         }
     
-        BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite()));
+        BlockPos relative = pos.relative(KeyboardBlockLeft.mapDirection(state.getValue(FACING).getOpposite()));
         BlockState ns = world.getBlockState(relative);
         
-        if (ns.getBlock() instanceof BlockPeripheral) {
+        if (ns.getBlock() instanceof PeripheralBlock) {
             BlockEntity te = world.getBlockEntity(relative); // TODO: check?
-            if (te instanceof TileEntityKeyboard)
-                return (TileEntityKeyboard) te;
+            if (te instanceof KeyboardBlockEntity)
+                return (KeyboardBlockEntity) te;
         }
         
         return null;
@@ -90,7 +89,7 @@ public class BlockKeyboardLeft extends BlockPeripheral {
     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
         double rpos = (entity.getY() - ((double) pos.getY())) * 16.0;
         if (!world.isClientSide && rpos >= 1.0 && rpos <= 2.0 && Math.random() < 0.25) {
-            TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, world, pos);
+            KeyboardBlockEntity tek = KeyboardBlockLeft.getTileEntity(state, world, pos);
             
             if (tek != null)
                 tek.simulateCat(entity);
@@ -102,7 +101,7 @@ public class BlockKeyboardLeft extends BlockPeripheral {
         if (player.getItemInHand(hand).getItem() instanceof ItemLinker)
             return InteractionResult.PASS;
         
-        TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos);
+        KeyboardBlockEntity tek = KeyboardBlockLeft.getTileEntity(state, level, pos);
         if (tek != null)
             return tek.onRightClick(player, hand);
         
@@ -120,10 +119,10 @@ public class BlockKeyboardLeft extends BlockPeripheral {
     }
     
     private static void removeRightPiece(BlockState state, Level world, BlockPos pos) {
-        BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING)));
+        BlockPos relative = pos.relative(KeyboardBlockLeft.mapDirection(state.getValue(FACING)));
     
         BlockState ns = world.getBlockState(relative);
-        if (ns.getBlock() instanceof BlockKeyboardRight)
+        if (ns.getBlock() instanceof KeyboardBlockRight)
             world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3);
     }
     

src/main/java/net/montoyo/wd/block/KeyboardBlockRight.java

@@ -17,39 +17,37 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
-import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.network.PacketDistributor;
 import net.montoyo.wd.core.IPeripheral;
-import net.montoyo.wd.entity.TileEntityKeyboard;
+import net.montoyo.wd.entity.KeyboardBlockEntity;
 import net.montoyo.wd.item.ItemLinker;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.client_bound.S2CMessageCloseGui;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector3i;
 import org.jetbrains.annotations.NotNull;
 
-import static net.montoyo.wd.block.BlockKeyboardLeft.KEYBOARD_AABBS;
-import static net.montoyo.wd.block.BlockPeripheral.point;
+import static net.montoyo.wd.block.KeyboardBlockLeft.KEYBOARD_AABBS;
+import static net.montoyo.wd.block.PeripheralBlock.point;
 
 // TODO: merge into KeyboardLeft
-public class BlockKeyboardRight extends Block implements IPeripheral {
-
+public class KeyboardBlockRight extends Block implements IPeripheral {
     public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 
-    public BlockKeyboardRight() {
-        super(Properties.of(Material.STONE)
+    public KeyboardBlockRight() {
+        super(Properties.copy(Blocks.STONE)
                 .strength(1.5f, 10.f));
     }
     
     private static void removeLeftPiece(BlockState state, Level world, BlockPos pos) {
-        BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite()));
+        BlockPos relative = pos.relative(KeyboardBlockLeft.mapDirection(state.getValue(FACING).getOpposite()));
         
         BlockState ns = world.getBlockState(relative);
-        if (ns.getBlock() instanceof BlockKeyboardLeft)
+        if (ns.getBlock() instanceof KeyboardBlockLeft)
             world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3);
     }
     
@@ -84,7 +82,7 @@ public class BlockKeyboardRight extends Block implements IPeripheral {
 
     @Override
     public boolean connect(Level world, BlockPos pos, BlockState state, Vector3i scrPos, BlockSide scrSide) {
-        TileEntityKeyboard keyboard = BlockKeyboardLeft.getTileEntity(state, world, pos);
+        KeyboardBlockEntity keyboard = KeyboardBlockLeft.getTileEntity(state, world, pos);
         return keyboard != null && keyboard.connect(world, pos, state, scrPos, scrSide);
     }
     
@@ -92,7 +90,7 @@ public class BlockKeyboardRight extends Block implements IPeripheral {
     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
         double rpos = (entity.getY() - ((double) pos.getY())) * 16.0;
         if (!world.isClientSide && rpos >= 1.0 && rpos <= 2.0 && Math.random() < 0.25) {
-            TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, world, pos);
+            KeyboardBlockEntity tek = KeyboardBlockLeft.getTileEntity(state, world, pos);
 
             if (tek != null)
                 tek.simulateCat(entity);
@@ -104,7 +102,7 @@ public class BlockKeyboardRight extends Block implements IPeripheral {
         if (player.getItemInHand(hand).getItem() instanceof ItemLinker)
             return InteractionResult.PASS;
 
-        TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos);
+        KeyboardBlockEntity tek = KeyboardBlockLeft.getTileEntity(state, level, pos);
         if (tek != null)
             return tek.onRightClick(player, hand);
 

src/main/java/net/montoyo/wd/block/PeripheralBlock.java

@@ -15,33 +15,33 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.network.PacketDistributor;
-import net.montoyo.mcef.utilities.Log;
 import net.montoyo.wd.core.DefaultPeripheral;
-import net.montoyo.wd.entity.TileEntityInterfaceBase;
-import net.montoyo.wd.entity.TileEntityPeripheralBase;
-import net.montoyo.wd.entity.TileEntityServer;
+import net.montoyo.wd.entity.AbstractInterfaceBlockEntity;
+import net.montoyo.wd.entity.AbstractPeripheralBlockEntity;
+import net.montoyo.wd.entity.ServerBlockEntity;
 import net.montoyo.wd.item.ItemLinker;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.client_bound.S2CMessageCloseGui;
+import net.montoyo.wd.utilities.Log;
 import org.jetbrains.annotations.Nullable;
 
-public class BlockPeripheral extends WDBlockContainer {
+public class PeripheralBlock extends WDContainerBlock {
     DefaultPeripheral type;
 
-    public BlockPeripheral(DefaultPeripheral type) {
-        super(BlockBehaviour.Properties.of(Material.STONE).strength(1.5f, 10.f));
+    public PeripheralBlock(DefaultPeripheral type) {
+        super(BlockBehaviour.Properties.copy(Blocks.STONE).strength(1.5f, 10.f));
         this.type = type;
     }
 
@@ -49,12 +49,12 @@ public class BlockPeripheral extends WDBlockContainer {
     @Override
     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
         BlockEntityType.BlockEntitySupplier<? extends BlockEntity> cls = type.getTEClass();
-        if(cls == null)
+        if (cls == null)
             return null;
 
         try {
             return cls.create(pos, state);
-        } catch(Throwable t) {
+        } catch (Throwable t) {
             Log.errorEx("Couldn't instantiate peripheral TileEntity:", t);
         }
 
@@ -68,18 +68,18 @@ public class BlockPeripheral extends WDBlockContainer {
 
     @Override
     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-        if(player.isShiftKeyDown())
+        if (player.isShiftKeyDown())
             return InteractionResult.FAIL;
 
-        if(player.getItemInHand(hand).getItem() instanceof ItemLinker)
+        if (player.getItemInHand(hand).getItem() instanceof ItemLinker)
             return InteractionResult.FAIL;
 
         BlockEntity te = world.getBlockEntity(pos);
 
-        if(te instanceof TileEntityPeripheralBase)
-            return ((TileEntityPeripheralBase) te).onRightClick(player, hand);
-        else if(te instanceof TileEntityServer) {
-            ((TileEntityServer) te).onPlayerRightClick(player);
+        if (te instanceof AbstractPeripheralBlockEntity)
+            return ((AbstractPeripheralBlockEntity) te).onRightClick(player, hand);
+        else if (te instanceof ServerBlockEntity) {
+            ((ServerBlockEntity) te).onPlayerRightClick(player);
             return InteractionResult.SUCCESS;
         } else
             return InteractionResult.FAIL;
@@ -92,16 +92,16 @@ public class BlockPeripheral extends WDBlockContainer {
 
     @Override
     public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
-        if(world.isClientSide)
+        if (world.isClientSide)
             return;
 
-        if(placer instanceof Player) {
+        if (placer instanceof Player) {
             BlockEntity te = world.getBlockEntity(pos);
 
-            if(te instanceof TileEntityServer)
-                ((TileEntityServer) te).setOwner((Player) placer);
-            else if(te instanceof TileEntityInterfaceBase)
-                ((TileEntityInterfaceBase) te).setOwner((Player) placer);
+            if (te instanceof ServerBlockEntity)
+                ((ServerBlockEntity) te).setOwner((Player) placer);
+            else if (te instanceof AbstractInterfaceBlockEntity)
+                ((AbstractInterfaceBlockEntity) te).setOwner((Player) placer);
         }
     }
 
@@ -113,13 +113,13 @@ public class BlockPeripheral extends WDBlockContainer {
     @Override
     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block neighborType, BlockPos neighbor, boolean isMoving) {
         BlockEntity te = world.getBlockEntity(pos);
-        if(te instanceof TileEntityPeripheralBase)
-            ((TileEntityPeripheralBase) te).onNeighborChange(neighborType, neighbor);
+        if (te instanceof AbstractPeripheralBlockEntity)
+            ((AbstractPeripheralBlockEntity) te).onNeighborChange(neighborType, neighbor);
     }
 
     @Override
     public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) {
-        if(!world.isClientSide) {
+        if (!world.isClientSide) {
             WDNetworkRegistry.INSTANCE.send(PacketDistributor.NEAR.with(() -> point(world, pos)), new S2CMessageCloseGui(pos));
         }
         super.playerDestroy(world, player, pos, state, blockEntity, tool);
@@ -133,7 +133,7 @@ public class BlockPeripheral extends WDBlockContainer {
     public static PacketDistributor.TargetPoint point(Player exclude, Level world, BlockPos bp) {
         return new PacketDistributor.TargetPoint((ServerPlayer) exclude, bp.getX(), bp.getY(), bp.getZ(), 64.0, world.dimension());
     }
-    
+
     public static PacketDistributor.TargetPoint point(Level world, BlockPos bp) {
         return new PacketDistributor.TargetPoint(bp.getX(), bp.getY(), bp.getZ(), 64.0, world.dimension());
     }

src/main/java/net/montoyo/wd/block/ScreenBlock.java

@@ -13,10 +13,8 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.RenderShape;
@@ -34,64 +32,32 @@ import net.montoyo.wd.core.DefaultUpgrade;
 import net.montoyo.wd.core.IUpgrade;
 import net.montoyo.wd.core.ScreenRights;
 import net.montoyo.wd.data.SetURLData;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.init.BlockInit;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.entity.ScreenBlockEntity;
 import net.montoyo.wd.item.ItemLaserPointer;
 import net.montoyo.wd.utilities.*;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.math.Vector3f;
+import net.montoyo.wd.utilities.math.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.serialization.Util;
 import org.jetbrains.annotations.NotNull;
 
-public class BlockScreen extends BaseEntityBlock {
-
+public class ScreenBlock extends BaseEntityBlock {
     public static final BooleanProperty hasTE = BooleanProperty.create("haste");
     public static final BooleanProperty emitting = BooleanProperty.create("emitting");
     private static final Property<?>[] properties = new Property<?>[]{hasTE, emitting};
 
-    public BlockScreen(Properties properties) {
+    public ScreenBlock(Properties properties) {
         super(properties.strength(1.5f, 10.f));
         this.registerDefaultState(this.defaultBlockState().setValue(hasTE, false).setValue(emitting, false));
     }
 
-    @Override
-    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        builder.add(properties);
-    }
-
-    @Override
-    public RenderShape getRenderShape(BlockState state) {
-        return RenderShape.MODEL;
-    }
-
-    public static boolean isntScreenBlock(Level world, Vector3i pos) {
-        return world.getBlockState(pos.toBlock()).getBlock() != BlockInit.blockScreen.get();
-    }
-
-    @org.jetbrains.annotations.Nullable
-    @Override
-    public BlockState getStateForPlacement(BlockPlaceContext context) {
-        return super.getStateForPlacement(context);
-    }
-
-    @Override
-    public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor level, BlockPos currentPos, BlockPos neighborPos) {
-        return super.updateShape(state, direction, neighborState, level, currentPos, neighborPos);
-    }
-
-    public int getMetaFromState(BlockState state) {
-        int ret = 0;
-        if (state.getValue(hasTE))
-            ret |= 1;
-
-        if (state.getValue(emitting))
-            ret |= 2;
-
-        return ret;
-    }
-
     @Override
     public void onRemove(BlockState p_60515_, Level p_60516_, BlockPos p_60517_, BlockState p_60518_, boolean p_60519_) {
         // TODO: make this also get called on client?
         if (p_60518_.getBlock() == p_60515_.getBlock()) return;
-        
+
         for (BlockSide value : BlockSide.values()) {
             Vector3i vec = new Vector3i(p_60517_.getX(), p_60517_.getY(), p_60517_.getZ());
             Multiblock.findOrigin(p_60516_, vec, value, null);
@@ -118,7 +84,7 @@ public class BlockScreen extends BaseEntityBlock {
             return InteractionResult.FAIL;
         else if (heldItem.getItem() instanceof ItemLaserPointer)
             return InteractionResult.FAIL; // laser pointer already handles stuff
-        
+
         // handling the off hand leads to double clicking
         if (!isUpgrade && hand == InteractionHand.OFF_HAND)
             return InteractionResult.FAIL;
@@ -132,13 +98,13 @@ public class BlockScreen extends BaseEntityBlock {
         BlockSide side = BlockSide.values()[hit.getDirection().ordinal()];
 
         Multiblock.findOrigin(world, pos, side, null);
-        TileEntityScreen te = (TileEntityScreen) world.getBlockEntity(pos.toBlock());
+        ScreenBlockEntity te = (ScreenBlockEntity) world.getBlockEntity(pos.toBlock());
 
         if (te != null && te.getScreen(side) != null) {
-            TileEntityScreen.Screen scr = te.getScreen(side);
+            ScreenData scr = te.getScreen(side);
 
             if (sneaking) { //Right Click
-                if((scr.rightsFor(player) & ScreenRights.CHANGE_URL) == 0)
+                if ((scr.rightsFor(player) & ScreenRights.CHANGE_URL) == 0)
                     Util.toast(player, "restrictions");
                 else
                     (new SetURLData(pos, scr.side, scr.url)).sendTo((ServerPlayer) player);
@@ -170,11 +136,11 @@ public class BlockScreen extends BaseEntityBlock {
                 }
 
                 Vector2i tmp = new Vector2i();
-                
+
                 float hitX = ((float) hit.getLocation().x) - (float) te.getBlockPos().getX();
                 float hitY = ((float) hit.getLocation().y) - (float) te.getBlockPos().getY();
                 float hitZ = ((float) hit.getLocation().z) - (float) te.getBlockPos().getZ();
-                
+
                 if (hit2pixels(side, hit.getBlockPos(), new Vector3i(hit.getBlockPos()), scr, hitX, hitY, hitZ, tmp))
                     te.click(side, tmp);
                 return InteractionResult.CONSUME;
@@ -208,7 +174,7 @@ public class BlockScreen extends BaseEntityBlock {
         if (te == null) {
             BlockPos bp = pos.toBlock();
             world.setBlockAndUpdate(bp, world.getBlockState(bp).setValue(hasTE, true));
-            te = (TileEntityScreen) world.getBlockEntity(bp);
+            te = (ScreenBlockEntity) world.getBlockEntity(bp);
             created = true;
         }
 
@@ -218,94 +184,79 @@ public class BlockScreen extends BaseEntityBlock {
 
     @Override
     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block block, BlockPos source,
-    boolean isMoving){
+                                boolean isMoving) {
         if (block != this && !world.isClientSide && !state.getValue(emitting)) {
             for (BlockSide side : BlockSide.values()) {
                 Vector3i vec = new Vector3i(pos);
                 Multiblock.findOrigin(world, vec, side, null);
 
-                TileEntityScreen tes = (TileEntityScreen) world.getBlockEntity(vec.toBlock());
+                ScreenBlockEntity tes = (ScreenBlockEntity) world.getBlockEntity(vec.toBlock());
                 if (tes != null && tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) {
                     Direction facing = Direction.from2DDataValue(side.reverse().ordinal()); //Opposite face
                     vec.sub(pos.getX(), pos.getY(), pos.getZ()).neg();
-                    tes.updateJSRedstone(side, new Vector2i(vec.dot(side.right), vec.dot(side.up)), world.getSignal(pos, facing));
+//                    tes.updateJSRedstone(side, new Vector2i(vec.dot(side.right), vec.dot(side.up)), world.getSignal(pos, facing));
                 }
             }
         }
     }
     
-    public static boolean hit2pixels(BlockSide side, BlockPos bpos, Vector3i pos, TileEntityScreen.Screen scr, float hitX, float hitY, float hitZ, Vector2i dst) {
+    public static boolean hit2pixels(BlockSide side, BlockPos bpos, Vector3i pos, ScreenData scr, float hitX, float hitY, float hitZ, Vector2i dst) {
         if(side.right.x < 0)
             hitX -= 1.f;
-        
+
         if(side.right.z < 0 || side == BlockSide.TOP || side == BlockSide.BOTTOM)
             hitZ -= 1.f;
-        
-        Vector3f rel = new Vector3f(bpos.getX(), bpos.getY(), bpos.getZ());
-        rel.sub((float) pos.x, (float) pos.y, (float) pos.z);
-        rel.add(hitX, hitY, hitZ);
-        
+
+        Vector3f rel = new Vector3f(hitX, hitY, hitZ);
+
+        // this dot is acting as a "get distance from plane" where the plane is the edge of the screen
         float cx = rel.dot(side.right.toFloat()) - 2.f / 16.f;
         float cy = rel.dot(side.up.toFloat()) - 2.f / 16.f;
         float sw = ((float) scr.size.x) - 4.f / 16.f;
         float sh = ((float) scr.size.y) - 4.f / 16.f;
-        
+
         cx /= sw;
         cy /= sh;
-        
-        if(cx >= 0.f && cx <= 1.0 && cy >= 0.f && cy <= 1.f) {
-            if(side != BlockSide.BOTTOM)
+
+        if (cx >= 0.f && cx <= 1.0 && cy >= 0.f && cy <= 1.f) {
+            if (side != BlockSide.BOTTOM)
                 cy = 1.f - cy;
-            
-            switch(scr.rotation) {
+
+            switch (scr.rotation) {
                 case ROT_90:
                     cy = 1.0f - cy;
                     break;
-                
+
                 case ROT_180:
                     cx = 1.0f - cx;
                     cy = 1.0f - cy;
                     break;
-                
+
                 case ROT_270:
                     cx = 1.0f - cx;
                     break;
-                
-                default:
-                    break;
             }
-            
+
             cx *= (float) scr.resolution.x;
             cy *= (float) scr.resolution.y;
-            
-            if(scr.rotation.isVertical) {
+
+            if (scr.rotation.isVertical) {
                 dst.x = (int) cy;
                 dst.y = (int) cx;
             } else {
                 dst.x = (int) cx;
                 dst.y = (int) cy;
             }
-            
+
             return true;
         }
-        
+
         return false;
     }
 
-    @org.jetbrains.annotations.Nullable
-    @Override
-    public BlockEntity newBlockEntity (BlockPos pos, BlockState state){
-        int meta = getMetaFromState(state);
-
-        if ((meta & 1) == 0)
-            return null;
-
-        return ((meta & 1) == 0) ? null : new TileEntityScreen(pos, state);
-    }
-
     /************************************************* DESTRUCTION HANDLING *************************************************/
 
-    private void onDestroy (Level world, BlockPos pos, Player ply){
+    private void onDestroy(Level world, BlockPos pos, Player ply) {
         if (!world.isClientSide) {
             Vector3i bp = new Vector3i(pos);
             Multiblock.BlockOverride override = new Multiblock.BlockOverride(bp, Multiblock.OverrideAction.SIMULATE);
@@ -315,28 +266,28 @@ public class BlockScreen extends BaseEntityBlock {
         }
     }
 
-    private void destroySide (Level world, Vector3i pos, BlockSide side, Multiblock.BlockOverride override, Player
-    source){
+    private void destroySide(Level world, Vector3i pos, BlockSide side, Multiblock.BlockOverride override, Player
+            source) {
         Multiblock.findOrigin(world, pos, side, override);
         BlockPos bp = pos.toBlock();
         BlockEntity te = world.getBlockEntity(bp);
 
-        if (te instanceof TileEntityScreen) {
-            ((TileEntityScreen) te).onDestroy(source);
+        if (te instanceof ScreenBlockEntity) {
+            ((ScreenBlockEntity) te).onDestroy(source);
             world.setBlock(bp, world.getBlockState(bp).setValue(hasTE, false), Block.UPDATE_ALL_IMMEDIATE); //Destroy tile entity.
         }
     }
 
     @Override
-    public boolean onDestroyedByPlayer (BlockState state, Level level, BlockPos pos, Player player,
-    boolean willHarvest, FluidState fluid){
+    public boolean onDestroyedByPlayer(BlockState state, Level level, BlockPos pos, Player player,
+                                       boolean willHarvest, FluidState fluid) {
         onDestroy(level, pos, player);
         return super.onDestroyedByPlayer(state, level, pos, player, willHarvest, fluid);
     }
 
     @Override
-    public void setPlacedBy (Level world, @NotNull BlockPos pos, @NotNull BlockState
-    state, @org.jetbrains.annotations.Nullable LivingEntity whoDidThisShit, @NotNull ItemStack stack){
+    public void setPlacedBy(Level world, @NotNull BlockPos pos, @NotNull BlockState
+            state, @org.jetbrains.annotations.Nullable LivingEntity whoDidThisShit, @NotNull ItemStack stack) {
         if (world.isClientSide)
             return;
 
@@ -351,25 +302,42 @@ public class BlockScreen extends BaseEntityBlock {
         neighbors[5] = new Vector3i(pos.getX(), pos.getY(), pos.getZ() - 1);
 
         for (Vector3i neighbor : neighbors) {
-            if (world.getBlockState(neighbor.toBlock()).getBlock() instanceof BlockScreen) {
+            if (world.getBlockState(neighbor.toBlock()).getBlock() instanceof ScreenBlock) {
                 for (BlockSide bs : BlockSide.values())
                     destroySide(world, neighbor.clone(), bs, override, (whoDidThisShit instanceof Player) ? ((Player) whoDidThisShit) : null);
             }
         }
     }
 
+    /************************************************* STUFF THAT'S UNLIKELY TO BE TOUCHED BUT NEEDS TO BE HERE *************************************************/
+
     @Override
-    public @NotNull PushReaction getPistonPushReaction (BlockState state){
+    public @NotNull PushReaction getPistonPushReaction(BlockState state) {
         return PushReaction.IGNORE;
     }
 
     @Override
-    public int getSignal (BlockState state, BlockGetter level, BlockPos pos, Direction direction){
+    public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
         return state.getValue(emitting) ? 15 : 0;
     }
 
     @Override
-    public boolean isSignalSource (BlockState state){
+    public boolean isSignalSource(BlockState state) {
         return state.getValue(emitting);
     }
+
+    @Override
+    public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+        return state.getValue(hasTE) ? new ScreenBlockEntity(pos, state) : null;
+    }
+
+    @Override
+    public RenderShape getRenderShape(BlockState state) {
+        return RenderShape.MODEL;
+    }
+
+    @Override
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+        builder.add(properties);
+    }
 }

src/main/java/net/montoyo/wd/block/WDContainerBlock.java

@@ -7,11 +7,11 @@ package net.montoyo.wd.block;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.BaseEntityBlock;
 
-public abstract class WDBlockContainer extends BaseEntityBlock {
+public abstract class WDContainerBlock extends BaseEntityBlock {
 
     protected static BlockItem itemBlock;
 
-    public WDBlockContainer(Properties arg) {
+    public WDContainerBlock(Properties arg) {
         super(arg);
     }
 

src/main/java/net/montoyo/wd/block/item/KeyboardItem.java

@@ -7,48 +7,48 @@ import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.montoyo.wd.block.BlockKeyboardLeft;
-import net.montoyo.wd.init.BlockInit;
+import net.montoyo.wd.block.KeyboardBlockLeft;
+import net.montoyo.wd.registry.BlockRegistry;
 
 public class KeyboardItem extends BlockItem {
-	public KeyboardItem(Block arg, Properties arg2) {
-		super(arg, arg2);
-	}
-	
-	@Override
-	protected boolean placeBlock(BlockPlaceContext arg, BlockState arg2) {
-		Direction facing = arg.getHorizontalDirection();
-		arg2 = arg2.setValue(BlockKeyboardLeft.FACING, facing);
-		
-		Direction d = BlockKeyboardLeft.mapDirection(facing);
-		
-		if (isValid(arg.getClickedPos(), arg.getLevel(), arg2, d)) {
-			Block kbRight = BlockInit.blockKbRight.get();
-			BlockState rightState = kbRight.defaultBlockState();
-			
-			rightState = rightState.setValue(BlockKeyboardLeft.FACING, facing);
-			if (!arg.getLevel().setBlock(
-					arg.getClickedPos().relative(d),
-					rightState,
-					11
-			)) return false;
-			return arg.getLevel().setBlock(arg.getClickedPos(), arg2, 11);// 161
-		} else if (isValid(arg.getClickedPos().relative(d.getOpposite(), 2), arg.getLevel(), arg2, d)) {
-			Block kbRight = BlockInit.blockKbRight.get();
-			BlockState rightState = kbRight.defaultBlockState();
-			
-			rightState = rightState.setValue(BlockKeyboardLeft.FACING, facing);
-			if (!arg.getLevel().setBlock(
-					arg.getClickedPos(),
-					rightState,
-					11
-			)) return false;
-			return arg.getLevel().setBlock(arg.getClickedPos().relative(d.getOpposite()), arg2, 11);// 161
-		}
-		return false;
-	}
-	
-	private boolean isValid(BlockPos pos, Level level, BlockState state, Direction d) {
-		return level.getBlockState(pos.relative(d)).isAir();
-	}
+    public KeyboardItem(Block arg, Properties arg2) {
+        super(arg, arg2);
+    }
+
+    @Override
+    protected boolean placeBlock(BlockPlaceContext arg, BlockState arg2) {
+        Direction facing = arg.getHorizontalDirection();
+        arg2 = arg2.setValue(KeyboardBlockLeft.FACING, facing);
+
+        Direction d = KeyboardBlockLeft.mapDirection(facing);
+
+        if (isValid(arg.getClickedPos(), arg.getLevel(), arg2, d)) {
+            Block kbRight = BlockRegistry.blockKbRight.get();
+            BlockState rightState = kbRight.defaultBlockState();
+
+            rightState = rightState.setValue(KeyboardBlockLeft.FACING, facing);
+            if (!arg.getLevel().setBlock(
+                    arg.getClickedPos().relative(d),
+                    rightState,
+                    11
+            )) return false;
+            return arg.getLevel().setBlock(arg.getClickedPos(), arg2, 11);// 161
+        } else if (isValid(arg.getClickedPos().relative(d.getOpposite(), 2), arg.getLevel(), arg2, d)) {
+            Block kbRight = BlockRegistry.blockKbRight.get();
+            BlockState rightState = kbRight.defaultBlockState();
+
+            rightState = rightState.setValue(KeyboardBlockLeft.FACING, facing);
+            if (!arg.getLevel().setBlock(
+                    arg.getClickedPos(),
+                    rightState,
+                    11
+            )) return false;
+            return arg.getLevel().setBlock(arg.getClickedPos().relative(d.getOpposite()), arg2, 11);// 161
+        }
+        return false;
+    }
+
+    private boolean isValid(BlockPos pos, Level level, BlockState state, Direction d) {
+        return level.getBlockState(pos.relative(d)).isAir();
+    }
 }

src/main/java/net/montoyo/wd/client/JSQueryDispatcher.java

@@ -1,372 +1,370 @@
-/*
- * Copyright (C) 2018 BARBOTIN Nicolas
- */
-
-package net.montoyo.wd.client;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.montoyo.mcef.api.IBrowser;
-import net.montoyo.mcef.api.IJSQueryCallback;
-import net.montoyo.wd.block.BlockScreen;
-import net.montoyo.wd.core.DefaultUpgrade;
-import net.montoyo.wd.core.IScreenQueryHandler;
-import net.montoyo.wd.core.IUpgrade;
-import net.montoyo.wd.core.JSServerRequest;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.net.WDNetworkRegistry;
-import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
-import net.montoyo.wd.utilities.*;
-
-import java.util.*;
-
-@OnlyIn(Dist.CLIENT)
-public final class JSQueryDispatcher {
-
-    private static final class QueryData {
-
-        private final IBrowser browser;
-        private final String query;
-        private final String args;
-        private final IJSQueryCallback callback;
-
-        private QueryData(IBrowser b, String q, String a, IJSQueryCallback cb) {
-            browser = b;
-            query = q;
-            args = a;
-            callback = cb;
-        }
-
-    }
-
-    public static final class ServerQuery {
-
-        private static int lastId = 0;
-
-        private final TileEntityScreen tes;
-        private final BlockSide side;
-        private final IJSQueryCallback callback;
-        private final int id;
-
-        private ServerQuery(TileEntityScreen t, BlockSide s, IJSQueryCallback cb) {
-            tes = t;
-            side = s;
-            callback = cb;
-            id = lastId++;
-        }
-
-        public TileEntityScreen getTileEntity() {
-            return tes;
-        }
-
-        public BlockSide getSide() {
-            return side;
-        }
-
-        public TileEntityScreen.Screen getScreen() {
-            return tes.getScreen(side);
-        }
-
-        public void success(String resp) {
-            callback.success(resp);
-        }
-
-        public void error(int errId, String errStr) {
-            callback.failure(errId, errStr);
-        }
-
-    }
-
-    private final ClientProxy proxy;
-    private final ArrayDeque<QueryData> queue = new ArrayDeque<>();
-    private final ClientProxy.ScreenSidePair lookupResult = new ClientProxy.ScreenSidePair();
-    private final HashMap<String, IScreenQueryHandler> handlers = new HashMap<>();
-    private final ArrayList<ServerQuery> serverQueries = new ArrayList<>();
-    private final Minecraft mc = Minecraft.getInstance();
-
-    public JSQueryDispatcher(ClientProxy proxy) {
-        this.proxy = proxy;
-        registerDefaults();
-    }
-
-    public void enqueueQuery(IBrowser b, String q, String a, IJSQueryCallback cb) {
-        synchronized(queue) {
-            queue.offer(new QueryData(b, q, a, cb));
-        }
-    }
-
-    public void handleQueries() {
-        while(true) {
-            QueryData next;
-            synchronized(queue) {
-                next = queue.poll();
-            }
-
-            if(next == null)
-                break;
-
-            if(proxy.findScreenFromBrowser(next.browser, lookupResult)) {
-                Object[] args = (next.args == null) ? new Object[0] : parseArgs(next.args);
-
-                if(args == null)
-                    next.callback.failure(400, "Malformed request parameters");
-                else {
-                    try {
-                        handlers.get(next.query).handleQuery(next.callback, lookupResult.tes, lookupResult.side, args);
-                    } catch(Throwable t) {
-                        Log.warningEx("Could not execute JS query %s(%s)", t, next.query, (next.args == null) ? "" : next.args);
-                        next.callback.failure(500, "Internal error");
-                    }
-                }
-            } else
-                next.callback.failure(403, "A screen is required");
-        }
-    }
-
-    public boolean canHandleQuery(String q) {
-        return handlers.containsKey(q);
-    }
-
-    private static Object[] parseArgs(String args) {
-        ArrayList<String> array = new ArrayList<>();
-        int lastIdx = 0;
-        boolean inString = false;
-        boolean escape = false;
-        boolean hadString = false;
-
-        for(int i = 0; i < args.length(); i++) {
-            char chr = args.charAt(i);
-
-            if(inString) {
-                if(escape)
-                    escape = false;
-                else {
-                    if(chr == '\"')
-                        inString = false;
-                    else if(chr == '\\')
-                        escape = true;
-                }
-            } else if(chr == '\"') {
-                if(hadString)
-                    return null;
-
-                inString = true;
-                hadString = true;
-            } else if(chr == ',') {
-                array.add(args.substring(lastIdx, i).trim());
-                lastIdx = i + 1;
-                hadString = false;
-            }
-        }
-
-        if(inString)
-            return null; //Non terminated string
-
-        array.add(args.substring(lastIdx).trim());
-        Object[] ret = new Object[array.size()];
-
-        for(int i = 0; i < ret.length; i++) {
-            String str = array.get(i);
-            if(str.isEmpty())
-                return null; //Nah...
-
-            if(str.charAt(0) == '\"') //String
-                ret[i] = str.substring(1, str.length() - 1);
-            else {
-                try {
-                    ret[i] = Double.parseDouble(str);
-                } catch(NumberFormatException ex) {
-                    return null;
-                }
-            }
-        }
-
-        return ret;
-    }
-
-    public void register(String query, IScreenQueryHandler handler) {
-        handlers.put(query.toLowerCase(), handler);
-    }
-
-    public ServerQuery fulfillQuery(int id) {
-        int toRemove = -1;
-
-        for(int i = 0; i < serverQueries.size(); i++) {
-            ServerQuery sq = serverQueries.get(i);
-
-            if(sq.id == id) {
-                toRemove = i;
-                break;
-            }
-        }
-
-        if(toRemove < 0)
-            return null;
-        else
-            return serverQueries.remove(toRemove);
-    }
-
-    private void makeServerQuery(TileEntityScreen tes, BlockSide side, IJSQueryCallback cb, JSServerRequest type, Object ... data) {
-        ServerQuery ret = new ServerQuery(tes, side, cb);
-        serverQueries.add(ret);
-
-        WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.jsRequest(tes, side, ret.id, type, data));
-    }
-
-    private void registerDefaults() {
-        VideoType.registerQueries(this);
-        
-        register("GetSize", (cb, tes, side, args) -> {
-            Vector2i size = tes.getScreen(side).size;
-            cb.success("{\"x\":" + size.x + ",\"y\":" + size.y + "}");
-        });
-
-        register("GetRedstoneAt", (cb, tes, side, args) -> {
-            if(!tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) {
-                cb.failure(403, "Missing upgrade");
-                return;
-            }
-
-            if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double) {
-                TileEntityScreen.Screen scr = tes.getScreen(side);
-                int x = ((Double) args[0]).intValue();
-                int y = ((Double) args[1]).intValue();
-
-                if(x < 0 || x >= scr.size.x || y < 0 || y >= scr.size.y)
-                    cb.failure(403, "Out of range");
-                else {
-                    BlockPos bpos = (new Vector3i(tes.getBlockPos())).addMul(side.right, x).addMul(side.up, y).toBlock();
-                    int level = tes.getLevel().getBlockState(bpos).getValue(BlockScreen.emitting) ? 0 : tes.getLevel().getSignal(bpos, Direction.values()[side.reverse().ordinal()]);
-                    cb.success("{\"level\":" + level + "}");
-                }
-            } else
-                cb.failure(400, "Wrong arguments");
-        });
-
-        register("GetRedstoneArray", (cb, tes, side, args) -> {
-            if(tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) {
-                final Direction facing = Direction.values()[side.reverse().ordinal()];
-                final StringJoiner resp = new StringJoiner(",", "{\"levels\":[", "]}");
-
-                tes.forEachScreenBlocks(side, bp -> {
-                    if(tes.getLevel().getBlockState(bp).getValue(BlockScreen.emitting))
-                        resp.add("0");
-                    else
-                        resp.add("" + tes.getLevel().getSignal(bp, facing));
-                });
-
-                cb.success(resp.toString());
-            } else
-                cb.failure(403, "Missing upgrade");
-        });
-
-        register("ClearRedstone", (cb, tes, side, args) -> {
-            if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
-                if(tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId()))
-                    makeServerQuery(tes, side, cb, JSServerRequest.CLEAR_REDSTONE);
-                else
-                    cb.success("{\"status\":\"notOwner\"}");
-            } else
-                cb.failure(403, "Missing upgrade");
-        });
-
-        register("SetRedstoneAt", (cb, tes, side, args) -> {
-            if(args.length != 3 || !Arrays.stream(args).allMatch((obj) -> obj instanceof Double)) {
-                cb.failure(400, "Wrong arguments");
-                return;
-            }
-
-            if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
-                cb.failure(403, "Missing upgrade");
-                return;
-            }
-
-            if(!tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId())) {
-                cb.success("{\"status\":\"notOwner\"}");
-                return;
-            }
-
-            int x = ((Double) args[0]).intValue();
-            int y = ((Double) args[1]).intValue();
-            boolean state = ((Double) args[2]) > 0.0;
-
-            Vector2i size = tes.getScreen(side).size;
-            if(x < 0 || x >= size.x || y < 0 || y >= size.y) {
-                cb.failure(403, "Out of range");
-                return;
-            }
-
-            makeServerQuery(tes, side, cb, JSServerRequest.SET_REDSTONE_AT, x, y, state);
-        });
-
-        register("IsEmitting", (cb, tes, side, args) -> {
-            if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
-                cb.failure(403, "Missing upgrade");
-                return;
-            }
-
-            if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double) {
-                TileEntityScreen.Screen scr = tes.getScreen(side);
-                int x = ((Double) args[0]).intValue();
-                int y = ((Double) args[1]).intValue();
-
-                if(x < 0 || x >= scr.size.x || y < 0 || y >= scr.size.y)
-                    cb.failure(403, "Out of range");
-                else {
-                    BlockPos bpos = (new Vector3i(tes.getBlockPos())).addMul(side.right, x).addMul(side.up, y).toBlock();
-                    boolean e = tes.getLevel().getBlockState(bpos).getValue(BlockScreen.emitting);
-                    cb.success("{\"emitting\":" + (e ? "true" : "false") + "}");
-                }
-            } else
-                cb.failure(400, "Wrong arguments");
-        });
-
-        register("GetEmissionArray", (cb, tes, side, args) -> {
-            if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
-                final StringJoiner resp = new StringJoiner(",", "{\"emission\":[", "]}");
-                tes.forEachScreenBlocks(side, bp -> resp.add(tes.getLevel().getBlockState(bp).getValue(BlockScreen.emitting) ? "1" : "0"));
-                cb.success(resp.toString());
-            } else
-                cb.failure(403, "Missing upgrade");
-        });
-
-        register("GetLocation", (cb, tes, side, args) -> {
-            if(!tes.hasUpgrade(side, DefaultUpgrade.GPS)) {
-                cb.failure(403, "Missing upgrade");
-                return;
-            }
-
-            BlockPos bp = tes.getBlockPos();
-            cb.success("{\"x\":" + bp.getX() + ",\"y\":" + bp.getY() + ",\"z\":" + bp.getZ() + ",\"side\":\"" + side + "\"}");
-        });
-
-        register("GetUpgrades", (cb, tes, side, args) -> {
-            final StringBuilder sb = new StringBuilder("{\"upgrades\":[");
-            final ArrayList<ItemStack> upgrades = tes.getScreen(side).upgrades;
-
-            for(int i = 0; i < upgrades.size(); i++) {
-                if(i > 0)
-                    sb.append(',');
-
-                sb.append('\"');
-                sb.append(Util.addSlashes(((IUpgrade) upgrades.get(i).getItem()).getJSName(upgrades.get(i))));
-                sb.append('\"');
-            }
-
-            cb.success(sb.append("]}").toString());
-        });
-
-        register("IsOwner", (cb, tes, side, args) -> {
-            boolean res = (tes.getScreen(side).owner != null && tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId()));
-            cb.success("{\"isOwner\":" + (res ? "true}" : "false}"));
-        });
-
-        register("GetRotation", (cb, tes, side, args) -> cb.success("{\"rotation\":" + tes.getScreen(side).rotation.ordinal() + "}"));
-        register("GetSide", (cb, tes, side, args) -> cb.success("{\"side\":" + tes.getScreen(side).side.ordinal() + "}"));
-    }
-
-}
+///*
+// * Copyright (C) 2018 BARBOTIN Nicolas
+// */
+//
+//package net.montoyo.wd.client;
+//
+//import net.minecraft.client.Minecraft;
+//import net.minecraft.core.BlockPos;
+//import net.minecraft.core.Direction;
+//import net.minecraft.world.item.ItemStack;
+//import net.minecraftforge.api.distmarker.Dist;
+//import net.minecraftforge.api.distmarker.OnlyIn;
+//import net.montoyo.wd.block.BlockScreen;
+//import net.montoyo.wd.core.DefaultUpgrade;
+//import net.montoyo.wd.core.IScreenQueryHandler;
+//import net.montoyo.wd.core.IUpgrade;
+//import net.montoyo.wd.core.JSServerRequest;
+//import net.montoyo.wd.entity.TileEntityScreen;
+//import net.montoyo.wd.net.WDNetworkRegistry;
+//import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
+//import net.montoyo.wd.utilities.*;
+//
+//import java.util.*;
+//
+//@OnlyIn(Dist.CLIENT)
+//public final class JSQueryDispatcher {
+//
+//    private static final class QueryData {
+//
+//        private final IBrowser browser;
+//        private final String query;
+//        private final String args;
+//        private final IJSQueryCallback callback;
+//
+//        private QueryData(IBrowser b, String q, String a, IJSQueryCallback cb) {
+//            browser = b;
+//            query = q;
+//            args = a;
+//            callback = cb;
+//        }
+//
+//    }
+//
+//    public static final class ServerQuery {
+//
+//        private static int lastId = 0;
+//
+//        private final TileEntityScreen tes;
+//        private final BlockSide side;
+//        private final IJSQueryCallback callback;
+//        private final int id;
+//
+//        private ServerQuery(TileEntityScreen t, BlockSide s, IJSQueryCallback cb) {
+//            tes = t;
+//            side = s;
+//            callback = cb;
+//            id = lastId++;
+//        }
+//
+//        public TileEntityScreen getTileEntity() {
+//            return tes;
+//        }
+//
+//        public BlockSide getSide() {
+//            return side;
+//        }
+//
+//        public TileEntityScreen.Screen getScreen() {
+//            return tes.getScreen(side);
+//        }
+//
+//        public void success(String resp) {
+//            callback.success(resp);
+//        }
+//
+//        public void error(int errId, String errStr) {
+//            callback.failure(errId, errStr);
+//        }
+//
+//    }
+//
+//    private final ClientProxy proxy;
+//    private final ArrayDeque<QueryData> queue = new ArrayDeque<>();
+//    private final ClientProxy.ScreenSidePair lookupResult = new ClientProxy.ScreenSidePair();
+//    private final HashMap<String, IScreenQueryHandler> handlers = new HashMap<>();
+//    private final ArrayList<ServerQuery> serverQueries = new ArrayList<>();
+//    private final Minecraft mc = Minecraft.getInstance();
+//
+//    public JSQueryDispatcher(ClientProxy proxy) {
+//        this.proxy = proxy;
+//        registerDefaults();
+//    }
+//
+//    public void enqueueQuery(IBrowser b, String q, String a, IJSQueryCallback cb) {
+//        synchronized(queue) {
+//            queue.offer(new QueryData(b, q, a, cb));
+//        }
+//    }
+//
+//    public void handleQueries() {
+//        while(true) {
+//            QueryData next;
+//            synchronized(queue) {
+//                next = queue.poll();
+//            }
+//
+//            if(next == null)
+//                break;
+//
+//            if(proxy.findScreenFromBrowser(next.browser, lookupResult)) {
+//                Object[] args = (next.args == null) ? new Object[0] : parseArgs(next.args);
+//
+//                if(args == null)
+//                    next.callback.failure(400, "Malformed request parameters");
+//                else {
+//                    try {
+//                        handlers.get(next.query).handleQuery(next.callback, lookupResult.tes, lookupResult.side, args);
+//                    } catch(Throwable t) {
+//                        Log.warningEx("Could not execute JS query %s(%s)", t, next.query, (next.args == null) ? "" : next.args);
+//                        next.callback.failure(500, "Internal error");
+//                    }
+//                }
+//            } else
+//                next.callback.failure(403, "A screen is required");
+//        }
+//    }
+//
+//    public boolean canHandleQuery(String q) {
+//        return handlers.containsKey(q);
+//    }
+//
+//    private static Object[] parseArgs(String args) {
+//        ArrayList<String> array = new ArrayList<>();
+//        int lastIdx = 0;
+//        boolean inString = false;
+//        boolean escape = false;
+//        boolean hadString = false;
+//
+//        for(int i = 0; i < args.length(); i++) {
+//            char chr = args.charAt(i);
+//
+//            if(inString) {
+//                if(escape)
+//                    escape = false;
+//                else {
+//                    if(chr == '\"')
+//                        inString = false;
+//                    else if(chr == '\\')
+//                        escape = true;
+//                }
+//            } else if(chr == '\"') {
+//                if(hadString)
+//                    return null;
+//
+//                inString = true;
+//                hadString = true;
+//            } else if(chr == ',') {
+//                array.add(args.substring(lastIdx, i).trim());
+//                lastIdx = i + 1;
+//                hadString = false;
+//            }
+//        }
+//
+//        if(inString)
+//            return null; //Non terminated string
+//
+//        array.add(args.substring(lastIdx).trim());
+//        Object[] ret = new Object[array.size()];
+//
+//        for(int i = 0; i < ret.length; i++) {
+//            String str = array.get(i);
+//            if(str.isEmpty())
+//                return null; //Nah...
+//
+//            if(str.charAt(0) == '\"') //String
+//                ret[i] = str.substring(1, str.length() - 1);
+//            else {
+//                try {
+//                    ret[i] = Double.parseDouble(str);
+//                } catch(NumberFormatException ex) {
+//                    return null;
+//                }
+//            }
+//        }
+//
+//        return ret;
+//    }
+//
+//    public void register(String query, IScreenQueryHandler handler) {
+//        handlers.put(query.toLowerCase(), handler);
+//    }
+//
+//    public ServerQuery fulfillQuery(int id) {
+//        int toRemove = -1;
+//
+//        for(int i = 0; i < serverQueries.size(); i++) {
+//            ServerQuery sq = serverQueries.get(i);
+//
+//            if(sq.id == id) {
+//                toRemove = i;
+//                break;
+//            }
+//        }
+//
+//        if(toRemove < 0)
+//            return null;
+//        else
+//            return serverQueries.remove(toRemove);
+//    }
+//
+//    private void makeServerQuery(TileEntityScreen tes, BlockSide side, IJSQueryCallback cb, JSServerRequest type, Object ... data) {
+//        ServerQuery ret = new ServerQuery(tes, side, cb);
+//        serverQueries.add(ret);
+//
+//        WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.jsRequest(tes, side, ret.id, type, data));
+//    }
+//
+//    private void registerDefaults() {
+//        VideoType.registerQueries(this);
+//
+//        register("GetSize", (cb, tes, side, args) -> {
+//            Vector2i size = tes.getScreen(side).size;
+//            cb.success("{\"x\":" + size.x + ",\"y\":" + size.y + "}");
+//        });
+//
+//        register("GetRedstoneAt", (cb, tes, side, args) -> {
+//            if(!tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) {
+//                cb.failure(403, "Missing upgrade");
+//                return;
+//            }
+//
+//            if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double) {
+//                TileEntityScreen.Screen scr = tes.getScreen(side);
+//                int x = ((Double) args[0]).intValue();
+//                int y = ((Double) args[1]).intValue();
+//
+//                if(x < 0 || x >= scr.size.x || y < 0 || y >= scr.size.y)
+//                    cb.failure(403, "Out of range");
+//                else {
+//                    BlockPos bpos = (new Vector3i(tes.getBlockPos())).addMul(side.right, x).addMul(side.up, y).toBlock();
+//                    int level = tes.getLevel().getBlockState(bpos).getValue(BlockScreen.emitting) ? 0 : tes.getLevel().getSignal(bpos, Direction.values()[side.reverse().ordinal()]);
+//                    cb.success("{\"level\":" + level + "}");
+//                }
+//            } else
+//                cb.failure(400, "Wrong arguments");
+//        });
+//
+//        register("GetRedstoneArray", (cb, tes, side, args) -> {
+//            if(tes.hasUpgrade(side, DefaultUpgrade.REDINPUT)) {
+//                final Direction facing = Direction.values()[side.reverse().ordinal()];
+//                final StringJoiner resp = new StringJoiner(",", "{\"levels\":[", "]}");
+//
+//                tes.forEachScreenBlocks(side, bp -> {
+//                    if(tes.getLevel().getBlockState(bp).getValue(BlockScreen.emitting))
+//                        resp.add("0");
+//                    else
+//                        resp.add("" + tes.getLevel().getSignal(bp, facing));
+//                });
+//
+//                cb.success(resp.toString());
+//            } else
+//                cb.failure(403, "Missing upgrade");
+//        });
+//
+//        register("ClearRedstone", (cb, tes, side, args) -> {
+//            if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
+//                if(tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId()))
+//                    makeServerQuery(tes, side, cb, JSServerRequest.CLEAR_REDSTONE);
+//                else
+//                    cb.success("{\"status\":\"notOwner\"}");
+//            } else
+//                cb.failure(403, "Missing upgrade");
+//        });
+//
+//        register("SetRedstoneAt", (cb, tes, side, args) -> {
+//            if(args.length != 3 || !Arrays.stream(args).allMatch((obj) -> obj instanceof Double)) {
+//                cb.failure(400, "Wrong arguments");
+//                return;
+//            }
+//
+//            if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
+//                cb.failure(403, "Missing upgrade");
+//                return;
+//            }
+//
+//            if(!tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId())) {
+//                cb.success("{\"status\":\"notOwner\"}");
+//                return;
+//            }
+//
+//            int x = ((Double) args[0]).intValue();
+//            int y = ((Double) args[1]).intValue();
+//            boolean state = ((Double) args[2]) > 0.0;
+//
+//            Vector2i size = tes.getScreen(side).size;
+//            if(x < 0 || x >= size.x || y < 0 || y >= size.y) {
+//                cb.failure(403, "Out of range");
+//                return;
+//            }
+//
+//            makeServerQuery(tes, side, cb, JSServerRequest.SET_REDSTONE_AT, x, y, state);
+//        });
+//
+//        register("IsEmitting", (cb, tes, side, args) -> {
+//            if(!tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
+//                cb.failure(403, "Missing upgrade");
+//                return;
+//            }
+//
+//            if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double) {
+//                TileEntityScreen.Screen scr = tes.getScreen(side);
+//                int x = ((Double) args[0]).intValue();
+//                int y = ((Double) args[1]).intValue();
+//
+//                if(x < 0 || x >= scr.size.x || y < 0 || y >= scr.size.y)
+//                    cb.failure(403, "Out of range");
+//                else {
+//                    BlockPos bpos = (new Vector3i(tes.getBlockPos())).addMul(side.right, x).addMul(side.up, y).toBlock();
+//                    boolean e = tes.getLevel().getBlockState(bpos).getValue(BlockScreen.emitting);
+//                    cb.success("{\"emitting\":" + (e ? "true" : "false") + "}");
+//                }
+//            } else
+//                cb.failure(400, "Wrong arguments");
+//        });
+//
+//        register("GetEmissionArray", (cb, tes, side, args) -> {
+//            if(tes.hasUpgrade(side, DefaultUpgrade.REDOUTPUT)) {
+//                final StringJoiner resp = new StringJoiner(",", "{\"emission\":[", "]}");
+//                tes.forEachScreenBlocks(side, bp -> resp.add(tes.getLevel().getBlockState(bp).getValue(BlockScreen.emitting) ? "1" : "0"));
+//                cb.success(resp.toString());
+//            } else
+//                cb.failure(403, "Missing upgrade");
+//        });
+//
+//        register("GetLocation", (cb, tes, side, args) -> {
+//            if(!tes.hasUpgrade(side, DefaultUpgrade.GPS)) {
+//                cb.failure(403, "Missing upgrade");
+//                return;
+//            }
+//
+//            BlockPos bp = tes.getBlockPos();
+//            cb.success("{\"x\":" + bp.getX() + ",\"y\":" + bp.getY() + ",\"z\":" + bp.getZ() + ",\"side\":\"" + side + "\"}");
+//        });
+//
+//        register("GetUpgrades", (cb, tes, side, args) -> {
+//            final StringBuilder sb = new StringBuilder("{\"upgrades\":[");
+//            final ArrayList<ItemStack> upgrades = tes.getScreen(side).upgrades;
+//
+//            for(int i = 0; i < upgrades.size(); i++) {
+//                if(i > 0)
+//                    sb.append(',');
+//
+//                sb.append('\"');
+//                sb.append(Util.addSlashes(((IUpgrade) upgrades.get(i).getItem()).getJSName(upgrades.get(i))));
+//                sb.append('\"');
+//            }
+//
+//            cb.success(sb.append("]}").toString());
+//        });
+//
+//        register("IsOwner", (cb, tes, side, args) -> {
+//            boolean res = (tes.getScreen(side).owner != null && tes.getScreen(side).owner.uuid.equals(mc.player.getGameProfile().getId()));
+//            cb.success("{\"isOwner\":" + (res ? "true}" : "false}"));
+//        });
+//
+//        register("GetRotation", (cb, tes, side, args) -> cb.success("{\"rotation\":" + tes.getScreen(side).rotation.ordinal() + "}"));
+//        register("GetSide", (cb, tes, side, args) -> cb.success("{\"side\":" + tes.getScreen(side).side.ordinal() + "}"));
+//    }
+//
+//}

src/main/java/net/montoyo/wd/client/WDScheme.java

@@ -4,103 +4,127 @@
 
 package net.montoyo.wd.client;
 
-import net.montoyo.mcef.api.IScheme;
-import net.montoyo.mcef.api.ISchemeResponseData;
-import net.montoyo.mcef.api.ISchemeResponseHeaders;
-import net.montoyo.mcef.api.SchemePreResponse;
-import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.miniserv.Constants;
 import net.montoyo.wd.miniserv.client.Client;
 import net.montoyo.wd.miniserv.client.ClientTaskGetFile;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.utilities.serialization.Util;
+import org.cef.callback.CefCallback;
+import org.cef.handler.CefResourceHandler;
+import org.cef.misc.IntRef;
+import org.cef.misc.StringRef;
+import org.cef.network.CefRequest;
+import org.cef.network.CefResponse;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
-public class WDScheme implements IScheme {
+public class WDScheme implements CefResourceHandler {
 
     private static final String ERROR_PAGE = "<!DOCTYPE html><html><head></head><body><h1>%d %s</h1><hr /><i>Miniserv powered by WebDisplays</i></body></html>";
     private ClientTaskGetFile task;
     private boolean isErrorPage;
 
+    String url;
+    boolean onlyError = false;
+
+    public WDScheme(String url) {
+        this.url = url;
+    }
+
     @Override
-    public SchemePreResponse processRequest(String url) {
-        url = url.substring("wd://".length());
+    public boolean processRequest(CefRequest cefRequest, CefCallback cefCallback) {
+        url = cefRequest.getURL();
+
+        url = url.substring("webdisplays://".length());
 
         int pos = url.indexOf('/');
-        if(pos < 0)
-            return SchemePreResponse.NOT_HANDLED;
+        if (pos < 0)
+            return false;
 
         String uuidStr = url.substring(0, pos);
         String fileStr = url.substring(pos + 1);
 
-        try {
-            fileStr = URLDecoder.decode(fileStr, "UTF-8");
-        } catch(UnsupportedEncodingException ex) {
-            Log.warningEx("UTF-8 isn't supported... yeah... and I'm a billionaire...", ex);
-        }
+        fileStr = URLDecoder.decode(fileStr, StandardCharsets.UTF_8);
 
-        if(uuidStr.isEmpty() || Util.isFileNameInvalid(fileStr))
-            return SchemePreResponse.NOT_HANDLED;
+        if (uuidStr.isEmpty() || Util.isFileNameInvalid(fileStr)) {
+            // invalid URL or no UUID
+            onlyError = true;
+            cefCallback.Continue();
+            return true;
+        }
 
         UUID uuid;
         try {
             uuid = UUID.fromString(uuidStr);
-        } catch(IllegalArgumentException ex) {
-            return SchemePreResponse.NOT_HANDLED; //Invalid UUID
+        } catch (IllegalArgumentException ex) {
+            // invalid UUID
+            onlyError = true;
+            cefCallback.Continue();
+            return true;
         }
 
         task = new ClientTaskGetFile(uuid, fileStr);
-        return Client.getInstance().addTask(task) ? SchemePreResponse.HANDLED_CONTINUE : SchemePreResponse.NOT_HANDLED;
+        boolean doContinue = Client.getInstance().addTask(task);
+        if (doContinue) cefCallback.Continue();
+        return doContinue;
     }
 
     @Override
-    public void getResponseHeaders(ISchemeResponseHeaders resp) {
-        Log.info("Waiting for response...");
-        int status = task.waitForResponse();
-        Log.info("Got response %d", status);
+    public void getResponseHeaders(CefResponse cefResponse, IntRef contentLength, StringRef redir) {
+        int status;
+        if (onlyError) {
+            status = Constants.GETF_STATUS_BAD_NAME;
+        } else {
+            Log.info("Waiting for response...");
+            status = task.waitForResponse();
+            Log.info("Got response %d", status);
 
-        if(status == 0) {
-            //OK
-            int extPos = task.getFileName().lastIndexOf('.');
-            if(extPos >= 0) {
-                String mime = ((ClientProxy) WebDisplays.PROXY).getMCEF().mimeTypeFromExtension(task.getFileName().substring(extPos + 1));
+            if (status == 0) {
+                //OK
+                int extPos = task.getFileName().lastIndexOf('.');
+                if (extPos >= 0) {
+                    String mime = mapMime(task.getFileName().substring(extPos + 1));
 
-                if(mime != null)
-                    resp.setMimeType(mime);
+                    if (mime != null)
+                        cefResponse.setMimeType(mime);
+                }
+
+                cefResponse.setStatus(200);
+                cefResponse.setStatusText("OK");
+                contentLength.set(0);
+                return;
             }
-
-            resp.setStatus(200);
-            resp.setStatusText("OK");
-            resp.setResponseLength(-1);
-            return;
         }
 
         int errCode;
         String errStr;
 
-        if(status == Constants.GETF_STATUS_NOT_FOUND) {
+        if (status == Constants.GETF_STATUS_NOT_FOUND) {
             errCode = 404;
             errStr = "Not Found";
+        } else if (status == Constants.GETF_STATUS_TIMED_OUT) {
+            errCode = 408;
+            errStr = "Timed Out";
+        } else if (status == Constants.GETF_STATUS_BAD_NAME) {
+            errCode = 418;
+            errStr = "I'm a teapot";
         } else {
             errCode = 500;
             errStr = "Internal Server Error";
         }
 
-        resp.setStatus(errCode);
-        resp.setStatusText(errStr);
+        // reporting the actual status and text makes CEF not display the page
+        cefResponse.setStatus(200);
+        cefResponse.setStatusText("OK");
+        cefResponse.setMimeType("text/html");
 
-        try {
-            dataToWrite = String.format(ERROR_PAGE, errCode, errStr).getBytes("UTF-8");
-            dataOffset = 0;
-            amountToWrite = dataToWrite.length;
-            isErrorPage = true;
-            resp.setResponseLength(amountToWrite);
-        } catch(UnsupportedEncodingException ex) {
-            resp.setResponseLength(0);
-        }
+        dataToWrite = String.format(ERROR_PAGE, errCode, errStr).getBytes(StandardCharsets.UTF_8);
+        dataOffset = 0;
+        amountToWrite = dataToWrite.length;
+        isErrorPage = true;
+        contentLength.set(0);
     }
 
     private byte[] dataToWrite;
@@ -108,10 +132,10 @@ public class WDScheme implements IScheme {
     private int amountToWrite;
 
     @Override
-    public boolean readResponse(ISchemeResponseData data) {
-        if(dataToWrite == null) {
-            if(isErrorPage) {
-                data.setAmountRead(0);
+    public boolean readResponse(byte[] output, int bytesToRead, IntRef bytesRead, CefCallback cefCallback) {
+        if (dataToWrite == null) {
+            if (isErrorPage) {
+                bytesRead.set(0);
                 return false;
             }
 
@@ -119,25 +143,25 @@ public class WDScheme implements IScheme {
             dataOffset = 3; //packet ID + size
             amountToWrite = task.getDataLength();
 
-            if(amountToWrite <= 0) {
+            if (amountToWrite <= 0) {
                 dataToWrite = null;
-                data.setAmountRead(0);
+                bytesRead.set(0);
                 return false;
             }
         }
 
-        int toWrite = data.getBytesToRead();
-        if(toWrite > amountToWrite)
+        int toWrite = bytesToRead;
+        if (toWrite > amountToWrite)
             toWrite = amountToWrite;
 
-        System.arraycopy(dataToWrite, dataOffset, data.getDataArray(), 0, toWrite);
-        data.setAmountRead(toWrite);
+        System.arraycopy(dataToWrite, dataOffset, output, 0, toWrite);
+        bytesRead.set(toWrite);
 
         dataOffset += toWrite;
         amountToWrite -= toWrite;
 
-        if(amountToWrite <= 0) {
-            if(!isErrorPage)
+        if (amountToWrite <= 0) {
+            if (!isErrorPage)
                 task.nextData();
 
             dataToWrite = null;
@@ -146,4 +170,46 @@ public class WDScheme implements IScheme {
         return true;
     }
 
+    @Override
+    public void cancel() {
+        Log.info("Scheme query canceled or finished.");
+        if (!onlyError)
+            task.cancel();
+    }
+
+    public static String mapMime(String ext) {
+        switch (ext) {
+            case "htm":
+            case "html":
+                return "text/html";
+
+            case "css":
+                return "text/css";
+
+            case "js":
+                return "text/javascript";
+
+            case "png":
+                return "image/png";
+
+            case "jpg":
+            case "jpeg":
+                return "image/jpeg";
+
+            case "gif":
+                return "image/gif";
+
+            case "svg":
+                return "image/svg+xml";
+
+            case "xml":
+                return "text/xml";
+
+            case "txt":
+                return "text/plain";
+
+            default:
+                return null;
+        }
+    }
 }

src/main/java/net/montoyo/wd/client/audio/WDAudioSource.java

@@ -0,0 +1,116 @@
+package net.montoyo.wd.client.audio;
+
+import net.minecraft.client.resources.sounds.Sound;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.sounds.AudioStream;
+import net.minecraft.client.sounds.SoundBufferLibrary;
+import net.minecraft.client.sounds.SoundManager;
+import net.minecraft.client.sounds.WeighedSoundEvents;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
+import net.minecraft.util.valueproviders.SampledFloat;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+
+public class WDAudioSource implements SoundInstance {
+    private static final ResourceLocation location = new ResourceLocation("webdisplays:audio_source");
+    private static final WeighedSoundEvents events = new WeighedSoundEvents(
+            location, "webdisplays.browser"
+    );
+    private static final SampledFloat CONST_1 = new SampledFloat() {
+        @Override
+        public float sample(RandomSource pRandom) {
+            return 1.0f;
+        }
+    };
+    private final Sound sound = new Sound(
+            "unused",
+            CONST_1,
+            CONST_1,
+            1, Sound.Type.SOUND_EVENT,
+            true, false,
+            100
+    );
+    ScreenBlockEntity blockEntity;
+    ScreenData data;
+
+    public WDAudioSource(ScreenBlockEntity blockEntity, ScreenData data) {
+        this.blockEntity = blockEntity;
+        this.data = data;
+    }
+
+    @Override
+    public ResourceLocation getLocation() {
+        return location;
+    }
+
+    @Nullable
+    @Override
+    public WeighedSoundEvents resolve(SoundManager pManager) {
+        return events;
+    }
+
+    @Override
+    public CompletableFuture<AudioStream> getStream(SoundBufferLibrary soundBuffers, Sound sound, boolean looping) {
+        return null;
+    }
+
+    @Override
+    public Sound getSound() {
+        return sound;
+    }
+
+    @Override
+    public SoundSource getSource() {
+        return SoundSource.RECORDS;
+    }
+
+    @Override
+    public boolean isLooping() {
+        return true;
+    }
+
+    @Override
+    public boolean isRelative() {
+        return false;
+    }
+
+    @Override
+    public int getDelay() {
+        return 0;
+    }
+
+    @Override
+    public float getVolume() {
+        return blockEntity.ytVolume;
+    }
+
+    @Override
+    public float getPitch() {
+        return 1;
+    }
+
+    @Override
+    public double getX() {
+        return blockEntity.getBlockPos().getX();
+    }
+
+    @Override
+    public double getY() {
+        return blockEntity.getBlockPos().getY();
+    }
+
+    @Override
+    public double getZ() {
+        return blockEntity.getBlockPos().getZ();
+    }
+
+    @Override
+    public Attenuation getAttenuation() {
+        return Attenuation.LINEAR;
+    }
+}

src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java

@@ -4,42 +4,59 @@
 
 package net.montoyo.wd.client.gui;
 
+import com.cinemamod.mcef.MCEFBrowser;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Axis;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.client.gui.camera.KeyboardCamera;
 import net.montoyo.wd.client.gui.controls.Button;
 import net.montoyo.wd.client.gui.controls.Control;
 import net.montoyo.wd.client.gui.controls.Label;
 import net.montoyo.wd.client.gui.loading.FillControl;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.controls.builtin.ClickControl;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
-import net.montoyo.wd.utilities.BlockSide;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.TypeData;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.serialization.TypeData;
+import net.montoyo.wd.utilities.serialization.Util;
+import org.cef.browser.CefBrowser;
+import org.cef.misc.CefCursorType;
+import org.joml.Matrix4f;
+import org.joml.Vector4f;
 import org.lwjgl.glfw.GLFW;
-import org.vivecraft.gameplay.VRPlayer;
-import org.vivecraft.gameplay.screenhandlers.KeyboardHandler;
+import org.vivecraft.client_vr.gameplay.VRPlayer;
+import org.vivecraft.client_vr.gameplay.screenhandlers.KeyboardHandler;
 
 import java.io.*;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.function.Consumer;
 
 @OnlyIn(Dist.CLIENT)
 public class GuiKeyboard extends WDScreen {
 
     private static final String WARNING_FNAME = "wd_keyboard_warning.txt";
 
-    private TileEntityScreen tes;
+    private ScreenBlockEntity tes;
     private BlockSide side;
+    private ScreenData data;
     private final ArrayList<TypeData> evStack = new ArrayList<>();
     private BlockPos kbPos;
     private boolean showWarning = true;
@@ -54,7 +71,7 @@ public class GuiKeyboard extends WDScreen {
         super(Component.nullToEmpty(null));
     }
 
-    public GuiKeyboard(TileEntityScreen tes, BlockSide side, BlockPos kbPos) {
+    public GuiKeyboard(ScreenBlockEntity tes, BlockSide side, BlockPos kbPos) {
         this();
         this.tes = tes;
         this.side = side;
@@ -67,7 +84,7 @@ public class GuiKeyboard extends WDScreen {
     }
 
     private static final boolean vivecraftPresent;
-    
+
     static {
         boolean vivePres = false;
         if (ModList.get().isLoaded("vivecraft")) vivePres = true;
@@ -89,7 +106,7 @@ public class GuiKeyboard extends WDScreen {
         }
         vivecraftPresent = vivePres;
     }
-    
+
     @Override
     public void init() {
         super.init();
@@ -135,43 +152,68 @@ public class GuiKeyboard extends WDScreen {
 
         defaultBackground = showWarning;
         syncTicks = 5;
-    
+
         if (vivecraftPresent)
             if (VRPlayer.get() != null)
                 KeyboardHandler.setOverlayShowing(true);
+
+        KeyboardCamera.focus(tes, side);
+
+        data = tes.getScreen(side);
+        CefBrowser browser = data.browser;
+        ((MCEFBrowser) browser).setCursor(CefCursorType.fromId(data.mouseType));
+        ((MCEFBrowser) browser).setCursorChangeListener((id) -> {
+            data.mouseType = id;
+            ((MCEFBrowser) browser).setCursor(CefCursorType.fromId(id));
+        });
     }
-    
+
     @Override
-    public void onClose() {
+    public void removed() {
+        super.removed();
         if (vivecraftPresent)
             if (VRPlayer.get() != null)
                 KeyboardHandler.setOverlayShowing(false);
-        super.onClose();
+        KeyboardCamera.focus(null, null);
+        CefBrowser browser = data.browser;
+        if (browser instanceof MCEFBrowser mcef) {
+            mcef.setCursor(CefCursorType.POINTER);
+            mcef.setCursorChangeListener((cursor) -> data.mouseType = cursor);
+        }
     }
-    
+
+    @Override
+    public void onClose() {
+        removed();
+        super.onClose();
+        this.minecraft.popGuiLayer();
+    }
+
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if(quitOnEscape && keyCode == GLFW.GLFW_KEY_ESCAPE)
-            Minecraft.getInstance().setScreen(null);
-        addKey(new TypeData(TypeData.Action.PRESS, keyCode, modifiers));
+        if (quitOnEscape && keyCode == GLFW.GLFW_KEY_ESCAPE) {
+            onClose();
+            return true;
+        }
+        addKey(new TypeData(TypeData.Action.PRESS, keyCode, modifiers, scanCode));
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
-    
+
     @Override
     public boolean charTyped(char codePoint, int modifiers) {
-        addKey(new TypeData(TypeData.Action.TYPE, codePoint, modifiers));
+        addKey(new TypeData(TypeData.Action.TYPE, codePoint, modifiers, 0));
         return super.charTyped(codePoint, modifiers);
     }
-    
+
     @Override
     public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
-        addKey(new TypeData(TypeData.Action.RELEASE, keyCode, modifiers));
+        addKey(new TypeData(TypeData.Action.RELEASE, keyCode, modifiers, scanCode));
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
-    
+
     void addKey(TypeData data) {
         tes.type(side, "[" + WebDisplays.GSON.toJson(data) + "]", kbPos);
-        
+
         evStack.add(data);
         if (!evStack.isEmpty() && !syncRequested())
             requestSync();
@@ -241,4 +283,89 @@ public class GuiKeyboard extends WDScreen {
         return bp.equals(kbPos) || (bp.equals(tes.getBlockPos()) && side == this.side);
     }
 
+    protected void mouse(double mouseX, double mouseY, Consumer<Vector2i> func) {
+        float pct = Minecraft.getInstance().getPartialTick();
+
+        double fov = Minecraft.getInstance().gameRenderer.getFov(
+                Minecraft.getInstance().getEntityRenderDispatcher().camera,
+                pct, true
+        );
+
+        mouseX /= width;
+        mouseY /= height;
+
+        mouseX -= 0.5;
+        mouseY -= 0.5;
+        mouseY = -mouseY;
+
+        Matrix4f proj = Minecraft.getInstance().gameRenderer.getProjectionMatrix(fov);
+
+        Entity e = Minecraft.getInstance().getEntityRenderDispatcher().camera.getEntity();
+
+        PoseStack camera = new PoseStack();
+        float[] angle = KeyboardCamera.getAngle(e, pct);
+        camera.mulPose(Axis.XP.rotationDegrees(angle[0]));
+        camera.mulPose(Axis.YP.rotationDegrees(angle[1] + 180.0F));
+
+        Vector4f coord = new Vector4f(2f * (float) mouseX, 2 * (float) mouseY, 0, 1f);
+        coord.add(proj.invert().transform(coord));
+        coord = camera.last().pose().invert().transform(coord);
+
+        Vec3 vec3 = e.getEyePosition(pct);
+        Vec3 vec31 = new Vec3(coord.x, coord.y, coord.z).normalize();
+
+        BlockHitResult result = tes.trace(side, vec3, vec31);
+        if (result.getType() != HitResult.Type.MISS) {
+            tes.interact(result, func);
+        }
+    }
+
+    @Override
+    public void mouseMoved(double mouseX, double mouseY) {
+        mouse(mouseX, mouseY, (hit) -> {
+            tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1);
+            WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserMove(tes, side, hit));
+        });
+
+        super.mouseMoved(mouseX, mouseY);
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        mouse(mouseX, mouseY, (hit) -> {
+            tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1);
+            tes.handleMouseEvent(side, ClickControl.ControlType.DOWN, hit, button);
+            WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserDown(tes, side, hit, button));
+        });
+
+        KeyboardCamera.setMouse(button, true);
+
+        return super.mouseClicked(mouseX, mouseY, button);
+    }
+
+    @Override
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        mouse(mouseX, mouseY, (hit) -> {
+            tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1);
+            tes.handleMouseEvent(side, ClickControl.ControlType.UP, hit, button);
+            WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserUp(tes, side, button));
+        });
+
+        KeyboardCamera.setMouse(button, false);
+
+        return super.mouseReleased(mouseX, mouseY, button);
+    }
+
+    @Override
+    public void tick() {
+        double mouseX = Minecraft.getInstance().mouseHandler.xpos() / Minecraft.getInstance().getWindow().getWidth();
+        double mouseY = Minecraft.getInstance().mouseHandler.ypos() / Minecraft.getInstance().getWindow().getHeight();
+
+        mouse(mouseX * width, mouseY * height, (hit) -> {
+            tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1);
+            WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserMove(tes, side, hit));
+        });
+
+        super.tick();
+    }
 }

src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java

@@ -4,16 +4,27 @@
 
 package net.montoyo.wd.client.gui;
 
+import com.cinemamod.mcef.MCEFBrowser;
+import com.google.gson.JsonObject;
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.core.BlockPos;
+import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.client.ClientProxy;
-import net.montoyo.wd.utilities.BlockSide;
-import org.cef.browser.CefBrowserOsr;
+import net.montoyo.wd.utilities.browser.WDBrowser;
+import net.montoyo.wd.utilities.browser.handlers.js.Scripts;
+import net.montoyo.wd.utilities.data.BlockSide;
+import org.cef.misc.CefCursorType;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.Optional;
@@ -23,217 +34,324 @@ import static net.minecraftforge.api.distmarker.Dist.CLIENT;
 @OnlyIn(CLIENT)
 public class GuiMinePad extends WDScreen {
 
-    private ClientProxy.PadData pad;
-    private double vx;
-    private double vy;
-    private double vw;
-    private double vh;
+	private ClientProxy.PadData pad;
+	private double vx;
+	private double vy;
+	private double vw;
+	private double vh;
 
-    public GuiMinePad() {
-        super(Component.nullToEmpty(null));
-    }
+	public GuiMinePad() {
+		super(Component.nullToEmpty(null));
+	}
 
-    public GuiMinePad(ClientProxy.PadData pad) {
-        this();
-        this.pad = pad;
-    
-        if (WebDisplays.cursorSupport)
-            pad.view.allowCursorChanges(true);
-    }
+	public GuiMinePad(ClientProxy.PadData pad) {
+		this();
+		this.pad = pad;
+	}
 
-    @Override
-    public void init() {
-        vw = ((double) width) - 32.0f;
-        vh = vw / WebDisplays.PAD_RATIO;
-        vx = 16.0f;
-        vy = (((double) height) - vh) / 2.0f;
-        
-        this.width = (int) vw;
-        this.height = (int) vh;
-        
-        super.init();
-    }
+	int trueWidth, trueHeight;
 
-    private static void addRect(BufferBuilder bb, double x, double y, double w, double h) {
-        bb.vertex(x, y, 0.0).color(255, 255, 255, 255).endVertex();
-        bb.vertex(x + w, y, 0.0).color(255, 255, 255, 255).endVertex();
-        bb.vertex(x + w, y + h, 0.0).color(255, 255, 255, 255).endVertex();
-        bb.vertex(x, y + h, 0.0).color(255, 255, 255, 255).endVertex();
-    }
+	@Override
+	public void init() {
+		vw = ((double) width) - 32.0f;
+		vh = vw / WebDisplays.PAD_RATIO;
+		vx = 16.0f;
+		vy = (((double) height) - vh) / 2.0f;
 
-    @Override
-    public void render(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
-        renderBackground(poseStack);
+		trueWidth = width;
+		trueHeight = height;
 
-        RenderSystem.disableTexture();
-        RenderSystem.disableCull();
-        RenderSystem.setShaderColor(0.73f, 0.73f, 0.73f, 1.0f);
+		this.width = (int) vw;
+		this.height = (int) vh;
 
-        Tesselator t = Tesselator.getInstance();
-        BufferBuilder bb = t.getBuilder();
-        bb.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
-        addRect(bb, vx, vy - 16, vw, 16);
-        addRect(bb, vx, vy + vh, vw, 16);
-        addRect(bb, vx - 16, vy, 16, vh);
-        addRect(bb, vx + vw, vy, 16, vh);
-        t.end();
+		super.init();
 
-        RenderSystem.enableTexture();
+		((MCEFBrowser) pad.view).setCursor(CefCursorType.fromId(pad.activeCursor));
+		((MCEFBrowser) pad.view).setCursorChangeListener((id) -> {
+			pad.activeCursor = id;
+			((MCEFBrowser) pad.view).setCursor(CefCursorType.fromId(id));
+		});
+	}
 
-        if (pad.view != null) {
-            pad.view.draw(poseStack, vx, vy + vh, vx + vw, vy);
-        }
+	private static void addRect(BufferBuilder bb, double x, double y, double w, double h) {
+		bb.vertex(x, y, 0.0).color(255, 255, 255, 255).endVertex();
+		bb.vertex(x + w, y, 0.0).color(255, 255, 255, 255).endVertex();
+		bb.vertex(x + w, y + h, 0.0).color(255, 255, 255, 255).endVertex();
+		bb.vertex(x, y + h, 0.0).color(255, 255, 255, 255).endVertex();
+	}
 
-        RenderSystem.enableCull();
-    }
+	@Override
+	public void render(GuiGraphics graphics, int mouseX, int mouseY, float ptt) {
+		width = trueWidth;
+		height = trueHeight;
+		renderBackground(graphics);
+		width = (int) vw;
+		height = (int) vh;
 
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return this.keyChanged(keyCode, scanCode, modifiers, true) || super.keyPressed(keyCode, scanCode, modifiers);
-    }
+		RenderSystem.disableCull();
+		RenderSystem.setShaderColor(0.73f, 0.73f, 0.73f, 1.0f);
 
-    @Override
-    public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
-        return this.keyChanged(keyCode, scanCode, modifiers, false) || super.keyReleased(keyCode, scanCode, modifiers);
-    }
-    
-    @Override
-    public boolean charTyped(char codePoint, int modifiers) {
-        if (pad.view != null) {
-            pad.view.injectKeyTyped((int) codePoint, modifiers);
-            return true;
-        } else {
-            return super.charTyped(codePoint, modifiers);
-        }
-    }
-    
-    /* copied from MCEF */
-    public boolean keyChanged(int keyCode, int scanCode, int modifiers, boolean pressed) {
-        assert minecraft != null;
-        if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-            minecraft.setScreen(null);
-            return true;
-        }
-        
-        InputConstants.Key iuKey = InputConstants.getKey(keyCode, scanCode);
-        String keystr = iuKey.getDisplayName().getString();
+		Tesselator t = Tesselator.getInstance();
+		BufferBuilder bb = t.getBuilder();
+		bb.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+		addRect(bb, vx, vy - 16, vw, 16);
+		addRect(bb, vx, vy + vh, vw, 16);
+		addRect(bb, vx - 16, vy, 16, vh);
+		addRect(bb, vx + vw, vy, 16, vh);
+		t.end();
+
+		if (pad.view != null) {
+//            pad.view.draw(poseStack, vx, vy + vh, vx + vw, vy);
+			RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+			RenderSystem.disableDepthTest();
+			RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+			RenderSystem.setShaderTexture(0, ((MCEFBrowser) pad.view).getRenderer().getTextureID());
+			t = Tesselator.getInstance();
+			BufferBuilder buffer = t.getBuilder();
+			buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+			double x1 = vx;
+			double y1 = vy;
+			double x2 = vx + vw;
+			double y2 = vy + vh;
+			buffer.vertex(graphics.pose().last().pose(), (float) x1, (float) y1, 0.0f).uv(0.0F, 0.0F).color(255, 255, 255, 255).endVertex();
+			buffer.vertex(graphics.pose().last().pose(), (float) x2, (float) y1, 0.0f).uv(1.0F, 0.0F).color(255, 255, 255, 255).endVertex();
+			buffer.vertex(graphics.pose().last().pose(), (float) x2, (float) y2, 0.0f).uv(1.0F, 1.0F).color(255, 255, 255, 255).endVertex();
+			buffer.vertex(graphics.pose().last().pose(), (float) x1, (float) y2, 0.0f).uv(0.0F, 1.0F).color(255, 255, 255, 255).endVertex();
+			t.end();
+			RenderSystem.enableDepthTest();
+		}
+
+		RenderSystem.enableCull();
+
+		graphics.drawString(
+				minecraft.font, Language.getInstance().getOrDefault(
+						"webdisplays.gui.minepad.close"
+				), (int) vx + 4, (int) vy - minecraft.font.lineHeight - 3, 16777215, true
+		);
+	}
+
+	@Override
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+		return this.keyChanged(keyCode, scanCode, modifiers, true) || super.keyPressed(keyCode, scanCode, modifiers);
+	}
+
+	@Override
+	public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
+		return this.keyChanged(keyCode, scanCode, modifiers, false) || super.keyReleased(keyCode, scanCode, modifiers);
+	}
+
+	@Override
+	public boolean charTyped(char codePoint, int modifiers) {
+		if (pad.view != null) {
+			((MCEFBrowser) pad.view).sendKeyTyped(codePoint, modifiers);
+			return true;
+		} else {
+			return super.charTyped(codePoint, modifiers);
+		}
+	}
+
+	/* copied from MCEF */
+	public boolean keyChanged(int keyCode, int scanCode, int modifiers, boolean pressed) {
+		assert minecraft != null;
+		if ((modifiers & GLFW.GLFW_MOD_SHIFT) == GLFW.GLFW_MOD_SHIFT && keyCode == GLFW.GLFW_KEY_ESCAPE) {
+			onClose();
+			return true;
+		}
+
+		InputConstants.Key iuKey = InputConstants.getKey(keyCode, scanCode);
+		String keystr = iuKey.getDisplayName().getString();
 //        System.out.println("KEY STR " + keystr);
-        if (keystr.length() == 0)
-            return false;
-        
-        char key = keystr.charAt(keystr.length() - 1);
-    
-        if(keystr.equals("Enter")) {
-            keyCode = 10;
-            key = '\n';
-        }
-    
-        if (pad.view != null) {
-            if (pressed)
-                pad.view.injectKeyPressedByKeyCode(keyCode, key, modifiers);
-            else
-                pad.view.injectKeyReleasedByKeyCode(keyCode, key, modifiers);
-        
-            if (pressed && key == '\n')
-                if (modifiers != 0) pad.view.injectKeyTyped('\r', modifiers);
-            return true;
-        }
-        
-        return false;
-    }
+		if (keystr.length() == 0)
+			return false;
 
-    @Override
-    public void mouseMoved(double mouseX, double mouseY) {
-        super.mouseMoved(mouseX, mouseY);
-        mouse(-1, false, (int) mouseX, (int) mouseY, 0);
-    }
+		char key = keystr.charAt(keystr.length() - 1);
 
-    @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        mouse(button, true, (int) mouseX, (int) mouseY, 0);
-        return super.mouseClicked(mouseX, mouseY, button);
-    }
+		if (keystr.equals("Enter")) {
+			keyCode = 10;
+			key = '\n';
+		}
 
-    @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        mouse(button, false, (int) mouseX, (int) mouseY, 0);
-        return super.mouseReleased(mouseX, mouseY, button);
-    }
-    
-    @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        mouse(button, true, (int) mouseX, (int) mouseY, 0);
-        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
-    }
-    
-    @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        mouse(-1, false, (int) mouseX, (int) mouseY, amount);
-        return super.mouseScrolled(mouseX, mouseY, amount);
-    }
+		if (pad.view != null) {
+			if (pressed)
+				((MCEFBrowser) pad.view).sendKeyPress(keyCode, scanCode, modifiers);
+			else
+				((MCEFBrowser) pad.view).sendKeyRelease(keyCode, scanCode, modifiers);
 
-    public void mouse(int btn, boolean pressed, int sx, int sy, double scrollAmount) {
-        double mx = (sx - vx) / vw;
-        double my = (sy - vy) / vh;
+			if (pressed && key == '\n')
+				if (modifiers != 0) ((MCEFBrowser) pad.view).sendKeyTyped('\r', modifiers);
+			return true;
+		}
 
-        if (pad.view != null && mx >= 0 && mx <= 1) {
-            int wheel = (int) scrollAmount;
+		return false;
+	}
 
-            //Scale again according to the webview
-            sx = (int) (mx * WebDisplays.INSTANCE.padResX);
-            sy = (int) (my * WebDisplays.INSTANCE.padResY);
-    
-            if (wheel != 0)
-                pad.view.injectMouseWheel(sx, sy, (hasControlDown() && ! hasAltDown() && !hasShiftDown()) ? GLFW.GLFW_MOD_CONTROL : 0, wheel, 0);
-            if (btn == -1)
-                pad.view.injectMouseMove(sx, sy, 0, sy < 0);
-            else
-                pad.view.injectMouseButton(sx, sy, 0, btn + 1, pressed, 1);
-        }
-    }
+	@Override
+	public void mouseMoved(double mouseX, double mouseY) {
+		super.mouseMoved(mouseX, mouseY);
+		mouse(-1, false, (int) mouseX, (int) mouseY, 0);
+	}
 
-    public static Optional<Character> getChar(int keyCode, int scanCode) {
-        String keystr = GLFW.glfwGetKeyName(keyCode, scanCode);
-        if(keystr == null){
-            keystr = "\0";
-        }
-        if(keyCode == GLFW.GLFW_KEY_ENTER){
-            keystr = "\n";
-        }
-        if(keystr.length() == 0){
-            return Optional.empty();
-        }
+	@Override
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+		mouse(button, true, (int) mouseX, (int) mouseY, 0);
+		return super.mouseClicked(mouseX, mouseY, button);
+	}
 
-        return Optional.of(keystr.charAt(keystr.length() - 1));
-    }
+	@Override
+	public boolean mouseReleased(double mouseX, double mouseY, int button) {
+		mouse(button, false, (int) mouseX, (int) mouseY, 0);
+		return super.mouseReleased(mouseX, mouseY, button);
+	}
 
-    @Override
-    public void tick() {
-        if(pad.view == null)
-            minecraft.setScreen(null); //In case the user dies with the pad in the hand
-    }
+	@Override
+	public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+		double mx = (mouseX - vx) / vw;
+		double my = (mouseY - vy) / vh;
+		int sx = (int) (mx * WebDisplays.INSTANCE.padResX);
+		int sy = (int) (my * WebDisplays.INSTANCE.padResY);
+		// TODO: this doesn't work, and I don't understand why?
+		((MCEFBrowser) pad.view).sendMouseWheel(sx, sy, amount, (hasControlDown() && !hasAltDown() && !hasShiftDown()) ? GLFW.GLFW_MOD_CONTROL : 0);
 
-    @Override
-    public boolean isForBlock(BlockPos bp, BlockSide side) {
-        return false;
-    }
-    
-    @Override
-    public void removed() {
-        super.removed();
-        if (pad.view instanceof CefBrowserOsr osr) {
-            osr.allowCursorChanges(true);
-            osr.onCursorChange(null, 0);
-        }
-    }
-    
-    @Override
-    public void onClose() {
-        super.onClose();
-        if (WebDisplays.cursorSupport) {
-            pad.view.allowCursorChanges(false);
-            if (pad.view instanceof CefBrowserOsr osr)
-                osr.onCursorChange(null, 0);
-        }
-    }
+		return super.mouseScrolled(mouseX, mouseY, amount);
+	}
+
+	public void capturedMouse(double scaledX, double scaledY, int sx, int sy) {
+		double centerX = (int) (0.5 * (double) this.minecraft.getWindow().getGuiScaledWidth());
+		double centerY = (int) (0.5 * (double) this.minecraft.getWindow().getGuiScaledHeight());
+
+		if (sx == (int) centerX && sy == (int) centerY) return;
+
+		double mx = (centerX - vx) / vw;
+		double my = (centerY - vy) / vh;
+		double scaledCentX = (mx * WebDisplays.INSTANCE.padResX);
+		double scaledCentY = (my * WebDisplays.INSTANCE.padResY);
+
+		double deltX = scaledX - scaledCentX;
+		double deltY = scaledY - scaledCentY;
+
+		String scr = Scripts.MOUSE_EVENT;
+		pad.view.executeJavaScript(
+				scr
+						.replace("%xCoord%", "" + (int) centerX)
+						.replace("%yCoord%", "" + (int) centerY)
+						.replace("%xDelta%", "" + (deltX))
+						.replace("%yDelta%", "" + (deltY)),
+				"WebDisplays", 0
+		);
+
+		// lock mouse
+		try {
+			double xpos = (this.minecraft.getWindow().getScreenWidth() / 2);
+			double ypos = (this.minecraft.getWindow().getScreenHeight() / 2);
+			GLFW.glfwSetCursorPos(minecraft.getWindow().getWindow(), xpos, ypos);
+		} catch (Throwable ignored) {
+		}
+	}
+
+	public void mouse(int btn, boolean pressed, int sx, int sy, double scrollAmount) {
+		double mx = (sx - vx) / vw;
+		double my = (sy - vy) / vh;
+
+		if (pad.view != null && mx >= 0 && mx <= 1) {
+			//Scale again according to the webview
+			int scaledX = (int) (mx * WebDisplays.INSTANCE.padResX);
+			int scaledY = (int) (my * WebDisplays.INSTANCE.padResY);
+
+			if (btn == -1) {
+				if (locked)
+					capturedMouse(mx * WebDisplays.INSTANCE.padResX, my * WebDisplays.INSTANCE.padResY, sx, sy);
+				else ((MCEFBrowser) pad.view).sendMouseMove(scaledX, scaledY);
+			} else if (pressed)
+				((MCEFBrowser) pad.view).sendMousePress(scaledX, scaledY, btn);
+			else ((MCEFBrowser) pad.view).sendMouseRelease(scaledX, scaledY, btn);
+			pad.view.setFocus(true);
+		}
+	}
+
+	public static Optional<Character> getChar(int keyCode, int scanCode) {
+		String keystr = GLFW.glfwGetKeyName(keyCode, scanCode);
+		if (keystr == null) {
+			keystr = "\0";
+		}
+		if (keyCode == GLFW.GLFW_KEY_ENTER) {
+			keystr = "\n";
+		}
+		if (keystr.length() == 0) {
+			return Optional.empty();
+		}
+
+		return Optional.of(keystr.charAt(keystr.length() - 1));
+	}
+
+	@Override
+	public void tick() {
+		if (pad.view == null)
+			minecraft.setScreen(null); //In case the user dies with the pad in the hand
+		pollElement();
+	}
+
+	@Override
+	public boolean isForBlock(BlockPos bp, BlockSide side) {
+		return false;
+	}
+
+	@Override
+	public void removed() {
+		super.removed();
+		InputConstants.updateRawMouseInput(
+				minecraft.getWindow().getWindow(),
+				Minecraft.getInstance().options.rawMouseInput().get()
+		);
+		if (pad.view instanceof MCEFBrowser browser) {
+			browser.setCursor(CefCursorType.POINTER);
+			browser.setCursorChangeListener((cursor) -> {
+				pad.activeCursor = cursor;
+			});
+		}
+	}
+
+	@Override
+	public void onClose() {
+		super.onClose();
+		removed();
+		this.minecraft.popGuiLayer();
+	}
+
+	boolean locked = false;
+	double lockCenterX = -1;
+	double lockCenterY = -1;
+
+	protected void updateCrd(JsonObject obj) {
+		if (obj.getAsJsonPrimitive("exists").getAsBoolean()) {
+			locked = true;
+			RenderSystem.recordRenderCall(() -> {
+				InputConstants.updateRawMouseInput(
+						minecraft.getWindow().getWindow(),
+						obj.getAsJsonPrimitive("unadjust").getAsBoolean()
+				);
+				GLFW.glfwSetInputMode(Minecraft.getInstance().getWindow().getWindow(), 208897, GLFW.GLFW_CURSOR_DISABLED);
+			});
+			lockCenterX = obj.getAsJsonPrimitive("x").getAsDouble() + obj.getAsJsonPrimitive("w").getAsDouble() / 2;
+			lockCenterY = obj.getAsJsonPrimitive("y").getAsDouble() + obj.getAsJsonPrimitive("h").getAsDouble() / 2;
+		} else {
+			if (locked) {
+				locked = false;
+				RenderSystem.recordRenderCall(()->{
+					InputConstants.updateRawMouseInput(
+							minecraft.getWindow().getWindow(),
+							Minecraft.getInstance().options.rawMouseInput().get()
+					);
+					GLFW.glfwSetInputMode(Minecraft.getInstance().getWindow().getWindow(), 208897, GLFW.GLFW_CURSOR_NORMAL);
+					GLFW.glfwSetCursor(Minecraft.getInstance().getWindow().getWindow(), CefCursorType.fromId(pad.activeCursor).glfwId);
+				});
+			}
+		}
+	}
+
+	protected void pollElement() {
+		if (pad.view instanceof WDBrowser browser) {
+			JsonObject object = browser.pointerLockElement().getObj();
+			if (object != null) updateCrd(object);
+		}
+	}
 }

src/main/java/net/montoyo/wd/client/gui/GuiRedstoneCtrl.java

@@ -7,17 +7,11 @@ package net.montoyo.wd.client.gui;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.montoyo.mcef.api.API;
-import net.montoyo.wd.WebDisplays;
-import net.montoyo.wd.client.ClientProxy;
 import net.montoyo.wd.client.gui.controls.Button;
 import net.montoyo.wd.client.gui.controls.TextField;
 import net.montoyo.wd.client.gui.loading.FillControl;
-import net.montoyo.wd.net.WDNetworkRegistry;
-import net.montoyo.wd.net.server_bound.C2SMessageRedstoneCtrl;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Util;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import javax.annotation.Nullable;
 
@@ -53,18 +47,18 @@ public class GuiRedstoneCtrl extends WDScreen {
         tfFallingEdge.setText(fallingEdgeURL);
     }
 
-    @GuiSubscribe
-    public void onClick(Button.ClickEvent ev) {
-        if(ev.getSource() == btnOk) {
-            API mcef = ((ClientProxy) WebDisplays.PROXY).getMCEF();
-
-            String rising = mcef.punycode(Util.addProtocol(tfRisingEdge.getText()));
-            String falling = mcef.punycode(Util.addProtocol(tfFallingEdge.getText()));
-            WDNetworkRegistry.INSTANCE.sendToServer(new C2SMessageRedstoneCtrl(pos, rising, falling));
-        }
-
-        minecraft.setScreen(null);
-    }
+//    @GuiSubscribe
+//    public void onClick(Button.ClickEvent ev) {
+//        if(ev.getSource() == btnOk) {
+//            API mcef = ((ClientProxy) WebDisplays.PROXY).getMCEF();
+//
+//            String rising = mcef.punycode(Util.addProtocol(tfRisingEdge.getText()));
+//            String falling = mcef.punycode(Util.addProtocol(tfFallingEdge.getText()));
+//            WDNetworkRegistry.INSTANCE.sendToServer(new C2SMessageRedstoneCtrl(pos, rising, falling));
+//        }
+//
+//        minecraft.setScreen(null);
+//    }
 
     @Override
     public boolean isForBlock(BlockPos bp, BlockSide side) {

src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java

@@ -15,11 +15,16 @@ import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.client.gui.controls.*;
 import net.montoyo.wd.client.gui.loading.FillControl;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.entity.ScreenBlockEntity;
 import net.montoyo.wd.item.WDItem;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
 import net.montoyo.wd.utilities.*;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.data.Rotation;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nullable;
@@ -30,7 +35,7 @@ import java.util.UUID;
 public class GuiScreenConfig extends WDScreen {
 
     //Screen data
-    private final TileEntityScreen tes;
+    private final ScreenBlockEntity tes;
     private final BlockSide side;
     private NameUUIDPair owner;
     private NameUUIDPair[] friends;
@@ -119,7 +124,7 @@ public class GuiScreenConfig extends WDScreen {
     private CheckBox[] friendBoxes;
     private CheckBox[] otherBoxes;
 
-    public GuiScreenConfig(Component component, TileEntityScreen tes, BlockSide side, NameUUIDPair[] friends, int fr, int or) {
+    public GuiScreenConfig(Component component, ScreenBlockEntity tes, BlockSide side, NameUUIDPair[] friends, int fr, int or) {
         super(component);
         this.tes = tes;
         this.side = side;
@@ -147,7 +152,7 @@ public class GuiScreenConfig extends WDScreen {
         boxOClick.setUserdata(ScreenRights.INTERACT);
         boxOSetUrl.setUserdata(ScreenRights.CHANGE_URL);
 
-        TileEntityScreen.Screen scr = tes.getScreen(side);
+        ScreenData scr = tes.getScreen(side);
         if(scr != null) {
             owner = scr.owner;
             rotation = scr.rotation;
@@ -191,7 +196,7 @@ public class GuiScreenConfig extends WDScreen {
     }
 
     private void clickSetRes() {
-        TileEntityScreen.Screen scr = tes.getScreen(side);
+        ScreenData scr = tes.getScreen(side);
         if(scr == null)
             return; //WHATDAFUQ?
 

src/main/java/net/montoyo/wd/client/gui/GuiSetURL2.java

@@ -15,14 +15,14 @@ import net.montoyo.wd.client.ClientProxy;
 import net.montoyo.wd.client.gui.controls.Button;
 import net.montoyo.wd.client.gui.controls.TextField;
 import net.montoyo.wd.client.gui.loading.FillControl;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.entity.ScreenBlockEntity;
 import net.montoyo.wd.item.ItemMinePad2;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.server_bound.C2SMessageMinepadUrl;
 import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Util;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.serialization.Util;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import java.io.IOException;
 import java.util.Map;
@@ -32,7 +32,7 @@ import java.util.UUID;
 public class GuiSetURL2 extends WDScreen {
 	
 	//Screen data
-	private TileEntityScreen tileEntity;
+	private ScreenBlockEntity tileEntity;
 	private BlockSide screenSide;
 	private Vector3i remoteLocation;
 	
@@ -55,7 +55,7 @@ public class GuiSetURL2 extends WDScreen {
 	@FillControl
 	private Button btnOk;
 	
-	public GuiSetURL2(TileEntityScreen tes, BlockSide side, String url, Vector3i rl) {
+	public GuiSetURL2(ScreenBlockEntity tes, BlockSide side, String url, Vector3i rl) {
 		super(Component.nullToEmpty(null));
 		tileEntity = tes;
 		screenSide = side;
@@ -120,13 +120,13 @@ public class GuiSetURL2 extends WDScreen {
 		if (!url.isEmpty()) {
 			
 			try {
-				TileEntityScreen.url(url);
+				ScreenBlockEntity.url(url);
 			} catch (IOException e) {
 				throw new RuntimeException(e);
 			}
 			
 			url = Util.addProtocol(url);
-			url = ((ClientProxy) WebDisplays.PROXY).getMCEF().punycode(url);
+//			url = ((ClientProxy) WebDisplays.PROXY).getMCEF().punycode(url);
 			
 			if (isPad) {
 				UUID uuid = getUUID();

src/main/java/net/montoyo/wd/client/gui/RenderRecipe.java

@@ -7,6 +7,7 @@ package net.montoyo.wd.client.gui;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.language.I18n;
@@ -77,15 +78,16 @@ public class RenderRecipe extends Screen {
         Log.info("Loaded %d recipes", recipes.size());
         nextRecipe();
     }
-
+    
     @Override
-    public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) {
-        renderBackground(poseStack);
+    public void render(GuiGraphics context, int mouseX, int mouseY, float partialTick) {
+//        renderBackground(poseStack);
+        renderBackground(context);
 
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.setShaderTexture(0, CRAFTING_TABLE_GUI_TEXTURES);
-        blit(poseStack, x, y, 0, 0, SIZE_X, SIZE_Y);
-        font.draw(poseStack, I18n.get("container.crafting"), x + 28, y + 6, 0x404040);
+//        context.blit(x, y, 0, 0, SIZE_X, SIZE_Y);
+//        font.draw(poseStack, I18n.get("container.crafting"), x + 28, y + 6, 0x404040);
 
         Lighting.setupForFlatItems();
 //        RenderSystem.disableLighting(); //TODO: Need this?
@@ -98,15 +100,15 @@ public class RenderRecipe extends Screen {
                     int x = this.x + 30 + sx * 18;
                     int y = this.y + 17 + sy * 18;
 
-                    renderItem.renderAndDecorateItem(minecraft.player, is, x, y, 0);
-                    renderItem.renderGuiItemDecorations(font, is, x, y, null);
+                    context.renderItem(is, x, y);
+                    context.renderItemDecorations(font, is, x, y);
                 }
             }
         }
 
         if(recipeResult != null) {
-            renderItem.renderAndDecorateItem(minecraft.player, recipeResult, x + 124, y + 35, 0);
-            renderItem.renderGuiItemDecorations(font, recipeResult, x + 124, y + 35, null);
+            context.renderItem(recipeResult, x, y);
+            context.renderItemDecorations(font, recipeResult, x, y);
         }
 
 //        GlStateManager.enableLighting();
@@ -127,7 +129,7 @@ public class RenderRecipe extends Screen {
             }
         }
 
-        recipeResult = recipe.getResultItem();
+//        recipeResult = recipe.getResultItem();
     }
 
     private void nextRecipe() {

src/main/java/net/montoyo/wd/client/gui/WDScreen.java

@@ -7,8 +7,9 @@ package net.montoyo.wd.client.gui;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
@@ -25,6 +26,10 @@ import net.montoyo.wd.client.gui.loading.JsonOWrapper;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.server_bound.C2SMessageACQuery;
 import net.montoyo.wd.utilities.*;
+import net.montoyo.wd.utilities.data.Bounds;
+import net.montoyo.wd.utilities.math.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
@@ -111,10 +116,12 @@ public abstract class WDScreen extends Screen {
     }
 
     @Override
-    public void render(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void render(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(defaultBackground)
             renderBackground(poseStack);
 
+        RenderSystem.setShaderColor(1.f, 1.f, 1.f, 1.f);
+        
         for(Control ctrl: controls)
             ctrl.draw(poseStack, mouseX, mouseY, ptt);
 
@@ -136,9 +143,20 @@ public abstract class WDScreen extends Screen {
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
         boolean clicked = false;
 
+        Control clickedEl = null;
         for(Control ctrl: controls) {
             clicked = ctrl.mouseClicked(mouseX, mouseY, button);
-            if (clicked) break; // don't assume the compiler will optimize stuff
+            if (clicked) {
+                clickedEl = ctrl;
+                break; // don't assume the compiler will optimize stuff
+            }
+        }
+
+        if (clicked) {
+            for (Control control : controls) {
+                if (control != clickedEl)
+                    control.unfocus();
+            }
         }
 
         return clicked;
@@ -167,7 +185,7 @@ public abstract class WDScreen extends Screen {
     @Override
     protected void init() {
         CURRENT_SCREEN = this;
-        minecraft.keyboardHandler.setSendRepeatsToGui(true);
+//        minecraft.keyboardHandler.setSendRepeatsToGui(true);
     }
 
     @Override
@@ -180,7 +198,7 @@ public abstract class WDScreen extends Screen {
         for(Control ctrl : controls)
             ctrl.destroy();
 
-        Minecraft.getInstance().keyboardHandler.setSendRepeatsToGui(false);
+//        Minecraft.getInstance().keyboardHandler.setSendRepeatsToGui(false);
         CURRENT_SCREEN = null;
     }
 
@@ -362,12 +380,12 @@ public abstract class WDScreen extends Screen {
         }
     }
 
-    public void drawItemStackTooltip(PoseStack poseStack, ItemStack is, int x, int y) {
-        renderTooltip(poseStack, is, x, y); //Since it's protected...
+    public void drawItemStackTooltip(GuiGraphics poseStack, ItemStack is, int x, int y) {
+        poseStack.renderTooltip(Minecraft.getInstance().font, is, x, y); //Since it's protected...
     }
 
-    public void drawTooltip(PoseStack poseStack, List<String> lines, int x, int y) {
-        renderTooltip(poseStack, lines.stream().map(a -> FormattedCharSequence.forward(a, Style.EMPTY)).collect(Collectors.toList()), x, y, font); //This is also protected...
+    public void drawTooltip(GuiGraphics poseStack, List<String> lines, int x, int y) {
+        poseStack.renderTooltip(Minecraft.getInstance().font, lines.stream().map(a -> FormattedCharSequence.forward(a, Style.EMPTY)).collect(Collectors.toList()), x, y); //This is also protected...
     }
 
     public void requirePostDraw(Control ctrl) {

src/main/java/net/montoyo/wd/client/gui/camera/KeyboardCamera.java

@@ -0,0 +1,273 @@
+package net.montoyo.wd.client.gui.camera;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.arguments.EntityAnchorArgument;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.client.event.ViewportEvent;
+import net.minecraftforge.event.TickEvent;
+import net.montoyo.wd.client.gui.GuiKeyboard;
+import net.montoyo.wd.config.ClientConfig;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.utilities.browser.WDBrowser;
+import net.montoyo.wd.utilities.browser.handlers.js.queries.ElementCenterQuery;
+import net.montoyo.wd.utilities.data.BlockSide;
+
+public class KeyboardCamera {
+    private static ScreenBlockEntity tes;
+    private static BlockSide side;
+
+    private static double oxCrd = -1;
+    private static double xCrd = -1;
+    private static double nxCrd = -1;
+    private static double oyCrd = -1;
+    private static double yCrd = -1;
+    private static double nyCrd = -1;
+
+    private static double nextX = -1;
+    private static double nextY = -1;
+    private static double focalX = -1;
+    private static double focalY = -1;
+
+    private static final boolean[] mouseStatus = new boolean[2];
+
+    protected static Vec2 pxToHit(ScreenData scr, Vec2 dst) {
+        float cx, cy;
+        if (scr.rotation.isVertical) {
+            cy = dst.x;
+            cx = dst.y;
+        } else {
+            cx = dst.x;
+            cy = dst.y;
+        }
+
+        cx /= (float) scr.resolution.x;
+        cy /= (float) scr.resolution.y;
+
+        switch (scr.rotation) {
+            case ROT_270:
+                cx = 1.0f - cx;
+                break;
+
+            case ROT_180:
+                cx = 1.0f - cx;
+                cy = 1.0f - cy;
+                break;
+
+            case ROT_90:
+                cy = 1.0f - cy;
+                break;
+        }
+
+        if (side != BlockSide.BOTTOM)
+            cy = 1.0f - cy;
+
+        float swInverse = (((float) scr.size.x) - 4.f / 16.f);
+        float shInverse = (((float) scr.size.y) - 4.f / 16.f);
+
+        cx *= swInverse;
+        cy *= shInverse;
+
+        if (side.right.x > 0 || side.right.z > 0)
+            cx += 1.f;
+
+        if (side == BlockSide.TOP || side == BlockSide.BOTTOM)
+            cy -= 1.f;
+
+        return new Vec2(cx + (2 / 16f), cy + (2 / 16f));
+    }
+
+    protected static void updateCrd(ElementCenterQuery lock) {
+        ScreenData scr = tes.getScreen(side);
+        if (scr != null) {
+            Vec2 c;
+
+            if (!mouseStatus[0] && !mouseStatus[1]) {
+                if (lock.hasFocused()) {
+                    if (ClientConfig.Input.keyboardCamera) {
+                        nextX = lock.getX();
+                        nextY = lock.getY();
+
+                        c = pxToHit(scr, new Vec2((float) nextX, (float) nextY));
+                    } else c = new Vec2(scr.size.x / 2f, scr.size.y / 2f);
+                } else c = new Vec2(scr.size.x / 2f, scr.size.y / 2f);
+//            } else c = new Vec2((float) focalX, (float) focalY);
+            } else return;
+
+            focalX = c.x;
+            focalY = c.y;
+
+            nextX = c.x;
+            nextY = c.y;
+
+            if (nextX < 0) nextX = 0;
+            else if (nextX > scr.size.x) nextX = scr.size.x;
+            if (nextY < 0) nextY = 0;
+            else if (nextY > scr.size.y) nextY = scr.size.y;
+
+            float scl = Math.max(scr.size.x, scr.size.y);
+
+            double mx = Minecraft.getInstance().mouseHandler.xpos();
+            mx /= Minecraft.getInstance().getWindow().getWidth();
+
+            double my = Minecraft.getInstance().mouseHandler.ypos();
+            my /= Minecraft.getInstance().getWindow().getHeight();
+
+            Vec2 v2 = new Vec2((float) mx, (float) my).add(-0.5f);
+
+            nextX += v2.x * scl;
+            nextY -= v2.y * scl;
+        }
+    }
+
+    protected static void pollElement() {
+        ScreenBlockEntity teTmp = tes;
+        BlockSide sdTmp = side;
+
+        // async nonsense can occur here
+        if (teTmp == null || sdTmp == null) return;
+
+        ScreenData scr = teTmp.getScreen(sdTmp);
+        if (scr != null) {
+            if (scr.browser instanceof WDBrowser wdBrowser) {
+                wdBrowser.focusedElement().dispatch(scr.browser);
+                updateCrd(((WDBrowser) scr.browser).focusedElement());
+            }
+        }
+    }
+
+    public static float[] getAngle(Entity e, double pct) {
+        BlockEntity tes = KeyboardCamera.tes;
+        BlockSide side = KeyboardCamera.side;
+        if (tes == null) return new float[]{Float.NaN, 0};
+        if (side == null) return new float[]{Float.NaN, 0};
+
+        double coxCrd = Mth.lerp(0.5 * pct, oxCrd, xCrd);
+        double coyCrd = Mth.lerp(0.5 * pct, oyCrd, yCrd);
+
+        double focalX = tes.getBlockPos().getX() +
+                side.right.x * (coxCrd - 1) + side.up.x * coyCrd + Math.abs(side.forward.x) * 0.5;
+        double focalY = tes.getBlockPos().getY() +
+                side.right.y * (coxCrd - 1) + side.up.y * coyCrd + Math.abs(side.forward.y) * 0.5;
+        double focalZ = tes.getBlockPos().getZ() +
+                side.right.z * (coxCrd - 1) + side.up.z * coyCrd + Math.abs(side.forward.z) * 0.5;
+
+        focalX += side.forward.x * 0.5f;
+        focalY += side.forward.y * 0.5f;
+        focalZ += side.forward.z * 0.5f;
+
+        float[] angle = lookAt(
+                e, EntityAnchorArgument.Anchor.EYES,
+                new Vec3(focalX, focalY, focalZ)
+        );
+
+        return angle;
+    }
+
+    public static void setMouse(int side, boolean pressed) {
+        mouseStatus[side] = pressed;
+    }
+
+    public static void updateCamera(ViewportEvent.ComputeCameraAngles event) {
+        if (tes == null) {
+            xCrd = -1;
+            yCrd = -1;
+            return; // nothing to do
+        }
+
+        if (xCrd == -1) return;
+        if (yCrd == -1) return;
+
+        float[] angle = getAngle(event.getCamera().getEntity(), event.getPartialTick());
+
+        if (Float.isNaN(angle[0])) return;
+
+//        float xRot = event.getYaw(); // left right
+//        float yRot = event.getPitch(); // up down
+
+        // TODO: smooth in/out
+        event.setYaw(angle[1]);
+        event.setPitch(angle[0]);
+    }
+
+    public static void focus(ScreenBlockEntity screen, BlockSide side) {
+        KeyboardCamera.tes = screen;
+        KeyboardCamera.side = side;
+    }
+
+    public static float[] lookAt(Entity entity, EntityAnchorArgument.Anchor pAnchor, Vec3 pTarget) {
+        Vec3 vec3 = pAnchor.apply(entity);
+        double d0 = pTarget.x - vec3.x;
+        double d1 = pTarget.y - vec3.y;
+        double d2 = pTarget.z - vec3.z;
+        double d3 = Math.sqrt(d0 * d0 + d2 * d2);
+        float xr = (Mth.wrapDegrees((float) (-(Mth.atan2(d1, d3) * (double) (180F / (float) Math.PI)))));
+        float yr = (Mth.wrapDegrees((float) (Mth.atan2(d2, d0) * (double) (180F / (float) Math.PI)) - 90.0F));
+        return new float[]{xr, yr};
+    }
+
+    protected static int delay = 8;
+
+    public static void gameTick(TickEvent.ClientTickEvent event) {
+        if (mouseStatus[0] || mouseStatus[1]) {
+            oxCrd = Mth.lerp(0.5, oxCrd, xCrd);
+            oyCrd = Mth.lerp(0.5, oyCrd, yCrd);
+            return;
+        }
+        if (event.phase.equals(TickEvent.Phase.END)) {
+            if (side == null) {
+                delay = 1;
+                oxCrd = -1;
+                oyCrd = -1;
+                xCrd = -1;
+                yCrd = -1;
+                nxCrd = -1;
+                nyCrd = -1;
+                return;
+            }
+
+            if (!(Minecraft.getInstance().screen instanceof GuiKeyboard)) {
+                tes = null;
+                side = null;
+                return;
+            }
+
+            pollElement();
+
+            double anxx = nextX;
+            double anxy = nextY;
+
+            if (
+                    anxx == -1 || anxy == -1 ||
+                            nxCrd == -1 || nyCrd == -1 ||
+                            oxCrd == -1 || oyCrd == -1 ||
+                            xCrd == -1 || yCrd == -1
+            ) {
+                ScreenData data = tes.getScreen(side);
+                if (data == null)
+                    return;
+
+                anxx = data.size.x / 2.0;
+                anxy = data.size.y / 2.0;
+
+                if (nxCrd == -1) {
+                    oxCrd = xCrd = anxx;
+                    oyCrd = yCrd = anxy;
+                }
+            }
+
+            nxCrd = anxx;
+            nyCrd = anxy;
+
+            oxCrd = Mth.lerp(0.5, oxCrd, xCrd);
+            xCrd = Mth.lerp(0.15, xCrd, nxCrd);
+
+            oyCrd = Mth.lerp(0.5, oyCrd, yCrd);
+            yCrd = Mth.lerp(0.15, yCrd, nyCrd);
+        }
+    }
+}

src/main/java/net/montoyo/wd/client/gui/controls/Button.java

@@ -5,10 +5,16 @@
 package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentContents;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
 import org.lwjgl.glfw.GLFW;
 
+import java.util.function.Supplier;
+
 public class Button extends Control {
 
     protected final net.minecraft.client.gui.components.Button btn;
@@ -31,17 +37,23 @@ public class Button extends Control {
         }
 
     }
-
+    
     public Button() {
-        btn = new net.minecraft.client.gui.components.Button(0,0, 0, 0, Component.nullToEmpty(null), a -> {});
+        btn = net.minecraft.client.gui.components.Button.builder(Component.nullToEmpty(""), a -> {})
+                .bounds(0, 0, 0, 0)
+                .build();
     }
 
     public Button(String text, int x, int y, int width) {
-        btn = new net.minecraft.client.gui.components.Button(x, y, width, 20, Component.nullToEmpty(text), a -> {});
+        btn = net.minecraft.client.gui.components.Button.builder(Component.nullToEmpty(text), a -> {})
+                .bounds(x, y, width, 20)
+                .build();
     }
 
     public Button(String text, int x, int y) {
-        btn = new net.minecraft.client.gui.components.Button(0, 0, x, y, Component.nullToEmpty(text), a -> {});
+        btn = net.minecraft.client.gui.components.Button.builder(Component.nullToEmpty(text), a -> {})
+                .bounds(0, 0, x, y)
+                .build();
     }
 
     @Override
@@ -71,7 +83,8 @@ public class Button extends Control {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
+        btn.setFGColor(16777215);
         btn.render(poseStack, mouseX, mouseY, ptt);
     }
 
@@ -103,18 +116,17 @@ public class Button extends Control {
 
     @Override
     public void setPos(int x, int y) {
-        btn.x = x;
-        btn.y = y;
+        btn.setPosition(x, y);
     }
 
     @Override
     public int getX() {
-        return btn.x;
+        return btn.getX();
     }
 
     @Override
     public int getY() {
-        return btn.y;
+        return btn.getY();
     }
 
     public net.minecraft.client.gui.components.Button getMcButton() {
@@ -204,8 +216,10 @@ public class Button extends Control {
     @Override
     public void load(JsonOWrapper json) {
         super.load(json);
-        btn.x = json.getInt("x", 0);
-        btn.y = json.getInt("y", 0);
+        btn.setPosition(
+                json.getInt("x", 0),
+                json.getInt("y", 0)
+        );
         btn.setWidth(json.getInt("width", 200));
         btn.setHeight(json.getInt("height", 20));
         btn.setMessage(Component.nullToEmpty(tr(json.getString("label", btn.getMessage().getContents().toString()))));

src/main/java/net/montoyo/wd/client/gui/controls/CheckBox.java

@@ -7,6 +7,9 @@ package net.montoyo.wd.client.gui.controls;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
@@ -75,20 +78,19 @@ public class CheckBox extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(visible) {
 //            GlStateManager.disableAlpha();
-            poseStack.pushPose();
-            RenderSystem.setShaderTexture(2, checked ? texChecked : texUnchecked);
-            RenderSystem.bindTexture(2);
+            poseStack.pose().pushPose();
             RenderSystem.enableBlend();
-            fillTexturedRect(poseStack, x, y, WIDTH, HEIGHT, 0.0, 0.0, 1.0, 1.0);
+            poseStack.blit(
+                    checked ? texChecked : texUnchecked, x, y, 0, 0, 0, WIDTH, HEIGHT, WIDTH, HEIGHT
+            );
             RenderSystem.disableBlend();
-            RenderSystem.bindTexture(-1);
 
-            poseStack.popPose();
+            poseStack.pose().popPose();
             boolean inside = (!disabled && mouseX >= x && mouseX <= x + WIDTH + 2 + labelW && mouseY >= y && mouseY < y + HEIGHT);
-            font.draw(poseStack, label, x + WIDTH + 2, y + 4, inside ? 0xFF0080FF : COLOR_WHITE);
+            poseStack.drawString(Minecraft.getInstance().font, label, x + WIDTH + 2, y + 4, inside ? 0xFF0080FF : COLOR_WHITE, false);
         }
     }
 
@@ -134,7 +136,7 @@ public class CheckBox extends BasicControl {
     }
 
     @Override
-    public void postDraw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void postDraw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(tooltip != null && !disabled && mouseX >= x && mouseX <= x + WIDTH + 2 + labelW && mouseY >= y && mouseY < y + HEIGHT)
             parent.drawTooltip(poseStack, tooltip, mouseX, mouseY);
     }

src/main/java/net/montoyo/wd/client/gui/controls/Container.java

@@ -5,6 +5,7 @@
 package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.montoyo.wd.client.gui.loading.GuiLoader;
 import net.montoyo.wd.client.gui.loading.JsonAWrapper;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
@@ -137,13 +138,13 @@ public abstract class Container extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(visible) {
             mouseX -= x + paddingX;
             mouseY -= y + paddingY;
 
-            poseStack.pushPose();
-            poseStack.translate(x + paddingX, y + paddingY, 0.0);
+            poseStack.pose().pushPose();
+            poseStack.pose().translate(x + paddingX, y + paddingY, 0.0);
 
             if(disabled) {
                 for(Control ctrl : childs)
@@ -153,7 +154,7 @@ public abstract class Container extends BasicControl {
                     ctrl.draw(poseStack, mouseX, mouseY, ptt);
             }
 
-            poseStack.popPose();
+            poseStack.pose().popPose();
         }
     }
 
@@ -188,4 +189,10 @@ public abstract class Container extends BasicControl {
         return null;
     }
 
+    @Override
+    public void unfocus() {
+        for (Control control : childs) {
+            control.unfocus();
+        }
+    }
 }

src/main/java/net/montoyo/wd/client/gui/controls/Control.java

@@ -8,19 +8,24 @@ import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
-import com.mojang.math.Matrix4f;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.gui.WDScreen;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
-import net.montoyo.wd.utilities.Bounds;
+import net.montoyo.wd.utilities.data.Bounds;
+import org.joml.Matrix4f;
 
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-import static org.lwjgl.opengl.GL11.glEnable;
+import java.util.Arrays;
+
+import static com.mojang.math.Axis.XP;
 
 @OnlyIn(Dist.CLIENT)
 public abstract class Control {
@@ -74,6 +79,9 @@ public abstract class Control {
         return false;
     }
 
+    public void unfocus() {
+    }
+
     public boolean mouseReleased(double mouseX, double mouseY, int state) {
         return false;
     }
@@ -90,10 +98,10 @@ public abstract class Control {
         return false;
     }
 
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
     }
 
-    public void postDraw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void postDraw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
     }
 
     public void destroy() {
@@ -109,7 +117,7 @@ public abstract class Control {
     public abstract int getHeight();
     public abstract void setPos(int x, int y);
 
-    public void fillRect(int x, double y, int w, int h, int color) {
+    public void fillRect(MultiBufferSource.BufferSource source, int x, double y, int w, int h, int color) {
         double x1 = (double) x;
         double y1 = (double) y;
         double x2 = (double) (x + w);
@@ -119,34 +127,38 @@ public abstract class Control {
         int g = (color >> 8 ) & 0xFF;
         int b =  color & 0xFF;
 
-        RenderSystem.setShaderColor(((float) r) / 255.f, ((float) g) / 255.f, ((float) b) / 255.f, ((float) a) / 255.f);
-        RenderSystem.disableTexture();
+        float[] sdrCol = Arrays.copyOf(RenderSystem.getShaderColor(), 4);
+        RenderSystem.setShaderColor(1, 1, 1, 1f);
+//        RenderSystem.disableTexture();
         RenderSystem.enableBlend();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
 
-        vBuffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
-        vBuffer.vertex(x1, y2, 0.0).endVertex();
-        vBuffer.vertex(x2, y2, 0.0).endVertex();
-        vBuffer.vertex(x2, y1, 0.0).endVertex();
-        vBuffer.vertex(x1, y1, 0.0).endVertex();
-        tessellator.end();
+        VertexConsumer consumer = source.getBuffer(RenderType.gui());
+        consumer.vertex(x1, y2, 0.0).color(r, g, b, a).endVertex();
+        consumer.vertex(x2, y2, 0.0).color(r, g, b, a).endVertex();
+        consumer.vertex(x2, y1, 0.0).color(r, g, b, a).endVertex();
+        consumer.vertex(x1, y1, 0.0).color(r, g, b, a).endVertex();
+
+        RenderSystem.setShaderColor(sdrCol[0], sdrCol[1], sdrCol[2], sdrCol[3]);
 
         RenderSystem.disableBlend();
-        RenderSystem.enableTexture();glEnable(GL_TEXTURE_2D);
+//        RenderSystem.enableTexture();
     }
 
     public void fillTexturedRect(PoseStack poseStack, int x, int y, int w, int h, double u1, double v1, double u2, double v2) {
-        double x1 = (double) x;
-        double y1 = (double) y;
-        double x2 = (double) (x + w);
-        double y2 = (double) (y + h);
+        float x1 = x;
+        float y1 = y;
+        float x2 = (x + w);
+        float y2 = (y + h);
 
-        vBuffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-        vBuffer.vertex(x1, y2, 0.0).uv((float) u1, (float) v2).color(255, 255, 255, 255).endVertex();
-        vBuffer.vertex(x2, y2, 0.0).uv((float) u2, (float) v2).color(255, 255, 255, 255).endVertex();
-        vBuffer.vertex(x2, y1, 0.0).uv((float) u2, (float) v1).color(255, 255, 255, 255).endVertex();
-        vBuffer.vertex(x1, y1, 0.0).uv((float) u1, (float) v1).color(255, 255, 255, 255).endVertex();
-        tessellator.end();
+        RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
+        Matrix4f p = poseStack.last().pose();
+        vBuffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX);
+        vBuffer.vertex(p, x1, y2, 0.0f).color(255, 255, 255, 255).uv((float) u1, (float) v2).endVertex();
+        vBuffer.vertex(p, x2, y2, 0.0f).color(255, 255, 255, 255).uv((float) u2, (float) v2).endVertex();
+        vBuffer.vertex(p, x2, y1, 0.0f).color(255, 255, 255, 255).uv((float) u2, (float) v1).endVertex();
+        vBuffer.vertex(p, x1, y1, 0.0f).color(255, 255, 255, 255).uv((float) u1, (float) v1).endVertex();
+        BufferUploader.drawWithShader(vBuffer.end());
     }
 
     public static void blend(boolean enable) {
@@ -164,11 +176,11 @@ public abstract class Control {
             RenderSystem.setShaderTexture(0, resLoc);
     }
 
-    public void drawBorder(PoseStack poseStack, int x, int y, int w, int h, int color) {
+    public void drawBorder(GuiGraphics poseStack, int x, int y, int w, int h, int color) {
         drawBorder(poseStack, x, y, w, h, color, 1.0);
     }
 
-    public void drawBorder(PoseStack poseStack, int x, int y, int w, int h, int color, double sz) {
+    public void drawBorder(GuiGraphics poseStack, int x, int y, int w, int h, int color, double sz) {
         double x1 = (double) x;
         double y1 = (double) y;
         double x2 = (double) (x + w);
@@ -178,8 +190,9 @@ public abstract class Control {
         int g = (color >> 8 ) & 0xFF;
         int b =  color & 0xFF;
 
+        float[] sdrCol = Arrays.copyOf(RenderSystem.getShaderColor(), 4);
         RenderSystem.setShaderColor(((float) r) / 255.f, ((float) g) / 255.f, ((float) b) / 255.f, ((float) a) / 255.f);
-        RenderSystem.enableTexture();
+//        RenderSystem.enableTexture();
         RenderSystem.enableBlend();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
 
@@ -209,36 +222,46 @@ public abstract class Control {
         vBuffer.vertex(x2 - sz, y1, 0.0).endVertex();
         tessellator.end();
 
+        RenderSystem.setShaderColor(sdrCol[0], sdrCol[1], sdrCol[2], sdrCol[3]);
+
         RenderSystem.disableBlend();
-        RenderSystem.enableTexture();
+//        RenderSystem.enableTexture();
     }
 
-    public PoseStack beginFramebuffer(RenderTarget fbo, float vpW, float vpH) {
+    public GuiGraphics beginFramebuffer(RenderTarget fbo, float vpW, float vpH) {
+        GuiGraphics tmpGraphics = new GuiGraphics(Minecraft.getInstance(), Minecraft.getInstance().renderBuffers().bufferSource());
+
         fbo.bindWrite(true);
 
         RenderSystem.backupProjectionMatrix();
-        RenderSystem.setProjectionMatrix(Matrix4f.orthographic(0.0f, vpW, vpH, 0.0f, -1.0f,1.0f));
+        RenderSystem.setProjectionMatrix(new Matrix4f().ortho(0.0f, vpW, vpH, 0.0f, -1.0f,1.0f), VertexSorting.ORTHOGRAPHIC_Z);
 
-        PoseStack poseStack = RenderSystem.getModelViewStack();
+        tmpGraphics.pose().last().pose().set(RenderSystem.getModelViewStack().last().pose());
+        tmpGraphics.pose().last().normal().set(RenderSystem.getModelViewStack().last().normal());
+        PoseStack poseStack = tmpGraphics.pose();
         poseStack.pushPose();
         poseStack.setIdentity();
-//        poseStack.mulPose(Vector3f.XP.rotationDegrees(180.0f));
+        poseStack.mulPose(XP.rotationDegrees(180.0f));
+        RenderSystem.getModelViewStack().pushPose();
+        RenderSystem.getModelViewStack().last().pose().set(poseStack.last().pose());
+        RenderSystem.getModelViewStack().last().normal().set(poseStack.last().normal());
         RenderSystem.applyModelViewMatrix();
 
         if(!fbo.useDepth)
             RenderSystem.disableDepthTest();
 
-        return poseStack;
+        return tmpGraphics;
     }
 
-    public void endFramebuffer(PoseStack poseStack, RenderTarget fbo) {
+    public void endFramebuffer(GuiGraphics poseStack, RenderTarget fbo) {
         if(!fbo.useDepth)
             RenderSystem.enableDepthTest();
 
 
         RenderSystem.colorMask(true, true, true, true);
         RenderSystem.restoreProjectionMatrix();
-        poseStack.popPose();
+        poseStack.pose().popPose();
+        RenderSystem.getModelViewStack().popPose();
         RenderSystem.applyModelViewMatrix();
         fbo.unbindWrite();
         mc.getMainRenderTarget().bindWrite(true);

src/main/java/net/montoyo/wd/client/gui/controls/ControlGroup.java

@@ -7,12 +7,13 @@ package net.montoyo.wd.client.gui.controls;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
-import net.montoyo.wd.utilities.Bounds;
+import net.montoyo.wd.utilities.data.Bounds;
 
-import static org.lwjgl.opengl.GL11.*;
+import java.util.Arrays;
 
 public class ControlGroup extends Container {
 
@@ -94,22 +95,23 @@ public class ControlGroup extends Container {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         super.draw(poseStack, mouseX, mouseY, ptt);
 
         if(visible) {
-            poseStack.pushPose();
+            poseStack.pose().pushPose();
+            float[] sdrCol = Arrays.copyOf(RenderSystem.getShaderColor(), 4);
             RenderSystem.setShaderColor(0.5f, 0.5f, 0.5f, 1.f);
-            RenderSystem.disableTexture();
+//            RenderSystem.disableTexture();
             RenderSystem.enableBlend();
             RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
 
-            double x1 = (double) x;
-            double y1 = (double) y;
-            double x2 = (double) (x + width);
-            double y2 = (double) (y + height);
+            double x1 = x;
+            double y1 = y;
+            double x2 = (x + width);
+            double y2 = (y + height);
             double bp = 4.0;
-            double lw = (double) labelW;
+            double lw = labelW;
 
             x1 += bp;
             y1 += bp;
@@ -158,12 +160,14 @@ public class ControlGroup extends Container {
             vBuffer.vertex(x2 - 1.0, y1, 0.0).endVertex();
             tessellator.end();
 
+            RenderSystem.setShaderColor(sdrCol[0], sdrCol[1], sdrCol[2], sdrCol[3]);
+
             RenderSystem.disableBlend();
-            RenderSystem.enableTexture();
-            poseStack.popPose();
+//            RenderSystem.enableTexture();
+            poseStack.pose().popPose();
 
             if(labelW != 0)
-                font.drawShadow(poseStack, label, x + 10 + ((int) bp), y, labelColor, labelShadowed);
+                poseStack.drawString(Minecraft.getInstance().font, label, x + 10 + ((int) bp), y, labelColor, labelShadowed);
         }
     }
 
@@ -176,6 +180,13 @@ public class ControlGroup extends Container {
         height = bounds.getHeight() + paddingY * 2;
     }
 
+    @Override
+    public void unfocus() {
+        for (Control control : childs) {
+            control.unfocus();
+        }
+    }
+
     @Override
     public void load(JsonOWrapper json) {
         super.load(json);

src/main/java/net/montoyo/wd/client/gui/controls/Icon.java

@@ -6,8 +6,10 @@ package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
+import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GL11;
 
 public class Icon extends BasicControl {
@@ -44,17 +46,17 @@ public class Icon extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(texture != null) {
-            poseStack.pushPose();
-            RenderSystem.enableTexture();
+            poseStack.pose().pushPose();
+//            RenderSystem.enableTexture();
             RenderSystem.setShaderTexture(1, texture);
             RenderSystem.bindTexture(1);
             RenderSystem.enableBlend();
-            fillTexturedRect(poseStack, x, y, width, height, u1, v1, u2, v2);
+            fillTexturedRect(poseStack.pose(), x, y, width, height, u1, v1, u2, v2);
             RenderSystem.disableBlend();
             RenderSystem.bindTexture(-1);
-            poseStack.popPose();
+            poseStack.pose().popPose();
         }
     }
 

src/main/java/net/montoyo/wd/client/gui/controls/Label.java

@@ -5,6 +5,8 @@
 package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
 
 public class Label extends BasicControl {
@@ -72,9 +74,12 @@ public class Label extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(visible)
-            font.drawShadow(poseStack, label, x, y, color, shadowed);
+            poseStack.drawString(
+                    Minecraft.getInstance().font,
+                    label, x, y, color, shadowed
+            );
     }
 
     @Override

src/main/java/net/montoyo/wd/client/gui/controls/List.java

@@ -9,12 +9,17 @@ import com.mojang.blaze3d.pipeline.TextureTarget;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
 
 import java.util.ArrayList;
 
-import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT;
-import static org.lwjgl.opengl.GL11.GL_NEAREST;
+import static org.lwjgl.opengl.GL11.*;
 
 public class List extends BasicControl {
 
@@ -96,19 +101,21 @@ public class List extends BasicControl {
         if(fbo != null)
             fbo.destroyBuffers();
 
-        fbo = new TextureTarget(parent.screen2DisplayX(width), parent.screen2DisplayY(height), false, Minecraft.ON_OSX);
+        fbo = new TextureTarget(parent.screen2DisplayX(width), parent.screen2DisplayY(height), true, Minecraft.ON_OSX);
         fbo.setFilterMode(GL_NEAREST);
-        fbo.bindWrite(false);
+        fbo.bindWrite(true);
         RenderSystem.clearColor(0.0f, 0.0f, 0.0f, 1.f); //Set alpha to 1
         RenderSystem.clearDepth(GL_COLOR_BUFFER_BIT);
         fbo.unbindWrite();
+        mc.getMainRenderTarget().bindWrite(true);
         update = true;
     }
 
-    private void renderToFBO() {
-        PoseStack poseStack = beginFramebuffer(fbo, width, height);
-        poseStack.pushPose();
-        fillRect(0, 0, width, height, COLOR_BLACK);
+    private void renderToFBO(MultiBufferSource.BufferSource source) {
+        GuiGraphics graphics = beginFramebuffer(fbo, width, height);
+        GL11.glColorMask(true, true, true, true);
+        RenderSystem.applyModelViewMatrix();
+        graphics.fill(0, 0, width, height, COLOR_BLACK);
         RenderSystem.setShaderColor(1.f, 1.f, 1.f, 1.f);
 
         int offset = 4 - getYOffset();
@@ -120,13 +127,13 @@ public class List extends BasicControl {
                     break;
 
                 int color = (i == selected) ? selColor : COLOR_WHITE;
-                font.draw(poseStack, content.get(i).text, 4, i * 12 + offset, color);
+                graphics.drawString(font, content.get(i).text, 4, i * 12 + offset, color);
             }
         }
 
-        drawBorder(poseStack, 0, 0, width, height, 0xFF808080);
-        endFramebuffer(poseStack, fbo);
-        poseStack.popPose();
+        graphics.renderOutline(0, 0, width, height, 0xFF808080);
+        graphics.flush();
+        endFramebuffer(graphics, fbo);
     }
 
     @Override
@@ -311,19 +318,18 @@ public class List extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics graphics, int mouseX, int mouseY, float ptt) {
         if(visible) {
             if(update) {
-                renderToFBO();
+                renderToFBO(graphics.bufferSource());
                 update = false;
             }
 
-            fbo.bindRead(); //TODO: Make sure is right
+            RenderSystem.setShaderTexture(0, fbo.getColorTextureId());
             RenderSystem.setShaderColor(1.f, 1.f, 1.f, 1.f);
-            fillTexturedRect(poseStack, x, y, width, height, 0.0, 1.0, 1.0, 0.0);
-            fbo.unbindRead();
+            fillTexturedRect(graphics.pose(), x, y, width, height, 0.0, 1.0, 1.0, 0.0);
 
-            fillRect(x + width - 5, y + 1 + scrollPos, 4, scrollSize, (scrolling || isInScrollbar(mouseX, mouseY)) ? 0xFF202020 : 0xFF404040);
+            fillRect(graphics.bufferSource(), x + width - 5, y + 1 + scrollPos, 4, scrollSize, (scrolling || isInScrollbar(mouseX, mouseY)) ? 0xFF202020 : 0xFF404040);
         }
     }
 

src/main/java/net/montoyo/wd/client/gui/controls/TextField.java

@@ -5,6 +5,7 @@
 package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.network.chat.Component;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
@@ -98,15 +99,18 @@ public class TextField extends Control {
 
     public TextField() {
         field = new EditBox(font, 1, 1, 198, 20, Component.nullToEmpty(""));
+        setFocused(false);
     }
 
     public TextField(int x, int y, int width, int height) {
         field = new EditBox(font, x + 1, y + 1, width - 2, height - 2, Component.nullToEmpty(""));
+        setFocused(false);
     }
 
     public TextField(int x, int y, int width, int height, String text) {
         field = new EditBox(font, x + 1, y + 1, width - 2, height - 2, Component.nullToEmpty(""));
         field.setValue(text);
+        setFocused(false);
     }
     
     // TODO: make this public static in CefBrowserOSR
@@ -165,9 +169,18 @@ public class TextField extends Control {
     
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-        return field.mouseClicked(mouseX, mouseY, mouseButton);
+        if (field.mouseClicked(mouseX, mouseY, mouseButton)) {
+            setFocused(true);
+            return true;
+        }
+        return false;
     }
-    
+
+    @Override
+    public void unfocus() {
+        setFocused(false);
+    }
+
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int state) {
         return field.mouseReleased(mouseX, mouseY, state);
@@ -190,7 +203,7 @@ public class TextField extends Control {
     }
     
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         field.render(poseStack, mouseX, mouseY, ptt);
     }
 
@@ -241,23 +254,26 @@ public class TextField extends Control {
 
     @Override
     public void setPos(int x, int y) {
-        field.x = x + 1;
-        field.y = y + 1;
+        field.setPosition(
+                x + 1,
+                y + 1
+        );
     }
 
     @Override
     public int getX() {
-        return field.x - 1;
+        return field.getX() - 1;
     }
 
     @Override
     public int getY() {
-        return field.y - 1;
+        return field.getY() - 1;
     }
 
     public void setDisabled(boolean en) {
         enabled = !en;
-        field.setFocus(enabled);
+        if (!en)
+            field.setFocused(false);
     }
 
     public boolean isDisabled() {
@@ -265,12 +281,11 @@ public class TextField extends Control {
     }
 
     public void enable() {
-        field.setFocus(true);
         enabled = true;
     }
 
     public void disable() {
-        field.setFocus(false);
+        field.setFocused(false);
         enabled = false;
     }
 
@@ -291,7 +306,7 @@ public class TextField extends Control {
     }
 
     public void setFocused(boolean val) {
-        field.setFocus(val);
+        field.setFocused(val);
     }
 
     public boolean hasFocus() {
@@ -299,7 +314,7 @@ public class TextField extends Control {
     }
 
     public void focus() {
-        field.setFocus(true);
+        field.setFocused(true);
     }
 
     public void setTextColor(int color) {
@@ -336,8 +351,10 @@ public class TextField extends Control {
     @Override
     public void load(JsonOWrapper json) {
         super.load(json);
-        field.x = json.getInt("x", 0) + 1;
-        field.y = json.getInt("y", 0) + 1;
+        field.setPosition(
+                json.getInt("x", 0) + 1,
+                json.getInt("y", 0) + 1
+        );
         field.setWidth(json.getInt("width", 200) - 2);
         field.setHeight(json.getInt("height", 22) - 2);
         field.setValue(tr(json.getString("text", "")));
@@ -350,7 +367,7 @@ public class TextField extends Control {
 
         field.setTextColor(textColor);
         field.setTextColorUneditable(disabledColor);
-        field.setFocus(enabled);
+        setFocused(false);
     }
 
 }

src/main/java/net/montoyo/wd/client/gui/controls/UpgradeGroup.java

@@ -6,6 +6,8 @@ package net.montoyo.wd.client.gui.controls;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.world.item.ItemStack;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
@@ -26,23 +28,23 @@ public class UpgradeGroup extends BasicControl {
     }
 
     @Override
-    public void draw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void draw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(upgrades != null) {
             int x = this.x;
 
             for(ItemStack is: upgrades) {
                 if(is == overStack && !disabled)
-                    fillRect(x, y, 16, 16, 0x80FF0000);
+                    fillRect(poseStack.bufferSource(), x, y, 16, 16, 0x80FF0000);
 
-                renderItem.renderAndDecorateItem(mc.player, is, x, y, 0);
-                renderItem.renderAndDecorateItem(is, font.lineHeight, x, y); //TODO is lineHeight right?
+                poseStack.renderItem(is, x, y);
+                poseStack.renderItemDecorations(font, is, x, y);
                 x += 18;
             }
         }
     }
 
     @Override
-    public void postDraw(PoseStack poseStack, int mouseX, int mouseY, float ptt) {
+    public void postDraw(GuiGraphics poseStack, int mouseX, int mouseY, float ptt) {
         if(overStack != null)
             parent.drawItemStackTooltip(poseStack, overStack, mouseX, mouseY);
     }

src/main/java/net/montoyo/wd/client/gui/controls/YTButton.java

@@ -6,7 +6,7 @@ package net.montoyo.wd.client.gui.controls;
 
 import net.minecraft.network.chat.Component;
 import net.montoyo.wd.client.gui.loading.JsonOWrapper;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.utilities.serialization.Util;
 import net.montoyo.wd.utilities.VideoType;
 
 import java.net.MalformedURLException;

src/main/java/net/montoyo/wd/client/renderers/LaserPointerRenderer.java

@@ -6,8 +6,6 @@ package net.montoyo.wd.client.renderers;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Vector3f;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -18,8 +16,11 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.ClientProxy;
-import net.montoyo.wd.init.ItemInit;
+import net.montoyo.wd.registry.ItemRegistry;
 import net.montoyo.wd.item.ItemLaserPointer;
+import org.joml.Matrix4f;
+
+import static com.mojang.math.Axis.*;
 
 @OnlyIn(Dist.CLIENT)
 public final class LaserPointerRenderer implements IItemRenderer {
@@ -38,14 +39,14 @@ public final class LaserPointerRenderer implements IItemRenderer {
 						ClientProxy.mouseOn ||
 								ItemLaserPointer.isOn()
 				) &&
-				mc.player.getItemInHand(InteractionHand.MAIN_HAND).getItem().equals(ItemInit.LASER_POINTER.get()) &&
+				mc.player.getItemInHand(InteractionHand.MAIN_HAND).getItem().equals(ItemRegistry.LASER_POINTER.get()) &&
 				(mc.hitResult == null || mc.hitResult.getType() == HitResult.Type.BLOCK || mc.hitResult.getType() == HitResult.Type.MISS);
 	}
 	
 	@Override
 	public boolean render(PoseStack poseStack, ItemStack is, float handSideSign, float swingProgress, float equipProgress, MultiBufferSource multiBufferSource, int packedLight) {
 		RenderSystem.disableCull();
-		RenderSystem.disableTexture();
+//		RenderSystem.disableTexture();
 		RenderSystem.enableDepthTest();
 		RenderSystem.enableBlend();
 		
@@ -61,12 +62,12 @@ public final class LaserPointerRenderer implements IItemRenderer {
 		poseStack.pushPose();
 		poseStack.translate(handSideSign * -0.4f * sinSqrtSwingProg1, (float) (0.2f * Math.sin(sqrtSwingProg * PI * 2.0f)), (float) (-0.2f * Math.sin(swingProgress * PI)));
 		poseStack.translate(handSideSign * 0.56f, -0.52f - equipProgress * 0.6f, -0.72f);
-		poseStack.mulPose(Vector3f.YP.rotationDegrees((float) (handSideSign * (45.0f - Math.sin(swingProgress * swingProgress * PI) * 20.0f))));
-		poseStack.mulPose(Vector3f.ZP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * -20.0f));
-		poseStack.mulPose(Vector3f.XP.rotationDegrees(sinSqrtSwingProg1 * -80.0f));
-		poseStack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * -30.0f));
+		poseStack.mulPose(YP.rotationDegrees((float) (handSideSign * (45.0f - Math.sin(swingProgress * swingProgress * PI) * 20.0f))));
+		poseStack.mulPose(ZP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * -20.0f));
+		poseStack.mulPose(XP.rotationDegrees(sinSqrtSwingProg1 * -80.0f));
+		poseStack.mulPose(YP.rotationDegrees(handSideSign * -30.0f));
 		poseStack.translate(0.0f, 0.2f, 0.0f);
-		poseStack.mulPose(Vector3f.XP.rotationDegrees(10.0f));
+		poseStack.mulPose(XP.rotationDegrees(10.0f));
 		poseStack.scale(1.0f / 16.0f, 1.0f / 16.0f, 1.0f / 16.0f);
 		var matrix = poseStack.last().pose();
 		
@@ -98,7 +99,7 @@ public final class LaserPointerRenderer implements IItemRenderer {
 		
 		RenderSystem.disableBlend();
 		RenderSystem.disableDepthTest();
-		RenderSystem.enableTexture(); //Fix for shitty minecraft fire
+//		RenderSystem.enableTexture(); //Fix for shitty minecraft fire
 		RenderSystem.enableCull();
 		poseStack.popPose();
 		

src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java

@@ -4,10 +4,11 @@
 
 package net.montoyo.wd.client.renderers;
 
+import com.cinemamod.mcef.MCEFBrowser;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.blaze3d.vertex.*;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
@@ -22,11 +23,13 @@ import net.montoyo.wd.client.ClientProxy;
 import net.montoyo.wd.config.ClientConfig;
 import net.montoyo.wd.item.ItemMinePad2;
 
+import static com.mojang.math.Axis.*;
+
 @OnlyIn(Dist.CLIENT)
 public final class MinePadRenderer implements IItemRenderer {
 	private static final float PI = (float) Math.PI;
 	private final Minecraft mc = Minecraft.getInstance();
-	private final ResourceLocation tex = new ResourceLocation("webdisplays", "textures/models/minepad.png");
+	private final ResourceLocation tex = new ResourceLocation("webdisplays", "textures/item/model/minepad.png");
 	private final ModelMinePad model = new ModelMinePad();
 	private final ClientProxy clientProxy = (ClientProxy) WebDisplays.PROXY;
 	
@@ -76,18 +79,18 @@ public final class MinePadRenderer implements IItemRenderer {
 		stack.pushPose();
 		stack.translate(handSideSign * -0.4f * sinSqrtSwingProg1, 0.2f * sinSqrtSwingProg2, -0.2f * sinSwingProg1);
 		stack.translate(handSideSign * 0.56f, -0.52f - equipProgress * 0.6f, -0.72f);
-		stack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * (45.0f - sinSwingProg2 * 20.0f)));
-		stack.mulPose(Vector3f.ZP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * -20.0f));
-		stack.mulPose(Vector3f.XP.rotationDegrees(sinSqrtSwingProg1 * -80.0f));
-		stack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * -45.0f));
+		stack.mulPose(YP.rotationDegrees(handSideSign * (45.0f - sinSwingProg2 * 20.0f)));
+		stack.mulPose(ZP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * -20.0f));
+		stack.mulPose(XP.rotationDegrees(sinSqrtSwingProg1 * -80.0f));
+		stack.mulPose(YP.rotationDegrees(handSideSign * -45.0f));
 		
 		if (sideHold) {
 			stack.translate(0.0f, 0.0f, -0.2f);
-			stack.mulPose(Vector3f.YP.rotationDegrees(20.0f * -handSideSign));
+			stack.mulPose(YP.rotationDegrees(20.0f * -handSideSign));
 			float total = 0.475f;
 			float off = -0.025f; // gotta love magic numbers
 			stack.translate(-(total - off) + (off * handSideSign), -0.1f, 0.0f);
-			stack.mulPose(Vector3f.ZP.rotationDegrees(1.0f));
+			stack.mulPose(ZP.rotationDegrees(1.0f));
 		} else if (handSideSign >= 0) // right hand
 			stack.translate(-1.065f, 0.0f, 0.0f);
 		else // left hand
@@ -112,8 +115,20 @@ public final class MinePadRenderer implements IItemRenderer {
 				double y2 = 14.0 / 32.0 + 0.002;
 				
 				stack.translate(0.063f, 0.28f, 0.001f);
-				RenderSystem.setShaderTexture(0, tex);
-				pd.view.draw(stack, x1, y1, x2, y2);
+//				RenderSystem.setShaderTexture(0, tex);
+				
+				RenderSystem.disableDepthTest();
+				RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
+				RenderSystem.setShaderTexture(0, ((MCEFBrowser) pd.view).getRenderer().getTextureID());
+				Tesselator t = Tesselator.getInstance();
+				BufferBuilder buffer = t.getBuilder();
+				buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+				buffer.vertex(stack.last().pose(), (float) x1, (float) y1, 0.0f).uv(0.0F, 1.0F).color(255, 255, 255, 255).endVertex();
+				buffer.vertex(stack.last().pose(), (float) x2, (float) y1, 0.0f).uv(1.0F, 1.0F).color(255, 255, 255, 255).endVertex();
+				buffer.vertex(stack.last().pose(), (float) x2, (float) y2, 0.0f).uv(1.0F, 0.0F).color(255, 255, 255, 255).endVertex();
+				buffer.vertex(stack.last().pose(), (float) x1, (float) y2, 0.0f).uv(0.0F, 0.0F).color(255, 255, 255, 255).endVertex();
+				t.end();
+				RenderSystem.enableDepthTest();
 			}
 		}
 		
@@ -129,13 +144,13 @@ public final class MinePadRenderer implements IItemRenderer {
 		float tz = -0.4f * sinSwingProg1;
 		
 		stack.translate(handSideSign * (tx + 0.64000005f), ty - 0.6f - equipProgress * 0.6f, tz - 0.71999997f);
-		stack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * 45.0f));
-		stack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * 70.0f));
-		stack.mulPose(Vector3f.ZP.rotationDegrees(handSideSign * sinSwingProg2 * -20.0f));
+		stack.mulPose(YP.rotationDegrees(handSideSign * 45.0f));
+		stack.mulPose(YP.rotationDegrees(handSideSign * sinSqrtSwingProg1 * 70.0f));
+		stack.mulPose(ZP.rotationDegrees(handSideSign * sinSwingProg2 * -20.0f));
 		stack.translate(-handSideSign, 3.6f, 3.5f);
-		stack.mulPose(Vector3f.ZP.rotationDegrees(handSideSign * 120.0f));
-		stack.mulPose(Vector3f.XP.rotationDegrees(200.0f));
-		stack.mulPose(Vector3f.YP.rotationDegrees(handSideSign * -135.0f));
+		stack.mulPose(ZP.rotationDegrees(handSideSign * 120.0f));
+		stack.mulPose(XP.rotationDegrees(200.0f));
+		stack.mulPose(YP.rotationDegrees(handSideSign * -135.0f));
 		stack.translate(handSideSign * 5.6f, 0.0f, 0.0f);
 		
 		PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(mc.player);

src/main/java/net/montoyo/wd/client/renderers/ModelMinePad.java

@@ -6,7 +6,6 @@ package net.montoyo.wd.client.renderers;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
-import com.mojang.math.Matrix4f;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -15,6 +14,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import org.joml.Matrix4f;
 
 @OnlyIn(Dist.CLIENT)
 public final class ModelMinePad {
@@ -48,7 +48,7 @@ public final class ModelMinePad {
 		
 		float z = 0;
 		
-		VertexConsumer consumer = buffers.getBuffer(RenderType.entityCutout(new ResourceLocation("webdisplays:textures/models/minepad_item.png")));
+		VertexConsumer consumer = buffers.getBuffer(RenderType.entityCutout(new ResourceLocation("webdisplays:textures/item/model/minepad_item.png")));
 		
 		consumer.vertex(positionMatrix, (float) x1, (float) y1 - padding, z).color(255, 255, 255, 255).uv(1f / width, 12f / height).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(0.25f, 0.5f, 1).endVertex();
 		consumer.vertex(positionMatrix, (float) x2, (float) y1 - padding, z).color(255, 255, 255, 255).uv(19f / width, 12f / height).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(0.25f, 0.5f, 1).endVertex();

src/main/java/net/montoyo/wd/client/renderers/ScreenBaker.java

@@ -19,9 +19,9 @@ import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.data.ModelData;
 import net.minecraftforge.client.model.data.ModelProperty;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector3f;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector3f;
+import net.montoyo.wd.utilities.math.Vector3i;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/net/montoyo/wd/client/renderers/ScreenModelLoader.java

@@ -21,7 +21,7 @@ import java.util.function.Function;
 public class ScreenModelLoader implements IGeometryLoader<ScreenModelLoader.ScreenModelGeometry> {
     public static final ResourceLocation SCREEN_LOADER = new ResourceLocation("webdisplays", "screen_loader");
 
-    public static final ResourceLocation SCREEN_SIDE = new ResourceLocation("webdisplays", "blocks/screen");
+    public static final ResourceLocation SCREEN_SIDE = new ResourceLocation("webdisplays", "block/screen");
 
     private static final ResourceLocation[] SIDES = new ResourceLocation[16];
     public static final Material[] MATERIALS_SIDES = new Material[16];
@@ -39,16 +39,27 @@ public class ScreenModelLoader implements IGeometryLoader<ScreenModelLoader.Scre
     }
 
     public static class ScreenModelGeometry implements IUnbakedGeometry<ScreenModelGeometry> {
-
+        
         @Override
-        public BakedModel bake(IGeometryBakingContext iGeometryBakingContext, ModelBakery arg, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides itemOverrides, ResourceLocation arg4) {
-            return new ScreenBaker(modelState, spriteGetter, itemOverrides, iGeometryBakingContext.getTransforms());
+        public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation) {
+            return new ScreenBaker(modelState, spriteGetter, overrides, context.getTransforms());
         }
+        
+//        @Override
+//        public void resolveParents(Function<ResourceLocation, UnbakedModel> modelGetter, IGeometryBakingContext context) {
+//            IUnbakedGeometry.super.resolveParents(modelGetter, context);
+//        }
+        
+//        @Override
+//        public Set<String> getConfigurableComponentNames() {
+//            return IUnbakedGeometry.super.getConfigurableComponentNames();
+//        }
 
-        @Override
-        public Collection<Material> getMaterials(IGeometryBakingContext iGeometryBakingContext, Function<ResourceLocation, UnbakedModel> function, Set<Pair<String, String>> set) {
-            return Arrays.asList(MATERIALS_SIDES);
-        }
+        // TODO: ?
+//        @Override
+//        public Collection<Material> getMaterials(IGeometryBakingContext iGeometryBakingContext, Function<ResourceLocation, UnbakedModel> function, Set<Pair<String, String>> set) {
+//            return Arrays.asList(MATERIALS_SIDES);
+//        }
     }
 }
 

src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java

@@ -4,26 +4,30 @@
 
 package net.montoyo.wd.client.renderers;
 
+import com.cinemamod.mcef.MCEFBrowser;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.Vector3f;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.utilities.math.Vector3f;
+import net.montoyo.wd.utilities.math.Vector3i;
 import org.jetbrains.annotations.NotNull;
 
-import static com.mojang.math.Vector3f.*;
+import static com.mojang.math.Axis.*;
 
-public class ScreenRenderer implements BlockEntityRenderer<TileEntityScreen> {
+public class ScreenRenderer implements BlockEntityRenderer<ScreenBlockEntity> {
 	public ScreenRenderer() {
 	}
 	
-	public static class ScreenRendererProvider implements BlockEntityRendererProvider<TileEntityScreen> {
+	public static class ScreenRendererProvider implements BlockEntityRendererProvider<ScreenBlockEntity> {
 		@Override
-		public @NotNull BlockEntityRenderer<TileEntityScreen> create(@NotNull Context arg) {
+		public @NotNull BlockEntityRenderer<ScreenBlockEntity> create(@NotNull Context arg) {
 			return new ScreenRenderer();
 		}
 	}
@@ -33,19 +37,22 @@ public class ScreenRenderer implements BlockEntityRenderer<TileEntityScreen> {
 	private final Vector3f tmpf = new Vector3f();
 	
 	@Override
-	public void render(TileEntityScreen te, float partialTick, @NotNull PoseStack poseStack, @NotNull MultiBufferSource bufferSource, int packedLight, int packedOverlay) {
+	public void render(ScreenBlockEntity te, float partialTick, @NotNull PoseStack poseStack, @NotNull MultiBufferSource bufferSource, int packedLight, int packedOverlay) {
 		if (!te.isLoaded())
 			return;
-		
+
 		//Disable lighting
-		RenderSystem.enableTexture();
-//        RenderSystem.disableCull();
+//		RenderSystem.enableTexture();
+//      RenderSystem.disableCull();
 		RenderSystem.disableBlend();
 		
 		for (int i = 0; i < te.screenCount(); i++) {
-			TileEntityScreen.Screen scr = te.getScreen(i);
+			ScreenData scr = te.getScreen(i);
 			if (scr.browser == null) {
-				scr.createBrowser(true);
+				double dist = WebDisplays.PROXY.distanceTo(te, Minecraft.getInstance().getEntityRenderDispatcher().camera.getPosition());
+				if (dist <= WebDisplays.INSTANCE.loadDistance2 * 16)
+					scr.createBrowser(te, true);
+				else continue;
 			}
 			
 			// TODO: manually backface cull the screens
@@ -118,7 +125,7 @@ public class ScreenRenderer implements BlockEntityRenderer<TileEntityScreen> {
 			//TODO: don't use tesselator
 			RenderSystem.enableDepthTest();
 			RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
-			RenderSystem._setShaderTexture(0, scr.browser.getTextureID());
+			RenderSystem._setShaderTexture(0, ((MCEFBrowser) scr.browser).getRenderer().getTextureID());
 			RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 			builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
 			builder.vertex(poseStack.last().pose(), -sw, -sh, 0.505f).uv(0.f, 1.f).color(1.f, 1.f, 1.f, 1.f).endVertex();

src/main/java/net/montoyo/wd/config/ClientConfig.java

@@ -38,7 +38,7 @@ public class ClientConfig {
 			"Due to how web browsers work however, the larger this value is, the smaller text is",
 			"Also, higher values will invariably lag more",
 			"A good goto value for this would be the height of your monitor, in pixels",
-			"A standard monitor is (at least currently) 1080"
+			"A standard monitor is (at least currently) 1080",
 	})
 	@Translation("config.webdisplays.pad_res")
 	@IntRange(minV = 0, maxV = Integer.MAX_VALUE)
@@ -53,55 +53,70 @@ public class ClientConfig {
 	@Translation("config.webdisplays.side_pad")
 	@Default(valueBoolean = true)
 	public static boolean sidePad = true;
-	
-	@Name("switch_buttons")
-	@Comment("If the left and right buttons should be swapped when using a laser")
-	@Translation("config.webdisplays.switch_buttons")
-	@DoubleRange(minV = 0, maxV = Double.MAX_VALUE)
-	@Default(valueD = 30)
-	public static boolean switchButtons = true;
-	
+
 	@Comment({
-			"AutoVolume makes audio fade off based on distance",
-			"Currently, this seems to not work"
+			"Options relating to input handling"
 	})
-	@CFGSegment("auto_volume")
-	public static class AutoVolumeControl {
-		@Name("enabled")
-		@Comment("Whether or not auto volume should be enabled")
-		@Translation("config.webdisplays.auto_vol")
+	@CFGSegment("input")
+	public static class Input {
+		@Name("keyboard_camera")
+		@Comment({
+				"If this is on, then the camera will try to focus on the selected element while a keyboard is in use",
+				"Elsewise, it'll try to focus on the center of the screen",
+		})
+		@Translation("config.webdisplays.keyboard_camera")
 		@Default(valueBoolean = true)
-		public static boolean enableAutoVolume = true;
-		
-		@Name("youtube_volume")
-		@Comment("How loud youtube should be by default")
-		@Translation("config.webdisplays.yt_vol")
-		@DoubleRange(minV = 0, maxV = 100)
-		@Default(valueD = 100)
-		public static double ytVolume = 100.0;
-		
-		@Name("dist0")
-		@Comment("Distance after which you can't hear anything (in blocks)")
-		@Translation("config.webdisplays.d0")
+		public static boolean keyboardCamera = true;
+
+		@Name("switch_buttons")
+		@Comment("If the left and right buttons should be swapped when using a laser")
+		@Translation("config.webdisplays.switch_buttons")
 		@DoubleRange(minV = 0, maxV = Double.MAX_VALUE)
 		@Default(valueD = 30)
-		public static double dist0 = 30.0;
-		
-		@Name("dist100")
-		@Comment("Distance after which the sound starts dropping (in blocks)")
-		@Translation("config.webdisplays.d100")
-		@DoubleRange(minV = 0, maxV = Double.MAX_VALUE)
-		@Default(valueD = 10)
-		public static double dist100 = 10.0;
+		public static boolean switchButtons = true;
 	}
+
+//	@Comment({
+//			"AutoVolume makes audio fade off based on distance",
+//			"Currently, this seems to not work"
+//	})
+//	@CFGSegment("auto_volume")
+//	public static class AutoVolumeControl {
+//		@Name("enabled")
+//		@Comment("Whether or not auto volume should be enabled")
+//		@Translation("config.webdisplays.auto_vol")
+//		@Default(valueBoolean = true)
+//		public static boolean enableAutoVolume = true;
+//
+//		@Name("youtube_volume")
+//		@Comment("How loud youtube should be by default")
+//		@Translation("config.webdisplays.yt_vol")
+//		@DoubleRange(minV = 0, maxV = 100)
+//		@Default(valueD = 100)
+//		public static double ytVolume = 100.0;
+//
+//		@Name("dist0")
+//		@Comment("Distance after which you can't hear anything (in blocks)")
+//		@Translation("config.webdisplays.d0")
+//		@DoubleRange(minV = 0, maxV = Double.MAX_VALUE)
+//		@Default(valueD = 30)
+//		public static double dist0 = 30.0;
+//
+//		@Name("dist100")
+//		@Comment("Distance after which the sound starts dropping (in blocks)")
+//		@Translation("config.webdisplays.d100")
+//		@DoubleRange(minV = 0, maxV = Double.MAX_VALUE)
+//		@Default(valueD = 10)
+//		public static double dist100 = 10.0;
+//	}
 	
 	@SuppressWarnings("unused")
 	public static void postLoad() {
 		if (unloadDistance < loadDistance + 2.0)
 			unloadDistance = loadDistance + 2.0;
 		
-		if (AutoVolumeControl.dist0 < AutoVolumeControl.dist100 + 0.1)
-			AutoVolumeControl.dist0 = AutoVolumeControl.dist100 + 0.1;
+//		if (AutoVolumeControl.dist0 < AutoVolumeControl.dist100 + 0.1)
+//			AutoVolumeControl.dist0 = AutoVolumeControl.dist100 + 0.1;
 		
 		// cache pad resolution
 		WebDisplays.INSTANCE.padResY = padResolution;
@@ -111,8 +126,8 @@ public class ClientConfig {
 		WebDisplays.INSTANCE.unloadDistance2 = unloadDistance * unloadDistance;
 		WebDisplays.INSTANCE.loadDistance2 = loadDistance * loadDistance;
 		
-		WebDisplays.INSTANCE.ytVolume = (float) AutoVolumeControl.ytVolume;
-		WebDisplays.INSTANCE.avDist100 = (float) AutoVolumeControl.dist100;
-		WebDisplays.INSTANCE.avDist0 = (float) AutoVolumeControl.dist0;
+//		WebDisplays.INSTANCE.ytVolume = (float) AutoVolumeControl.ytVolume;
+//		WebDisplays.INSTANCE.avDist100 = (float) AutoVolumeControl.dist100;
+//		WebDisplays.INSTANCE.avDist0 = (float) AutoVolumeControl.dist0;
 	}
 }

src/main/java/net/montoyo/wd/config/CommonConfig.java

@@ -18,13 +18,18 @@ public class CommonConfig {
 	public static void init() {
 		// loads the class
 	}
-	
+
 	@Name("hard_recipes")
 	@Comment("If true, breaking the minePad is required to craft upgrades.")
 	@Translation("config.webdisplays.hard_recipes")
-	@IntRange(minV = 0, maxV = Integer.MAX_VALUE)
 	@Default(valueBoolean = true)
 	public static boolean hardRecipes = true;
+
+	@Name("join_message")
+	@Comment("Whether or not webdisplays should thank the user for using the mod")
+	@Translation("config.webdisplays.join_message")
+	@Default(valueBoolean = true)
+	public static boolean joinMessage = true;
 	
 	@Name("disable_ownership_thief")
 	@Comment("If true, the ownership thief item will be disabled")

src/main/java/net/montoyo/wd/controls/ScreenControl.java

@@ -8,8 +8,8 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.core.MissingPermissionException;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import java.util.Objects;
 import java.util.function.Function;
@@ -22,9 +22,9 @@ public abstract class ScreenControl {
 	}
 	
 	public abstract void write(FriendlyByteBuf buf);
-	public abstract void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException;
+	public abstract void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException;
 	@OnlyIn(Dist.CLIENT)
-	public abstract void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx);
+	public abstract void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx);
 	
 	public void checkPerms(int perms, Function<Integer, Boolean> checker, ServerPlayer player) throws MissingPermissionException {
 		if (!checker.apply(perms)) {

src/main/java/net/montoyo/wd/controls/ScreenControlRegistry.java

@@ -8,8 +8,8 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.builtin.*;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Log;
 
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ public class ScreenControlRegistry {
 			if (FMLEnvironment.dist.isClient()) {
 				boolean shouldThrow = false;
 				try {
-					Method m = type.clazz.getMethod("handleClient", BlockPos.class, BlockSide.class, TileEntityScreen.class, NetworkEvent.Context.class);
+					Method m = type.clazz.getMethod("handleClient", BlockPos.class, BlockSide.class, ScreenBlockEntity.class, NetworkEvent.Context.class);
 					OnlyIn onlyIn = m.getAnnotation(OnlyIn.class);
 					if (onlyIn == null) shouldThrow = true;
 					Dist d = onlyIn.value(); // idc if this throws, lol
@@ -63,6 +63,7 @@ public class ScreenControlRegistry {
 		register(ManageRightsAndUpdgradesControl.id, new ScreenControlType<>(ManageRightsAndUpdgradesControl.class, ManageRightsAndUpdgradesControl::new));
 		register(ClickControl.id, new ScreenControlType<>(ClickControl.class, ClickControl::new));
 		register(OwnerControl.id, new ScreenControlType<>(OwnerControl.class, OwnerControl::new));
+		register(TurnOffControl.id, new ScreenControlType<>(TurnOffControl.class, (buf) -> TurnOffControl.INSTANCE));
 	}
 	
 	public static ScreenControl parse(FriendlyByteBuf buf) {

src/main/java/net/montoyo/wd/controls/builtin/AutoVolumeControl.java

@@ -9,8 +9,8 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import java.util.function.Function;
 
@@ -35,7 +35,7 @@ public class AutoVolumeControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		// I feel like there's probably a better permission category
 		checkPerms(ScreenRights.MANAGE_UPGRADES, permissionChecker, ctx.getSender());
 		tes.setAutoVolume(side, autoVol);
@@ -43,7 +43,7 @@ public class AutoVolumeControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		tes.setAutoVolume(side, autoVol);
 	}
 }

src/main/java/net/montoyo/wd/controls/builtin/ClickControl.java

@@ -8,9 +8,9 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector2i;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector2i;
 
 import java.util.function.Function;
 
@@ -47,13 +47,13 @@ public class ClickControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		throw new RuntimeException("Cannot call click control on server");
 	}
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		if (coord != null)
 			tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, coord, -1);
 		

src/main/java/net/montoyo/wd/controls/builtin/JSRequestControl.java

@@ -10,9 +10,8 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.JSServerRequest;
 import net.montoyo.wd.core.MissingPermissionException;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Log;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import java.util.function.Function;
 
@@ -49,15 +48,15 @@ public class JSRequestControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		ServerPlayer player = ctx.getSender();
-		if (reqType == null || data == null) Log.warning("Caught invalid JS request from player %s (UUID %s)", player.getName(), player.getGameProfile().getId().toString());
-		else tes.handleJSRequest(player, side, reqId, reqType, data);
+//		if (reqType == null || data == null) Log.warning("Caught invalid JS request from player %s (UUID %s)", player.getName(), player.getGameProfile().getId().toString());
+//		else tes.handleJSRequest(player, side, reqId, reqType, data);
 	}
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		throw new RuntimeException("TODO");
 	}
 }

src/main/java/net/montoyo/wd/controls/builtin/KeyTypedControl.java

@@ -9,8 +9,8 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import java.util.function.Function;
 
@@ -39,14 +39,14 @@ public class KeyTypedControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		checkPerms(ScreenRights.INTERACT, permissionChecker, ctx.getSender());
 		tes.type(side, text, soundPos, ctx.getSender());
 	}
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		tes.type(side, text, soundPos);
 	}
 }

src/main/java/net/montoyo/wd/controls/builtin/LaserControl.java

@@ -9,9 +9,9 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector2i;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector2i;
 
 import java.util.function.Function;
 
@@ -54,7 +54,7 @@ public class LaserControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		// feel like this makes sense, but I wanna get opinions first
 //		checkPerms(ScreenRights.INTERACT, permissionChecker, ctx.getSender());
 		ServerPlayer sender = ctx.getSender();
@@ -67,7 +67,7 @@ public class LaserControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		if (coord != null)
 			tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, coord, -1);
 		

src/main/java/net/montoyo/wd/controls/builtin/ManageRightsAndUpdgradesControl.java

@@ -11,8 +11,9 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import java.util.function.Function;
 
@@ -79,7 +80,7 @@ public class ManageRightsAndUpdgradesControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		ServerPlayer player = ctx.getSender();
 		switch (type) {
 			case UPGRADES -> {
@@ -89,7 +90,7 @@ public class ManageRightsAndUpdgradesControl extends ScreenControl {
 				else tes.removeUpgrade(side, toRemove, player);
 			}
 			case RIGHTS -> {
-				TileEntityScreen.Screen scr = tes.getScreen(side);
+				ScreenData scr = tes.getScreen(side);
 				
 				int fr = scr.owner.uuid.equals(player.getGameProfile().getId()) ? friendRights : scr.friendRights;
 				int or = (scr.rightsFor(player) & ScreenRights.MANAGE_OTHER_RIGHTS) == 0 ? scr.otherRights : otherRights;
@@ -102,7 +103,7 @@ public class ManageRightsAndUpdgradesControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		ServerPlayer player = ctx.getSender();
 		switch (type) {
 			case UPGRADES -> {
@@ -111,7 +112,7 @@ public class ManageRightsAndUpdgradesControl extends ScreenControl {
 				else tes.removeUpgrade(side, toRemove, player);
 			}
 			case RIGHTS -> {
-				TileEntityScreen.Screen scr = tes.getScreen(side);
+				ScreenData scr = tes.getScreen(side);
 				
 				int fr = friendRights;
 				int or = otherRights;

src/main/java/net/montoyo/wd/controls/builtin/ModifyFriendListControl.java

@@ -10,9 +10,9 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.NameUUIDPair;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
 
 import java.util.function.Function;
 
@@ -41,7 +41,7 @@ public class ModifyFriendListControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		ServerPlayer player = ctx.getSender();
 		checkPerms(ScreenRights.MANAGE_FRIEND_LIST, permissionChecker, ctx.getSender());
 		if (adding) tes.addFriend(player, side, friend);
@@ -50,7 +50,7 @@ public class ModifyFriendListControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		throw new RuntimeException("TODO");
 	}
 }

src/main/java/net/montoyo/wd/controls/builtin/OwnerControl.java

@@ -8,9 +8,9 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.NameUUIDPair;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
 
 import java.util.function.Function;
 
@@ -35,13 +35,13 @@ public class OwnerControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		throw new RuntimeException("Cannot handle ownership theft packet from server");
 	}
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		tes.getScreen(side).owner = owner;
 	}
 }

src/main/java/net/montoyo/wd/controls/builtin/ScreenModifyControl.java

@@ -9,10 +9,10 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Rotation;
-import net.montoyo.wd.utilities.Vector2i;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.data.Rotation;
+import net.montoyo.wd.utilities.math.Vector2i;
 
 import java.util.function.Function;
 
@@ -55,7 +55,7 @@ public class ScreenModifyControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		checkPerms(ScreenRights.MODIFY_SCREEN, permissionChecker, ctx.getSender());
 		switch (type) {
 			case RESOLUTION -> tes.setResolution(side, res);
@@ -65,7 +65,7 @@ public class ScreenModifyControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		switch (type) {
 			case RESOLUTION -> tes.setResolution(side, res);
 			case ROTATION -> tes.setRotation(side, rotation);

src/main/java/net/montoyo/wd/controls/builtin/SetURLControl.java

@@ -9,9 +9,9 @@ import net.minecraftforge.network.NetworkEvent;
 import net.montoyo.wd.controls.ScreenControl;
 import net.montoyo.wd.core.MissingPermissionException;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import java.util.function.Function;
 
@@ -41,7 +41,7 @@ public class SetURLControl extends ScreenControl {
 	}
 	
 	@Override
-	public void handleServer(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
 		// TODO: deal with remote
 		checkPerms(ScreenRights.CHANGE_URL, permissionChecker, ctx.getSender());
 		try {
@@ -53,7 +53,7 @@ public class SetURLControl extends ScreenControl {
 	
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public void handleClient(BlockPos pos, BlockSide side, TileEntityScreen tes, NetworkEvent.Context ctx) {
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
 		try {
 			tes.setScreenURL(side, url);
 		} catch (Throwable err) {

src/main/java/net/montoyo/wd/controls/builtin/TurnOffControl.java

@@ -0,0 +1,48 @@
+package net.montoyo.wd.controls.builtin;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.network.NetworkEvent;
+import net.montoyo.wd.WebDisplays;
+import net.montoyo.wd.controls.ScreenControl;
+import net.montoyo.wd.core.MissingPermissionException;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
+
+import java.util.function.Function;
+
+public class TurnOffControl extends ScreenControl {
+	public static final ResourceLocation id = new ResourceLocation("webdisplays:deactivate");
+
+	public static final TurnOffControl INSTANCE = new TurnOffControl();
+
+	public TurnOffControl() {
+		super(id);
+	}
+	
+	@Override
+	public void write(FriendlyByteBuf buf) {
+	}
+	
+	@Override
+	public void handleServer(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx, Function<Integer, Boolean> permissionChecker) throws MissingPermissionException {
+		throw new RuntimeException("Cannot handle deactivation packet from server");
+	}
+	
+	@Override
+	@OnlyIn(Dist.CLIENT)
+	public void handleClient(BlockPos pos, BlockSide side, ScreenBlockEntity tes, NetworkEvent.Context ctx) {
+		if (side != null) {
+			WebDisplays.PROXY.closeGui(pos, side);
+			tes.disableScreen(side);
+		} else {
+			for (BlockSide value : BlockSide.values()) {
+				WebDisplays.PROXY.closeGui(pos, value);
+				tes.disableScreen(value);
+			}
+		}
+	}
+}

src/main/java/net/montoyo/wd/core/AdvancementIcon.java

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2018 BARBOTIN Nicolas
- */
-
-package net.montoyo.wd.core;
-
-public enum AdvancementIcon {
-
-    WEB_DISPLAYS("wd"),
-    BROKEN_PAD("brokenpad"),
-    PIGEON("pigeon");
-
-    private final String name;
-
-    AdvancementIcon(String n) {
-        name = n;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-}

src/main/java/net/montoyo/wd/core/CCArguments.java

@@ -7,6 +7,7 @@ package net.montoyo.wd.core;
 import java.util.List;
 import java.util.Map;
 
+// TODO: bring this back when SSR is implemented
 public class CCArguments implements IComputerArgs {
 
     private final Object[] args;

src/main/java/net/montoyo/wd/core/CraftComponent.java

@@ -5,7 +5,7 @@
 package net.montoyo.wd.core;
 
 import net.minecraft.world.item.ItemStack;
-import net.montoyo.wd.init.ItemInit;
+import net.montoyo.wd.registry.ItemRegistry;
 
 public enum CraftComponent {
     STONEKEY("stonekey", "StoneKey"),
@@ -32,6 +32,6 @@ public enum CraftComponent {
     }
 
     public ItemStack makeItemStack() {
-        return new ItemStack(ItemInit.getComputerCraftItem(ordinal()).get(), 1);
+        return new ItemStack(ItemRegistry.getComputerCraftItem(ordinal()).get(), 1);
     }
 }

src/main/java/net/montoyo/wd/core/Criterion.java

@@ -7,6 +7,7 @@ package net.montoyo.wd.core;
 import com.google.gson.JsonObject;
 import net.minecraft.advancements.CriterionTrigger;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
+import net.minecraft.advancements.critereon.ContextAwarePredicate;
 import net.minecraft.advancements.critereon.DeserializationContext;
 import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.resources.ResourceLocation;
@@ -19,10 +20,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 
 public class Criterion implements CriterionTrigger<Criterion.Instance> {
-
     public static class Instance extends AbstractCriterionTriggerInstance {
-
-        public Instance(ResourceLocation id, EntityPredicate.Composite arg2) {
+        public Instance(ResourceLocation id, ContextAwarePredicate arg2) {
             super(id, arg2);
         }
     }
@@ -60,16 +59,15 @@ public class Criterion implements CriterionTrigger<Criterion.Instance> {
 
     @Override
     public @NotNull Instance createInstance(JsonObject json, DeserializationContext context) {
-        return new Instance(id, EntityPredicate.Composite.fromJson(json, "instance", context));
+        return new Instance(id, EntityPredicate.fromJson(json, "instance", context));
     }
 
     public void trigger(PlayerAdvancements ply) {
         ArrayList<Listener<Instance>> listeners = map.get(ply);
 
-        if(listeners != null) {
+        if (listeners != null) {
             Listener[] copy = listeners.toArray(new Listener[0]); //We need to make a copy, otherwise we get a ConcurrentModificationException
             Arrays.stream(copy).forEach(l -> l.run(ply));
         }
     }
-
 }

src/main/java/net/montoyo/wd/core/DefaultPeripheral.java

@@ -8,23 +8,22 @@ import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.montoyo.wd.entity.TileEntityKeyboard;
-import net.montoyo.wd.entity.TileEntityRCtrl;
-import net.montoyo.wd.entity.TileEntityRedCtrl;
-import net.montoyo.wd.entity.TileEntityServer;
-import net.montoyo.wd.init.BlockInit;
+import net.montoyo.wd.entity.KeyboardBlockEntity;
+import net.montoyo.wd.entity.RemoteControlBlockEntity;
+import net.montoyo.wd.entity.RedstoneControlBlockEntity;
+import net.montoyo.wd.entity.ServerBlockEntity;
+import net.montoyo.wd.registry.BlockRegistry;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Supplier;
 
 public enum DefaultPeripheral implements StringRepresentable {
-
-    KEYBOARD("keyboard", "Keyboard", TileEntityKeyboard::new, BlockInit.blockKeyBoard),                          //WITH FACING (< 3)
+    KEYBOARD("keyboard", "Keyboard", KeyboardBlockEntity::new, BlockRegistry.KEYBOARD_BLOCK),                          //WITH FACING (< 3)
 //    CC_INTERFACE("ccinterface", "ComputerCraft_Interface", TileEntityCCInterface.class),
 //    OC_INTERFACE("cointerface", "OpenComputers_Interface", TileEntityOCInterface.class),
-    REMOTE_CONTROLLER("remotectrl", "Remote_Controller", TileEntityRCtrl::new ,BlockInit.blockRControl),         //WITHOUT FACING (>= 3)
-    REDSTONE_CONTROLLER("redstonectrl", "Redstone_Controller", TileEntityRedCtrl::new ,BlockInit.blockRedControl),
-    SERVER("server", "Server", TileEntityServer::new, BlockInit.blockServer);
+    REMOTE_CONTROLLER("remotectrl", "Remote_Controller", RemoteControlBlockEntity::new , BlockRegistry.REMOTE_CONTROLLER_BLOCK),         //WITHOUT FACING (>= 3)
+    REDSTONE_CONTROLLER("redstonectrl", "Redstone_Controller", RedstoneControlBlockEntity::new , BlockRegistry.REDSTONE_CONTROL_BLOCK),
+    SERVER("server", "Server", ServerBlockEntity::new, BlockRegistry.SERVER_BLOCK);
 
     private final String name;
     private final String wikiName;

src/main/java/net/montoyo/wd/core/HasAdvancement.java

@@ -5,9 +5,7 @@
 package net.montoyo.wd.core;
 
 public enum HasAdvancement {
-
     DONT_KNOW,
     YES,
     NO
-
 }

src/main/java/net/montoyo/wd/core/IComputerArgs.java

@@ -7,10 +7,8 @@ package net.montoyo.wd.core;
 import java.util.Map;
 
 public interface IComputerArgs {
-
     String checkString(int i);
     int checkInteger(int i);
     Map checkTable(int i);
     int count();
-
 }

src/main/java/net/montoyo/wd/core/IPeripheral.java

@@ -7,11 +7,9 @@ package net.montoyo.wd.core;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
-import net.montoyo.wd.utilities.BlockSide;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public interface IPeripheral {
-
     boolean connect(Level world, BlockPos blockPos, BlockState blockState, Vector3i screenPos, BlockSide screenSide);
-
 }

src/main/java/net/montoyo/wd/core/IScreenQueryHandler.java

@@ -1,19 +1,17 @@
-/*
- * Copyright (C) 2018 BARBOTIN Nicolas
- */
-
-package net.montoyo.wd.core;
-
-import net.montoyo.mcef.api.IJSQueryCallback;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
-
-import javax.annotation.Nonnull;
-
-public interface IScreenQueryHandler {
-
-    //args is an array of Doubles or Strings
-    //The screen DOES exist, so scr.getScreen(side) is never null
-    void handleQuery(@Nonnull IJSQueryCallback cb, @Nonnull TileEntityScreen scr, @Nonnull BlockSide side, @Nonnull Object[] args);
-
-}
+///*
+// * Copyright (C) 2018 BARBOTIN Nicolas
+// */
+//
+//package net.montoyo.wd.core;
+//
+//import net.montoyo.mcef.api.IJSQueryCallback;
+//import net.montoyo.wd.entity.TileEntityScreen;
+//import net.montoyo.wd.utilities.orientation.BlockSide;
+//
+//import javax.annotation.Nonnull;
+//
+//public interface IScreenQueryHandler {
+//    //args is an array of Doubles or Strings
+//    //The screen DOES exist, so scr.getScreen(side) is never null
+//    void handleQuery(@Nonnull IJSQueryCallback cb, @Nonnull TileEntityScreen scr, @Nonnull BlockSide side, @Nonnull Object[] args);
+//}

src/main/java/net/montoyo/wd/core/IUpgrade.java

@@ -6,17 +6,15 @@ package net.montoyo.wd.core;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public interface IUpgrade {
-
-    void onInstall(@Nonnull TileEntityScreen tes, @Nonnull BlockSide screenSide, @Nullable Player player, @Nonnull ItemStack is);
-    boolean onRemove(@Nonnull TileEntityScreen tes, @Nonnull BlockSide screenSide, @Nullable Player player, @Nonnull ItemStack is); //Return true to prevent dropping
+    void onInstall(@Nonnull ScreenBlockEntity tes, @Nonnull BlockSide screenSide, @Nullable Player player, @Nonnull ItemStack is);
+    boolean onRemove(@Nonnull ScreenBlockEntity tes, @Nonnull BlockSide screenSide, @Nullable Player player, @Nonnull ItemStack is); //Return true to prevent dropping
     boolean isSameUpgrade(@Nonnull ItemStack myStack, @Nonnull ItemStack otherStack); //myStack.getItem() is an instance of this class
     String getJSName(@Nonnull ItemStack is); //modname:upgradename
-
 }

src/main/java/net/montoyo/wd/core/IWDDCapability.java

@@ -5,9 +5,7 @@
 package net.montoyo.wd.core;
 
 public interface IWDDCapability {
-
     boolean isFirstRun();
     void clearFirstRun();
     void cloneTo(IWDDCapability dst);
-
 }

src/main/java/net/montoyo/wd/core/JSServerRequest.java

@@ -5,10 +5,9 @@
 package net.montoyo.wd.core;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.utilities.serialization.Util;
 
 public enum JSServerRequest {
-
     CLEAR_REDSTONE,
     SET_REDSTONE_AT(Integer.class, Integer.class, Boolean.class);
 
@@ -50,5 +49,4 @@ public enum JSServerRequest {
 
         return ret;
     }
-
 }

src/main/java/net/montoyo/wd/core/MissingPermissionException.java

@@ -7,7 +7,6 @@ package net.montoyo.wd.core;
 import net.minecraft.server.level.ServerPlayer;
 
 public class MissingPermissionException extends Exception {
-
     private final int permission;
     private final ServerPlayer player;
 
@@ -24,5 +23,4 @@ public class MissingPermissionException extends Exception {
     public ServerPlayer getPlayer() {
         return player;
     }
-
 }

src/main/java/net/montoyo/wd/core/OCArguments.java

@@ -10,7 +10,6 @@ import java.util.Optional;
 
 @Optional.Interface(iface = "net.montoyo.wd.core.IComputerArgs", modid = "opencomputers")
 public class OCArguments implements IComputerArgs {
-
     //Keep this as an "Object" so that it doesn't crash if OC is absent
     private final Object args;
 
@@ -41,5 +40,4 @@ public class OCArguments implements IComputerArgs {
     public int count() {
         return ((Arguments) args).count();
     }
-
 } */

src/main/java/net/montoyo/wd/core/ScreenRights.java

@@ -5,9 +5,10 @@
 package net.montoyo.wd.core;
 
 public abstract class ScreenRights {
-
     public static final int CHANGE_URL = 1; //Change URL AND run JavaScript
-    /** use {@link ScreenRights#INTERACT instead} */
+    /**
+     * use {@link ScreenRights#INTERACT instead}
+     */
     @Deprecated(forRemoval = true)
     public static final int CLICK = 2; //Click AND type
     public static final int INTERACT = 2; //Click AND type
@@ -21,5 +22,4 @@ public abstract class ScreenRights {
     public static final int NONE = 0;
     public static final int ALL = 0xFF;
     public static final int DEFAULTS = CHANGE_URL | INTERACT | MANAGE_UPGRADES | MODIFY_SCREEN;
-
 }

src/main/java/net/montoyo/wd/core/WDCreativeTab.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2018 BARBOTIN Nicolas
- */
-
-package net.montoyo.wd.core;
-
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.montoyo.wd.init.BlockInit;
-
-public class WDCreativeTab extends CreativeModeTab {
-
-    public WDCreativeTab() {
-        super("webdisplays");
-    }
-
-    @Override
-    public ItemStack makeIcon() {
-        return new ItemStack(BlockInit.blockScreen.get());
-    }
-}

src/main/java/net/montoyo/wd/core/WDDCapability.java

@@ -18,14 +18,11 @@ import javax.annotation.Nonnull;
 import java.util.concurrent.Callable;
 
 public class WDDCapability implements IWDDCapability {
-
     public static class Factory implements Callable<IWDDCapability> {
-
         @Override
         public IWDDCapability call() {
             return new WDDCapability();
         }
-
     }
 
     public static class Provider implements ICapabilitySerializable<CompoundTag> {
@@ -38,7 +35,7 @@ public class WDDCapability implements IWDDCapability {
         @NotNull
         @Override
         public <T> LazyOptional<T> getCapability(@NotNull Capability<T> capability, @org.jetbrains.annotations.Nullable Direction arg) {
-            return cap == capability ?  INSTANCE.cast() : LazyOptional.empty();
+            return cap == capability ? INSTANCE.cast() : LazyOptional.empty();
         }
 
         @Override
@@ -78,8 +75,7 @@ public class WDDCapability implements IWDDCapability {
 
     @Override
     public void cloneTo(IWDDCapability dst) {
-        if(!isFirstRun())
+        if (!isFirstRun())
             dst.clearFirstRun();
     }
-
 }

src/main/java/net/montoyo/wd/data/GuiData.java

@@ -18,53 +18,54 @@ import java.util.HashMap;
 import java.util.function.Supplier;
 
 public abstract class GuiData {
-	public static GuiData read(String name, FriendlyByteBuf buf) {
-		GuiType type = dataTable.get(name);
-		GuiData data = type.create();
-		data.deserialize(buf);
-		return data;
-	}
-	
-	protected static class GuiType {
-		Class<? extends GuiData> clazz;
-		Supplier<GuiData> constructor;
-		
-		public GuiType(Class<? extends GuiData> clazz, Supplier<GuiData> constructor) {
-			this.clazz = clazz;
-			this.constructor = constructor;
-		}
-		
-		public GuiData create() {
-			return constructor.get();
-		}
-	}
-	
-	private static final HashMap<String, GuiType> dataTable = new HashMap<>();
-	
-	static {
-		dataTable.put("SetURL", new GuiType(SetURLData.class, SetURLData::new));
-		dataTable.put("ScreenConfig", new GuiType(ScreenConfigData.class, ScreenConfigData::new));
-		dataTable.put("Keyboard", new GuiType(KeyboardData.class, KeyboardData::new));
-		dataTable.put("RedstoneCtrl", new GuiType(RedstoneCtrlData.class, RedstoneCtrlData::new));
-		dataTable.put("Server", new GuiType(ServerData.class, ServerData::new));
-	}
-	
-	public static Class<? extends GuiData> classOf(String name) {
-		return dataTable.get(name).clazz;
-	}
-	
-	public GuiData() {
-	}
+    public static GuiData read(String name, FriendlyByteBuf buf) {
+        GuiType type = dataTable.get(name);
+        GuiData data = type.create();
+        data.deserialize(buf);
+        return data;
+    }
 
-	@OnlyIn(Dist.CLIENT)
-	public abstract Screen createGui(Screen old, Level world);
-	
-	public abstract String getName();
-	
-	public void sendTo(ServerPlayer player) {
-		WDNetworkRegistry.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new S2CMessageOpenGui(this));
-	}
+    protected static class GuiType {
+        Class<? extends GuiData> clazz;
+        Supplier<GuiData> constructor;
+
+        public GuiType(Class<? extends GuiData> clazz, Supplier<GuiData> constructor) {
+            this.clazz = clazz;
+            this.constructor = constructor;
+        }
+
+        public GuiData create() {
+            return constructor.get();
+        }
+    }
+
+    private static final HashMap<String, GuiType> dataTable = new HashMap<>();
+
+    static {
+        dataTable.put("SetURL", new GuiType(SetURLData.class, SetURLData::new));
+        dataTable.put("ScreenConfig", new GuiType(ScreenConfigData.class, ScreenConfigData::new));
+        dataTable.put("Keyboard", new GuiType(KeyboardData.class, KeyboardData::new));
+        dataTable.put("RedstoneCtrl", new GuiType(RedstoneCtrlData.class, RedstoneCtrlData::new));
+        dataTable.put("Server", new GuiType(ServerData.class, ServerData::new));
+    }
+
+    public static Class<? extends GuiData> classOf(String name) {
+        return dataTable.get(name).clazz;
+    }
+
+    public GuiData() {
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public abstract Screen createGui(Screen old, Level world);
+
+    public abstract String getName();
+
+    public void sendTo(ServerPlayer player) {
+        WDNetworkRegistry.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new S2CMessageOpenGui(this));
+    }
 
     public abstract void serialize(FriendlyByteBuf buf);
+
     public abstract void deserialize(FriendlyByteBuf buf);
 }

src/main/java/net/montoyo/wd/data/KeyboardData.java

@@ -12,23 +12,22 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.gui.GuiKeyboard;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public class KeyboardData extends GuiData {
-
     public Vector3i pos;
     public BlockSide side;
     public int kbX;
     public int kbY;
     public int kbZ;
-    
+
     public KeyboardData() {
     }
-    
-    public KeyboardData(TileEntityScreen tes, BlockSide side, BlockPos kbPos) {
+
+    public KeyboardData(ScreenBlockEntity tes, BlockSide side, BlockPos kbPos) {
         pos = new Vector3i(tes.getBlockPos());
         this.side = side;
         kbX = kbPos.getX();
@@ -40,19 +39,19 @@ public class KeyboardData extends GuiData {
     @Override
     public Screen createGui(Screen old, Level world) {
         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 keyboard!", pos.toString());
             return null;
         }
 
-        return new GuiKeyboard((TileEntityScreen) te, side, new BlockPos(kbX, kbY, kbZ));
+        return new GuiKeyboard((ScreenBlockEntity) te, side, new BlockPos(kbX, kbY, kbZ));
     }
 
     @Override
     public String getName() {
         return "Keyboard";
     }
-    
+
     @Override
     public void serialize(FriendlyByteBuf buf) {
         buf.writeInt(pos.x);

src/main/java/net/montoyo/wd/data/RedstoneCtrlData.java

@@ -13,19 +13,18 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.gui.GuiRedstoneCtrl;
 import net.montoyo.wd.net.BufferUtils;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public class RedstoneCtrlData extends GuiData {
-
     public ResourceLocation dimension;
     public Vector3i pos;
     public String risingEdgeURL;
     public String fallingEdgeURL;
-    
+
     public RedstoneCtrlData() {
         super();
     }
-    
+
     public RedstoneCtrlData(ResourceLocation d, BlockPos p, String r, String f) {
         dimension = d;
         pos = new Vector3i(p);
@@ -43,7 +42,7 @@ public class RedstoneCtrlData extends GuiData {
     public String getName() {
         return "RedstoneCtrl";
     }
-    
+
     @Override
     public void serialize(FriendlyByteBuf buf) {
         buf.writeUtf(dimension.toString());
@@ -51,7 +50,7 @@ public class RedstoneCtrlData extends GuiData {
         buf.writeUtf(risingEdgeURL);
         buf.writeUtf(fallingEdgeURL);
     }
-    
+
     @Override
     public void deserialize(FriendlyByteBuf buf) {
         dimension = new ResourceLocation(buf.readUtf());

src/main/java/net/montoyo/wd/data/ScreenConfigData.java

@@ -13,28 +13,28 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.network.PacketDistributor;
 import net.montoyo.wd.client.gui.GuiScreenConfig;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.entity.ScreenBlockEntity;
 import net.montoyo.wd.net.BufferUtils;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.client_bound.S2CMessageOpenGui;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.NameUUIDPair;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public class ScreenConfigData extends GuiData {
-	
-	public boolean onlyUpdate;
-	public Vector3i pos;
-	public BlockSide side;
-	public NameUUIDPair[] friends;
-	public int friendRights;
-	public int otherRights;
-	
-	public ScreenConfigData() {
-	}
+    public boolean onlyUpdate;
+    public Vector3i pos;
+    public BlockSide side;
+    public NameUUIDPair[] friends;
+    public int friendRights;
+    public int otherRights;
 
-	public ScreenConfigData(Vector3i pos, BlockSide side, TileEntityScreen.Screen scr) {
+    public ScreenConfigData() {
+    }
+
+	public ScreenConfigData(Vector3i pos, BlockSide side, ScreenData scr) {
 		this.pos = pos;
 		this.side = side;
 		friends = scr.friends.toArray(new NameUUIDPair[0]);
@@ -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

src/main/java/net/montoyo/wd/data/ServerData.java

@@ -12,17 +12,16 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.gui.GuiServer;
 import net.montoyo.wd.net.BufferUtils;
-import net.montoyo.wd.utilities.NameUUIDPair;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public class ServerData extends GuiData {
-
     public Vector3i pos;
     public NameUUIDPair owner;
-    
+
     public ServerData() {
     }
-    
+
     public ServerData(BlockPos bp, NameUUIDPair owner) {
         pos = new Vector3i(bp);
         this.owner = owner;
@@ -38,13 +37,13 @@ public class ServerData extends GuiData {
     public String getName() {
         return "Server";
     }
-    
+
     @Override
     public void serialize(FriendlyByteBuf buf) {
         BufferUtils.writeVec3i(buf, pos);
         owner.writeTo(buf);
     }
-    
+
     @Override
     public void deserialize(FriendlyByteBuf buf) {
         pos = BufferUtils.readVec3i(buf);

src/main/java/net/montoyo/wd/data/SetURLData.java

@@ -12,23 +12,22 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.montoyo.wd.client.gui.GuiSetURL2;
-import net.montoyo.wd.entity.TileEntityScreen;
+import net.montoyo.wd.entity.ScreenBlockEntity;
 import net.montoyo.wd.net.BufferUtils;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 public class SetURLData extends GuiData {
-    
     public Vector3i pos;
     public BlockSide side;
     public String url;
     public boolean isRemote;
     public Vector3i remoteLocation;
-    
+
     public SetURLData() {
     }
-    
+
     public SetURLData(Vector3i pos, BlockSide side, String url) {
         this.pos = pos;
         this.side = side;
@@ -50,19 +49,19 @@ public class SetURLData extends GuiData {
     @Override
     public Screen createGui(Screen old, Level world) {
         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 GuiSetURL2((TileEntityScreen) te, side, url, isRemote ? remoteLocation : null);
+        return new GuiSetURL2((ScreenBlockEntity) te, side, url, isRemote ? remoteLocation : null);
     }
 
     @Override
     public String getName() {
         return "SetURL";
     }
-    
+
     @Override
     public void serialize(FriendlyByteBuf buf) {
         BufferUtils.writeVec3i(buf, pos);
@@ -71,7 +70,7 @@ public class SetURLData extends GuiData {
         buf.writeBoolean(isRemote);
         if (isRemote) BufferUtils.writeVec3i(buf, remoteLocation);
     }
-    
+
     @Override
     public void deserialize(FriendlyByteBuf buf) {
         pos = BufferUtils.readVec3i(buf);

src/main/java/net/montoyo/wd/entity/AbstractInterfaceBlockEntity.java

@@ -13,7 +13,11 @@ import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.core.IComputerArgs;
 import net.montoyo.wd.core.IUpgrade;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.utilities.*;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.data.Rotation;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
+import net.montoyo.wd.utilities.serialization.TypeData;
+import net.montoyo.wd.utilities.serialization.Util;
 
 import java.io.IOException;
 import java.lang.annotation.ElementType;
@@ -23,9 +27,8 @@ import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Map;
 
-public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
-
-    public TileEntityInterfaceBase(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
+public abstract class AbstractInterfaceBlockEntity extends AbstractPeripheralBlockEntity {
+    public AbstractInterfaceBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
         super(arg, arg2, arg3);
     }
 
@@ -108,7 +111,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
                 throw new IllegalArgumentException("invalid right name");
         }
 
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
         if(owner == null || tes == null)
             return null;
         else
@@ -119,7 +122,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
     public Object[] hasUpgrade(IComputerArgs args) {
         String name = args.checkString(0);
 
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
         if(owner == null || tes == null)
             return null;
         else
@@ -128,7 +131,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 
     @ComputerFunc
     public Object[] getSize(IComputerArgs args) {
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
 
         if(owner == null || tes == null)
             return null;
@@ -140,7 +143,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 
     @ComputerFunc
     public Object[] getResolution(IComputerArgs args) {
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
 
         if(owner == null || tes == null)
             return null;
@@ -152,7 +155,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 
     @ComputerFunc
     public Object[] getRotation(IComputerArgs args) {
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
 
         if(owner == null || tes == null)
             return null;
@@ -162,7 +165,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 
     @ComputerFunc
     public Object[] getURL(IComputerArgs args) {
-        TileEntityScreen tes = getConnectedScreenEx();
+        ScreenBlockEntity tes = getConnectedScreenEx();
 
         if(owner == null || tes == null)
             return null;
@@ -206,12 +209,12 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 //                throw new IllegalArgumentException("bad action name");
 //        }
 
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
         else {
-            TileEntityScreen.Screen scrscr = scr.getScreen(screenSide);
+            ScreenData scrscr = scr.getScreen(screenSide);
 
             if((scrscr.rightsFor(owner.uuid) & ScreenRights.INTERACT) == 0)
                 return err("restrictions");
@@ -245,7 +248,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
     }
 
     private Object[] realType(String what) {
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
@@ -317,7 +320,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
                 code = ((Double) oCode).intValue();
             }
 
-            data.add(new TypeData(dataAction, code, 0));
+            data.add(new TypeData(dataAction, code, 0, 0));
         }
 
         return realType(WebDisplays.GSON.toJson(data));
@@ -326,7 +329,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
     @ComputerFunc
     public Object[] setURL(IComputerArgs args) {
         String url = args.checkString(0);
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
@@ -346,7 +349,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
     public Object[] setResolution(IComputerArgs args) {
         int rx = args.checkInteger(0);
         int ry = args.checkInteger(1);
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
@@ -369,7 +372,7 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
         rot /= 90;
         rot &= 3;
 
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
@@ -384,14 +387,14 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
     @ComputerFunc
     public Object[] runJS(IComputerArgs args) {
         String code = args.checkString(0);
-        TileEntityScreen scr = getConnectedScreenEx();
+        ScreenBlockEntity scr = getConnectedScreenEx();
 
         if(owner == null || scr == null)
             return err("notlinked");
         else if((scr.getScreen(screenSide).rightsFor(owner.uuid) & ScreenRights.CHANGE_URL) == 0)
             return err("restrictions");
         else {
-            scr.evalJS(screenSide, code);
+//            scr.evalJS(screenSide, code);
             return TRUE;
         }
     }
@@ -406,5 +409,4 @@ public abstract class TileEntityInterfaceBase extends TileEntityPeripheralBase {
 
         return null;
     }
-
 }

src/main/java/net/montoyo/wd/entity/AbstractPeripheralBlockEntity.java

@@ -16,29 +16,28 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.montoyo.wd.core.IPeripheral;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Log;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Objects;
 
-public abstract class TileEntityPeripheralBase extends BlockEntity implements IPeripheral {
-
+public abstract class AbstractPeripheralBlockEntity extends BlockEntity implements IPeripheral {
     protected Vector3i screenPos;
     protected BlockSide screenSide;
 
-    public TileEntityPeripheralBase(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
+    public AbstractPeripheralBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
         super(arg, arg2, arg3);
     }
-    
+
     // TODO
     @Override
     public void load(CompoundTag tag) {
         super.load(tag);
-    
-        if(tag.contains("WDScreen", 10)) {
+
+        if (tag.contains("WDScreen", 10)) {
             CompoundTag scr = tag.getCompound("WDScreen");
             screenPos = new Vector3i(scr.getInt("X"), scr.getInt("Y"), scr.getInt("Z"));
             screenSide = BlockSide.values()[scr.getByte("Side")];
@@ -47,28 +46,28 @@ public abstract class TileEntityPeripheralBase extends BlockEntity implements IP
             screenSide = null;
         }
     }
-    
+
     @Override
     protected void saveAdditional(CompoundTag tag) {
         super.saveAdditional(tag);
-    
-        if(screenPos != null && screenSide != null) {
+
+        if (screenPos != null && screenSide != null) {
             CompoundTag scr = new CompoundTag();
             scr.putInt("X", screenPos.x);
             scr.putInt("Y", screenPos.y);
             scr.putInt("Z", screenPos.z);
             scr.putByte("Side", (byte) screenSide.ordinal());
-        
+
             tag.put("WDScreen", scr);
         }
     }
-    
+
     // this is not used for loading from disk, so I'm marking it final
     @Override
     public final void deserializeNBT(CompoundTag tag) {
         super.deserializeNBT(tag);
     }
-    
+
     // this is not used for writing to disk, so I'm marking it final
     @Override
     @Nonnull
@@ -79,12 +78,12 @@ public abstract class TileEntityPeripheralBase extends BlockEntity implements IP
     @Override
     public boolean connect(Level world_, BlockPos blockPos, BlockState blockState, Vector3i pos, BlockSide side) {
         BlockEntity te = world_.getBlockEntity(pos.toBlock());
-        if(te == null || !(te instanceof TileEntityScreen)) {
+        if (!(te instanceof ScreenBlockEntity)) {
             Log.error("TileEntityPeripheralBase.connect(): Tile entity at %s is not a screen!", pos.toString());
             return false;
         }
 
-        if(((TileEntityScreen) te).getScreen(side) == null) {
+        if (((ScreenBlockEntity) te).getScreen(side) == null) {
             Log.error("TileEntityPeripheralBase.connect(): There is no screen at %s on side %s!", pos.toString(), side.toString());
             return false;
         }
@@ -108,31 +107,31 @@ public abstract class TileEntityPeripheralBase extends BlockEntity implements IP
     }
 
     @Nullable
-    public TileEntityScreen getConnectedScreen() {
-        if(screenPos == null || screenSide == null)
+    public ScreenBlockEntity getConnectedScreen() {
+        if (screenPos == null || screenSide == null)
             return null;
 
         BlockEntity te = level.getBlockEntity(screenPos.toBlock());
-        if(te == null || !(te instanceof TileEntityScreen) || ((TileEntityScreen) te).getScreen(screenSide) == null) {
+        if (!(te instanceof ScreenBlockEntity) || ((ScreenBlockEntity) te).getScreen(screenSide) == null) {
             screenPos = null;
             screenSide = null;
             setChanged();
             return null;
         }
 
-        return (TileEntityScreen) te;
+        return (ScreenBlockEntity) te;
     }
 
     @Nullable
-    public TileEntityScreen getConnectedScreenEx() {
-        if(screenPos == null || screenSide == null)
+    public ScreenBlockEntity getConnectedScreenEx() {
+        if (screenPos == null || screenSide == null)
             return null;
 
         BlockEntity te = level.getBlockEntity(screenPos.toBlock());
-        if(te == null || !(te instanceof TileEntityScreen) || ((TileEntityScreen) te).getScreen(screenSide) == null)
+        if (!(te instanceof ScreenBlockEntity) || ((ScreenBlockEntity) te).getScreen(screenSide) == null)
             return null;
 
-        return (TileEntityScreen) te;
+        return (ScreenBlockEntity) te;
     }
 
     @Nullable

src/main/java/net/montoyo/wd/entity/CCInterfaceBlockEntity.java

@@ -3,6 +3,7 @@
  */
 
 package net.montoyo.wd.entity;
+
 /*
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
@@ -19,18 +20,17 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "computercraft")
-public class TileEntityCCInterface extends TileEntityInterfaceBase implements IPeripheral {
-
+public class CCInterfaceBlockEntity extends AbstractInterfaceBlockEntity implements IPeripheral {
     private static final String[] METHOD_NAMES;
     private static final Method[] METHODS;
 
     static {
         ArrayList<String> names = new ArrayList<>();
         ArrayList<Method> methods = new ArrayList<>();
-        Method[] src = TileEntityInterfaceBase.class.getMethods();
+        Method[] src = AbstractInterfaceBlockEntity.class.getMethods();
 
         for(Method m: src) {
-            if(m.getAnnotation(TileEntityInterfaceBase.ComputerFunc.class) != null) {
+            if(m.getAnnotation(AbstractInterfaceBlockEntity.ComputerFunc.class) != null) {
                 if(m.getParameterCount() != 1 || m.getParameterTypes()[0] != IComputerArgs.class)
                     throw new RuntimeException("Found @ComputerFunc method with invalid arguments");
 
@@ -79,5 +79,4 @@ public class TileEntityCCInterface extends TileEntityInterfaceBase implements IP
     public boolean equals(@Nullable IPeripheral periph) {
         return periph == this;
     }
-
 }*/

src/main/java/net/montoyo/wd/entity/KeyboardBlockEntity.java

@@ -15,15 +15,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.core.ScreenRights;
 import net.montoyo.wd.data.KeyboardData;
-import net.montoyo.wd.init.TileInit;
-import net.montoyo.wd.utilities.Util;
-
-public class TileEntityKeyboard extends TileEntityPeripheralBase {
+import net.montoyo.wd.registry.TileRegistry;
+import net.montoyo.wd.utilities.serialization.Util;
 
+public class KeyboardBlockEntity extends AbstractPeripheralBlockEntity {
     private static final String RANDOM_CHARS = "AZERTYUIOPQSDFGHJKLMWXCVBNazertyuiopqsdfghjklmwxcvbn0123456789"; //Yes I have an AZERTY keyboard, u care?
 
-    public TileEntityKeyboard(BlockPos arg2, BlockState arg3) {
-        super(TileInit.KEYBOARD.get(), arg2, arg3);
+    public KeyboardBlockEntity(BlockPos arg2, BlockState arg3) {
+        super(TileRegistry.KEYBOARD.get(), arg2, arg3);
     }
 
     @Override
@@ -36,13 +35,13 @@ public class TileEntityKeyboard extends TileEntityPeripheralBase {
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen tes = getConnectedScreen();
+        ScreenBlockEntity tes = getConnectedScreen();
         if(tes == null) {
             Util.toast(player, "notLinked");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen.Screen scr = tes.getScreen(screenSide);
+        ScreenData scr = tes.getScreen(screenSide);
         if((scr.rightsFor(player) & ScreenRights.INTERACT) == 0) {
             Util.toast(player, "restrictions");
             return InteractionResult.SUCCESS;
@@ -56,10 +55,10 @@ public class TileEntityKeyboard extends TileEntityPeripheralBase {
         if(!isScreenChunkLoaded())
             return;
         
-        TileEntityScreen tes = getConnectedScreen();
+        ScreenBlockEntity tes = getConnectedScreen();
 
         if(tes != null) {
-            TileEntityScreen.Screen scr = tes.getScreen(screenSide);
+            ScreenData scr = tes.getScreen(screenSide);
             boolean ok;
 
             if(ent instanceof Player)
@@ -72,10 +71,9 @@ public class TileEntityKeyboard extends TileEntityPeripheralBase {
                 tes.type(screenSide, "t" + rnd, getBlockPos());
 
                 Player owner = level.getPlayerByUUID(scr.owner.uuid);
-                if(owner != null && owner instanceof ServerPlayer && ent instanceof Ocelot)
+                if(owner instanceof ServerPlayer && ent instanceof Ocelot)
                     WebDisplays.INSTANCE.criterionKeyboardCat.trigger(((ServerPlayer) owner).getAdvancements());
             }
         }
     }
-
 }

src/main/java/net/montoyo/wd/entity/OCInterfaceBlockEntity.java

@@ -13,8 +13,7 @@ import net.minecraftforge.fml.common.Optional;
 import net.montoyo.wd.core.OCArguments;
 
 @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "opencomputers")
-public class TileEntityOCInterface extends TileEntityInterfaceBase implements SimpleComponent {
-
+public class OCInterfaceBlockEntity extends AbstractInterfaceBlockEntity implements SimpleComponent {
     @Override
     public String getComponentName() {
         return "webdisplays";
@@ -133,5 +132,4 @@ public class TileEntityOCInterface extends TileEntityInterfaceBase implements Si
     public Object[] unlink(Context ctx, Arguments args) {
         return unlink(new OCArguments(args));
     }
-
 }*/

src/main/java/net/montoyo/wd/entity/RedstoneControlBlockEntity.java

@@ -14,30 +14,29 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.montoyo.wd.core.ScreenRights;
 import net.montoyo.wd.data.RedstoneCtrlData;
-import net.montoyo.wd.init.TileInit;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.registry.TileRegistry;
+import net.montoyo.wd.utilities.serialization.Util;
 
 import java.io.IOException;
 
-public class TileEntityRedCtrl extends TileEntityPeripheralBase {
-
+public class RedstoneControlBlockEntity extends AbstractPeripheralBlockEntity {
     private String risingEdgeURL = "";
     private String fallingEdgeURL = "";
     private boolean state = false;
 
-    public TileEntityRedCtrl(BlockPos arg2, BlockState arg3) {
-        super(TileInit.REDSTONE_CONTROLLER.get(), arg2, arg3);
+    public RedstoneControlBlockEntity(BlockPos arg2, BlockState arg3) {
+        super(TileRegistry.REDSTONE_CONTROLLER.get(), arg2, arg3);
     }
-    
+
     @Override
     public void load(CompoundTag tag) {
         super.load(tag);
-    
+
         risingEdgeURL = tag.getString("RisingEdgeURL");
         fallingEdgeURL = tag.getString("FallingEdgeURL");
         state = tag.getBoolean("Powered");
     }
-    
+
     @Override
     protected void saveAdditional(CompoundTag tag) {
         super.saveAdditional(tag);
@@ -45,24 +44,24 @@ public class TileEntityRedCtrl extends TileEntityPeripheralBase {
         tag.putString("FallingEdgeURL", fallingEdgeURL);
         tag.putBoolean("Powered", state);
     }
-    
+
     @Override
     public InteractionResult onRightClick(Player player, InteractionHand hand) {
-        if(level.isClientSide)
+        if (level.isClientSide)
             return InteractionResult.SUCCESS;
 
-        if(!isScreenChunkLoaded()) {
+        if (!isScreenChunkLoaded()) {
             Util.toast(player, "chunkUnloaded");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen tes = getConnectedScreen();
-        if(tes == null) {
+        ScreenBlockEntity tes = getConnectedScreen();
+        if (tes == null) {
             Util.toast(player, "notLinked");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen.Screen scr = tes.getScreen(screenSide);
+        ScreenData scr = tes.getScreen(screenSide);
         if((scr.rightsFor(player) & ScreenRights.CHANGE_URL) == 0) {
             Util.toast(player, "restrictions");
             return InteractionResult.SUCCESS;
@@ -76,10 +75,10 @@ public class TileEntityRedCtrl extends TileEntityPeripheralBase {
     public void onNeighborChange(Block neighborType, BlockPos neighborPos) {
         boolean hasPower = (level.hasNeighborSignal(getBlockPos()) || level.hasNeighborSignal(getBlockPos().above())); //Same as dispenser
 
-        if(hasPower != state) {
+        if (hasPower != state) {
             state = hasPower;
 
-            if(state) //Rising edge
+            if (state) //Rising edge
                 changeURL(risingEdgeURL);
             else //Falling edge
                 changeURL(fallingEdgeURL);
@@ -93,11 +92,11 @@ public class TileEntityRedCtrl extends TileEntityPeripheralBase {
     }
 
     private void changeURL(String url) {
-        if(level.isClientSide || url.isEmpty())
+        if (level.isClientSide || url.isEmpty())
             return;
 
-        if(isScreenChunkLoaded()) {
-            TileEntityScreen tes = getConnectedScreen();
+        if (isScreenChunkLoaded()) {
+            ScreenBlockEntity tes = getConnectedScreen();
 
             if (tes != null)
                 try {

src/main/java/net/montoyo/wd/entity/RemoteControlBlockEntity.java

@@ -12,31 +12,31 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
 import net.montoyo.wd.core.ScreenRights;
 import net.montoyo.wd.data.SetURLData;
-import net.montoyo.wd.init.TileInit;
-import net.montoyo.wd.utilities.Util;
+import net.montoyo.wd.registry.TileRegistry;
+import net.montoyo.wd.utilities.serialization.Util;
 
-public class TileEntityRCtrl extends TileEntityPeripheralBase {
-    public TileEntityRCtrl(BlockPos arg2, BlockState arg3) {
-            super(TileInit.REMOTE_CONTROLLER.get(), arg2, arg3);
+public class RemoteControlBlockEntity extends AbstractPeripheralBlockEntity {
+    public RemoteControlBlockEntity(BlockPos arg2, BlockState arg3) {
+        super(TileRegistry.REMOTE_CONTROLLER.get(), arg2, arg3);
     }
 
     @Override
     public InteractionResult onRightClick(Player player, InteractionHand hand) {
-        if(level.isClientSide)
+        if (level.isClientSide)
             return InteractionResult.SUCCESS;
 
-        if(!isScreenChunkLoaded()) {
+        if (!isScreenChunkLoaded()) {
             Util.toast(player, "chunkUnloaded");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen tes = getConnectedScreen();
-        if(tes == null) {
+        ScreenBlockEntity tes = getConnectedScreen();
+        if (tes == null) {
             Util.toast(player, "notLinked");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen.Screen scr = tes.getScreen(screenSide);
+        ScreenData scr = tes.getScreen(screenSide);
         if((scr.rightsFor(player) & ScreenRights.CHANGE_URL) == 0) {
             Util.toast(player, "restrictions");
             return InteractionResult.SUCCESS;
@@ -45,5 +45,4 @@ public class TileEntityRCtrl extends TileEntityPeripheralBase {
         (new SetURLData(screenPos, screenSide, scr.url, getBlockPos())).sendTo((ServerPlayer) player);
         return InteractionResult.SUCCESS;
     }
-
 }

src/main/java/net/montoyo/wd/entity/ScreenData.java

@@ -0,0 +1,211 @@
+package net.montoyo.wd.entity;
+
+import com.cinemamod.mcef.MCEF;
+import com.cinemamod.mcef.MCEFBrowser;
+import com.cinemamod.mcef.listeners.MCEFCursorChangeListener;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.montoyo.wd.WebDisplays;
+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.browser.InWorldQueries;
+import net.montoyo.wd.utilities.browser.WDBrowser;
+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;
+import java.util.UUID;
+
+public class ScreenData {
+    public BlockSide side;
+    public Vector2i size;
+    public Vector2i resolution;
+    public Rotation rotation = Rotation.ROT_0;
+    public String url;
+    protected VideoType videoType;
+    public NameUUIDPair owner;
+    public ArrayList<NameUUIDPair> friends;
+    public int friendRights;
+    public int otherRights;
+    public CefBrowser browser;
+    public ArrayList<ItemStack> upgrades;
+    public boolean doTurnOnAnim;
+    public long turnOnTime;
+    public Player laserUser;
+    public final Vector2i lastMousePos = new Vector2i();
+    public NibbleArray redstoneStatus; //null on client
+    public boolean autoVolume = true;
+
+    public int mouseType;
+
+    public static ScreenData deserialize(CompoundTag tag) {
+        ScreenData ret = new ScreenData();
+        ret.side = BlockSide.values()[tag.getByte("Side")];
+        ret.size = new Vector2i(tag.getInt("Width"), tag.getInt("Height"));
+        ret.resolution = new Vector2i(tag.getInt("ResolutionX"), tag.getInt("ResolutionY"));
+        ret.rotation = Rotation.values()[tag.getByte("Rotation")];
+        ret.url = tag.getString("URL");
+        ret.videoType = VideoType.getTypeFromURL(ret.url);
+
+        if (ret.resolution.x <= 0 || ret.resolution.y <= 0) {
+            float psx = ((float) ret.size.x) * 16.f - 4.f;
+            float psy = ((float) ret.size.y) * 16.f - 4.f;
+            psx *= 8.f; //TODO: Use ratio in config file
+            psy *= 8.f;
+
+            ret.resolution.x = (int) psx;
+            ret.resolution.y = (int) psy;
+        }
+
+        if (tag.contains("OwnerName")) {
+            String name = tag.getString("OwnerName");
+            UUID uuid = tag.getUUID("OwnerUUID");
+            ret.owner = new NameUUIDPair(name, uuid);
+        }
+
+        ListTag friends = tag.getList("Friends", 10);
+        ret.friends = new ArrayList<>(friends.size());
+
+        for (int i = 0; i < friends.size(); i++) {
+            CompoundTag nf = friends.getCompound(i);
+            NameUUIDPair pair = new NameUUIDPair(nf.getString("Name"), nf.getUUID("UUID"));
+            ret.friends.add(pair);
+        }
+
+        ret.friendRights = tag.getByte("FriendRights");
+        ret.otherRights = tag.getByte("OtherRights");
+
+        ListTag upgrades = tag.getList("Upgrades", 10);
+        ret.upgrades = new ArrayList<>();
+
+        for (int i = 0; i < upgrades.size(); i++)
+            ret.upgrades.add(ItemStack.of(upgrades.getCompound(i)));
+
+        if (tag.contains("AutoVolume"))
+            ret.autoVolume = tag.getBoolean("AutoVolume");
+
+        return ret;
+    }
+
+    public CompoundTag serialize() {
+        CompoundTag tag = new CompoundTag();
+        tag.putByte("Side", (byte) side.ordinal());
+        tag.putInt("Width", size.x);
+        tag.putInt("Height", size.y);
+        tag.putInt("ResolutionX", resolution.x);
+        tag.putInt("ResolutionY", resolution.y);
+        tag.putByte("Rotation", (byte) rotation.ordinal());
+        tag.putString("URL", url);
+
+        if (owner == null)
+            Log.warning("Found TES with NO OWNER!!");
+        else {
+            tag.putString("OwnerName", owner.name);
+            tag.putUUID("OwnerUUID", owner.uuid);
+        }
+
+        ListTag list = new ListTag();
+        for (NameUUIDPair f : friends) {
+            CompoundTag nf = new CompoundTag();
+            nf.putString("Name", f.name);
+            nf.putUUID("UUID", f.uuid);
+
+            list.add(nf);
+        }
+
+        tag.put("Friends", list);
+        tag.putByte("FriendRights", (byte) friendRights);
+        tag.putByte("OtherRights", (byte) otherRights);
+
+        list = new ListTag();
+        for (ItemStack is : upgrades)
+            list.add(is.save(new CompoundTag()));
+
+        tag.put("Upgrades", list);
+        tag.putBoolean("AutoVolume", autoVolume);
+        return tag;
+    }
+
+    public int rightsFor(Player ply) {
+        return rightsFor(ply.getGameProfile().getId());
+    }
+
+    public int rightsFor(UUID uuid) {
+        if (owner.uuid.equals(uuid))
+            return ScreenRights.ALL;
+
+        return friends.stream().anyMatch(f -> f.uuid.equals(uuid)) ? friendRights : otherRights;
+    }
+
+    public void setupRedstoneStatus(Level world, BlockPos start) {
+        if (world.isClientSide()) {
+            Log.warning("Called Screen.setupRedstoneStatus() on client.");
+            return;
+        }
+
+        if (redstoneStatus != null) {
+            Log.warning("Called Screen.setupRedstoneStatus() on server, but redstone status is non-null");
+            return;
+        }
+
+        Direction[] VALUES = Direction.values();
+        redstoneStatus = new NibbleArray(size.x * size.y);
+        final Direction facing = VALUES[side.reverse().ordinal()];
+        final ScreenIterator it = new ScreenIterator(start, side, size);
+
+        while (it.hasNext()) {
+            int idx = it.getIndex();
+            redstoneStatus.set(idx, world.getSignal(it.next(), facing));
+        }
+    }
+
+
+    public void clampResolution() {
+        if (resolution.x > CommonConfig.Screen.maxResolutionX) {
+            float newY = ((float) resolution.y) * ((float) CommonConfig.Screen.maxResolutionX) / ((float) resolution.x);
+            resolution.x = CommonConfig.Screen.maxResolutionX;
+            resolution.y = (int) newY;
+        }
+
+        if (resolution.y > CommonConfig.Screen.maxResolutionY) {
+            float newX = ((float) resolution.x) * ((float) CommonConfig.Screen.maxResolutionY) / ((float) resolution.y);
+            resolution.x = (int) newX;
+            resolution.y = CommonConfig.Screen.maxResolutionY;
+        }
+    }
+
+    public void createBrowser(ScreenBlockEntity be, boolean doAnim) {
+        if (WebDisplays.PROXY instanceof ClientProxy) {
+            browser = WDBrowser.createBrowser(WebDisplays.applyBlacklist(url != null ? url : "https://www.google.com"), false);
+
+            // set screen
+            if (browser instanceof MCEFBrowser mcefBrowser) {
+                if (rotation.isVertical)
+                    mcefBrowser.resize(resolution.y, resolution.x);
+                else
+                    mcefBrowser.resize(resolution.x, resolution.y);
+
+                mcefBrowser.setCursorChangeListener((type) -> mouseType = type);
+            }
+
+            // setup screen as in world
+            if (browser instanceof WDBrowser wdBrowser) {
+                InWorldQueries.attach(be, side, wdBrowser);
+            }
+
+            doTurnOnAnim = doAnim;
+            turnOnTime = System.currentTimeMillis();
+        }
+    }
+}

src/main/java/net/montoyo/wd/entity/ServerBlockEntity.java

@@ -12,16 +12,15 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.montoyo.wd.WebDisplays;
 import net.montoyo.wd.data.ServerData;
-import net.montoyo.wd.init.TileInit;
-import net.montoyo.wd.utilities.NameUUIDPair;
-import net.montoyo.wd.utilities.Util;
-
-public class TileEntityServer extends BlockEntity {
+import net.montoyo.wd.registry.TileRegistry;
+import net.montoyo.wd.utilities.serialization.NameUUIDPair;
+import net.montoyo.wd.utilities.serialization.Util;
 
+public class ServerBlockEntity extends BlockEntity {
     private NameUUIDPair owner;
 
-    public TileEntityServer(BlockPos arg2, BlockState arg3) {
-        super(TileInit.SERVER.get(), arg2, arg3);
+    public ServerBlockEntity(BlockPos arg2, BlockState arg3) {
+        super(TileRegistry.SERVER.get(), arg2, arg3);
     }
 
     @Override
@@ -29,7 +28,7 @@ public class TileEntityServer extends BlockEntity {
         super.load(tag);
         owner = Util.readOwnerFromNBT(tag);
     }
-    
+
     @Override
     protected void saveAdditional(CompoundTag tag) {
         super.saveAdditional(tag);
@@ -42,13 +41,12 @@ public class TileEntityServer extends BlockEntity {
     }
 
     public void onPlayerRightClick(Player ply) {
-        if(level.isClientSide)
+        if (level.isClientSide)
             return;
 
-        if( WebDisplays.INSTANCE.miniservPort == 0)
+        if (WebDisplays.INSTANCE.miniservPort == 0)
             Util.toast(ply, "noMiniserv");
-        else if(owner != null && ply instanceof ServerPlayer)
+        else if (owner != null && ply instanceof ServerPlayer)
             (new ServerData(getBlockPos(), owner)).sendTo((ServerPlayer) ply);
     }
-
 }

src/main/java/net/montoyo/wd/init/BlockInit.java

@@ -1,32 +0,0 @@
-package net.montoyo.wd.init;
-
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-import net.montoyo.wd.block.BlockKeyboardLeft;
-import net.montoyo.wd.block.BlockKeyboardRight;
-import net.montoyo.wd.block.BlockPeripheral;
-import net.montoyo.wd.block.BlockScreen;
-import net.montoyo.wd.core.DefaultPeripheral;
-
-public class BlockInit {
-
-    public static void init(IEventBus bus) {
-        BLOCKS.register(bus);
-    }
-
-    public static DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, "webdisplays");
-
-    public static final RegistryObject<BlockScreen> blockScreen = BLOCKS.register("screen", () -> new BlockScreen(BlockBehaviour.Properties.of(Material.STONE)));
-
-    public static final RegistryObject<BlockKeyboardLeft> blockKeyBoard = BlockInit.BLOCKS.register("kb_left", BlockKeyboardLeft::new);
-    public static final RegistryObject<BlockKeyboardRight> blockKbRight = BLOCKS.register("kb_right", BlockKeyboardRight::new);
-
-    public static final RegistryObject<BlockPeripheral> blockRedControl = BlockInit.BLOCKS.register("redctrl", () -> new BlockPeripheral(DefaultPeripheral.REDSTONE_CONTROLLER));
-    public static final RegistryObject<BlockPeripheral> blockRControl = BlockInit.BLOCKS.register("rctrl", () -> new BlockPeripheral(DefaultPeripheral.REMOTE_CONTROLLER));
-    public static final RegistryObject<BlockPeripheral> blockServer = BlockInit.BLOCKS.register("server", () -> new BlockPeripheral(DefaultPeripheral.SERVER));
-}

src/main/java/net/montoyo/wd/init/TileInit.java

@@ -1,39 +0,0 @@
-package net.montoyo.wd.init;
-
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-import net.montoyo.wd.core.DefaultPeripheral;
-import net.montoyo.wd.entity.*;
-
-import java.util.Locale;
-
-public class TileInit {
-
-    public static final DeferredRegister<BlockEntityType<?>> TILE_TYPES = DeferredRegister
-            .create(ForgeRegistries.BLOCK_ENTITY_TYPES, "webdisplays");
-
-    //Register tile entities
-    public static final RegistryObject<BlockEntityType<TileEntityScreen>> SCREEN_BLOCK_ENTITY = TILE_TYPES
-            .register("screen", () -> BlockEntityType.Builder
-                    .of(TileEntityScreen::new, BlockInit.blockScreen.get()).build(null));
-
-    public static final RegistryObject<BlockEntityType<?>> KEYBOARD = TILE_TYPES.register("kb_left", () -> BlockEntityType.Builder
-                    .of(TileEntityKeyboard::new, BlockInit.blockKeyBoard.get()).build(null));
-
-   public static final RegistryObject<BlockEntityType<?>> REMOTE_CONTROLLER = TILE_TYPES.register("rctrl",
-           () -> BlockEntityType.Builder.of(TileEntityRCtrl::new, BlockInit.blockRControl.get()).build(null));         //WITHOUT FACING (>= 3)
-
-    public static final RegistryObject<BlockEntityType<?>> REDSTONE_CONTROLLER = TILE_TYPES.register("redctrl",
-            () -> BlockEntityType.Builder.of(TileEntityRedCtrl::new, BlockInit.blockRedControl.get()).build(null));
-
-    public static final RegistryObject<BlockEntityType<?>> SERVER = TILE_TYPES.register("server" ,
-            () -> BlockEntityType.Builder.of(TileEntityServer::new, BlockInit.blockServer.get()).build(null));
-
-    public static void init(IEventBus bus) {
-        TILE_TYPES.register(bus);
-    }
-}

src/main/java/net/montoyo/wd/item/ItemCraftComponent.java

@@ -10,11 +10,10 @@ import net.montoyo.wd.core.CraftComponent;
 import org.jetbrains.annotations.NotNull;
 
 public class ItemCraftComponent extends ItemMulti implements WDItem {
-
     public ItemCraftComponent(Properties properties) {
         super(CraftComponent.class, properties
-        //setRegistryName("craftcomp");
-                .tab(WebDisplays.CREATIVE_TAB));
+//                .tab(WebDisplays.CREATIVE_TAB)
+        );
 
         //Hide the bad extension card from the creative tab
         creativeTabItems.clear(CraftComponent.BADEXTCARD.ordinal());

src/main/java/net/montoyo/wd/item/ItemLaserPointer.java

@@ -11,21 +11,20 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import net.montoyo.wd.WebDisplays;
-import net.montoyo.wd.block.BlockScreen;
+import net.montoyo.wd.block.ScreenBlock;
 import net.montoyo.wd.client.ClientProxy;
-import net.montoyo.wd.client.JSQueryDispatcher;
 import net.montoyo.wd.config.ClientConfig;
 import net.montoyo.wd.controls.builtin.ClickControl;
 import net.montoyo.wd.core.DefaultUpgrade;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.init.BlockInit;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.entity.ScreenData;
 import net.montoyo.wd.net.WDNetworkRegistry;
 import net.montoyo.wd.net.server_bound.C2SMessageScreenCtrl;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.registry.BlockRegistry;
 import net.montoyo.wd.utilities.Multiblock;
-import net.montoyo.wd.utilities.Vector2i;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.data.BlockSide;
+import net.montoyo.wd.utilities.math.Vector2i;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -34,13 +33,13 @@ public class ItemLaserPointer extends Item implements WDItem {
 	
 	public ItemLaserPointer(Properties properties) {
 		super(properties
-				//setRegistryName("laserpointer")
 				.stacksTo(1)
-				.tab(WebDisplays.CREATIVE_TAB));
+//				.tab(WebDisplays.CREATIVE_TAB)
+		);
 	}
 	
 	//Laser pointer
-	private static TileEntityScreen pointedScreen;
+	private static ScreenBlockEntity pointedScreen;
 	private static BlockSide pointedScreenSide;
 	private static long lastPointPacket;
 	
@@ -54,16 +53,16 @@ public class ItemLaserPointer extends Item implements WDItem {
 		
 		BlockPos bpos = result.getBlockPos();
 		
-		if (result.getType() == HitResult.Type.BLOCK && mc.level.getBlockState(bpos).getBlock() == BlockInit.blockScreen.get()) {
+		if (result.getType() == HitResult.Type.BLOCK && mc.level.getBlockState(bpos).getBlock() == BlockRegistry.SCREEN_BLOCk.get()) {
 			Vector3i pos = new Vector3i(result.getBlockPos());
 			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());
 			
 			if (te != null && te.hasUpgrade(side, DefaultUpgrade.LASERMOUSE)) { //hasUpgrade returns false is there's no screen on side 'side'
 				//Since rights aren't synchronized, let the server check them for us...
-				TileEntityScreen.Screen scr = te.getScreen(side);
+				ScreenData scr = te.getScreen(side);
 				
 				if (scr.browser != null) {
 					float hitX = ((float) result.getLocation().x) - (float) pos.x;
@@ -71,7 +70,7 @@ public class ItemLaserPointer extends Item implements WDItem {
 					float hitZ = ((float) result.getLocation().z) - (float) pos.z;
 					Vector2i tmp = new Vector2i();
 					
-					if (BlockScreen.hit2pixels(side, bpos, new Vector3i(result.getBlockPos()), scr, hitX, hitY, hitZ, tmp)) {
+					if (ScreenBlock.hit2pixels(side, bpos, new Vector3i(result.getBlockPos()), scr, hitX, hitY, hitZ, tmp)) {
 						laserClick(te, side, scr, tmp);
 					}
 				}
@@ -79,11 +78,11 @@ public class ItemLaserPointer extends Item implements WDItem {
 		}
 	}
 	
-	public static void deselect(Minecraft mc, JSQueryDispatcher jsDispatcher) {
+	public static void deselect(Minecraft mc) {
 		deselectScreen();
 	}
 	
-	private static void laserClick(TileEntityScreen tes, BlockSide side, TileEntityScreen.Screen 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();
@@ -107,7 +106,7 @@ public class ItemLaserPointer extends Item implements WDItem {
 	}
 	
 	public static void press(boolean press, int button) {
-		if (button <= 1 && ClientConfig.switchButtons)
+		if (button <= 1 && ClientConfig.Input.switchButtons)
 			button = 1 - button;
 		
 		if (button == 0) left = press;
@@ -121,32 +120,23 @@ public class ItemLaserPointer extends Item implements WDItem {
 		BlockSide side = BlockSide.values()[result.getDirection().ordinal()];
 		Multiblock.findOrigin(mc.level, pos, side, null);
 		
-		float hitX = ((float) result.getLocation().x) - (float) pos.x;
-		float hitY = ((float) result.getLocation().y) - (float) pos.y;
-		float hitZ = ((float) result.getLocation().z) - (float) pos.z;
-		Vector2i tmp = new Vector2i();
-		
 		BlockEntity be = mc.level.getBlockEntity(pos.toBlock());
-		if (!(be instanceof TileEntityScreen)) return;
+		if (!(be instanceof ScreenBlockEntity)) return;
 		
 		//noinspection PatternVariableCanBeUsed
-		TileEntityScreen te = (TileEntityScreen) be;
+		ScreenBlockEntity te = (ScreenBlockEntity) be;
 		
 		if (te.hasUpgrade(side, DefaultUpgrade.LASERMOUSE)) { //hasUpgrade returns false is there's no screen on side 'side'
-			//Since rights aren't synchronized, let the server check them for us...
-			TileEntityScreen.Screen scr = te.getScreen(side);
-			
-			if (scr.browser != null) {
-				if (BlockScreen.hit2pixels(side, result.getBlockPos(), new Vector3i(result.getBlockPos()), scr, hitX, hitY, hitZ, tmp)) {
-					te.handleMouseEvent(side, ClickControl.ControlType.MOVE, tmp, -1);
-					te.handleMouseEvent(side, press ? ClickControl.ControlType.DOWN : ClickControl.ControlType.UP, tmp, button);
-					
-					if (press)
-						WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserDown(te, side, tmp, button));
-					else
-						WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserUp(te, side, button));
-				}
-			}
+			int finalButton = button;
+			te.interact(result, (hit) -> {
+				te.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1);
+				te.handleMouseEvent(side, press ? ClickControl.ControlType.DOWN : ClickControl.ControlType.UP, hit, finalButton);
+
+				if (press)
+					WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserDown(te, side, hit, finalButton));
+				else
+					WDNetworkRegistry.INSTANCE.sendToServer(C2SMessageScreenCtrl.laserUp(te, side, finalButton));
+			});
 		}
 	}
 	

src/main/java/net/montoyo/wd/item/ItemLinker.java

@@ -14,46 +14,46 @@ import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.montoyo.wd.WebDisplays;
-import net.montoyo.wd.block.BlockScreen;
+import net.montoyo.wd.block.ScreenBlock;
 import net.montoyo.wd.core.IPeripheral;
 import net.montoyo.wd.core.ScreenRights;
-import net.montoyo.wd.entity.TileEntityScreen;
-import net.montoyo.wd.utilities.BlockSide;
+import net.montoyo.wd.entity.ScreenData;
+import net.montoyo.wd.entity.ScreenBlockEntity;
+import net.montoyo.wd.utilities.data.BlockSide;
 import net.montoyo.wd.utilities.Multiblock;
-import net.montoyo.wd.utilities.Util;
-import net.montoyo.wd.utilities.Vector3i;
+import net.montoyo.wd.utilities.serialization.Util;
+import net.montoyo.wd.utilities.math.Vector3i;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public class ItemLinker extends Item implements WDItem {
-
     public ItemLinker(Properties properties) {
         super(properties
-        //setRegistryName("linker");
-            .stacksTo(1)
-            .tab(WebDisplays.CREATIVE_TAB));
+                        .stacksTo(1)
+//            .tab(WebDisplays.CREATIVE_TAB)
+        );
     }
 
     @Override
     public InteractionResult useOn(UseOnContext context) {
-        if(context.getLevel().isClientSide())
+        if (context.getLevel().isClientSide())
             return InteractionResult.SUCCESS;
 
         ItemStack stack = context.getPlayer().getItemInHand(context.getHand());
         CompoundTag tag = stack.getTag();
 
-        if(tag != null) {
-            if(tag.contains("ScreenX") && tag.contains("ScreenY") && tag.contains("ScreenZ") && tag.contains("ScreenSide")) {
+        if (tag != null) {
+            if (tag.contains("ScreenX") && tag.contains("ScreenY") && tag.contains("ScreenZ") && tag.contains("ScreenSide")) {
                 BlockState state = context.getLevel().getBlockState(context.getClickedPos());
                 IPeripheral target;
 
-                if(state.getBlock() instanceof IPeripheral)
+                if (state.getBlock() instanceof IPeripheral)
                     target = (IPeripheral) state.getBlock();
                 else {
                     BlockEntity te = context.getLevel().getBlockEntity(context.getClickedPos());
-                    if(te == null || !(te instanceof IPeripheral)) {
-                        if(context.getPlayer().isShiftKeyDown()) {
+                    if (te == null || !(te instanceof IPeripheral)) {
+                        if (context.getPlayer().isShiftKeyDown()) {
                             Util.toast(context.getPlayer(), ChatFormatting.GOLD, "linkAbort");
                             stack.setTag(null);
                         } else
@@ -68,10 +68,10 @@ public class ItemLinker extends Item implements WDItem {
                 Vector3i tePos = new Vector3i(tag.getInt("ScreenX"), tag.getInt("ScreenY"), tag.getInt("ScreenZ"));
                 BlockSide scrSide = BlockSide.values()[tag.getByte("ScreenSide")];
 
-                if(target.connect(context.getLevel(), context.getClickedPos(), state, tePos, scrSide)) {
+                if (target.connect(context.getLevel(), context.getClickedPos(), state, tePos, scrSide)) {
                     Util.toast(context.getPlayer(), ChatFormatting.AQUA, "linked");
 
-                    if(context.getPlayer() instanceof ServerPlayer)
+                    if (context.getPlayer() instanceof ServerPlayer)
                         WebDisplays.INSTANCE.criterionLinkPeripheral.trigger(((ServerPlayer) context.getPlayer()).getAdvancements());
                 } else
                     Util.toast(context.getPlayer(), "linkError");
@@ -81,7 +81,7 @@ public class ItemLinker extends Item implements WDItem {
             }
         }
 
-        if(!(context.getLevel().getBlockState(context.getClickedPos()).getBlock() instanceof BlockScreen)) {
+        if (!(context.getLevel().getBlockState(context.getClickedPos()).getBlock() instanceof ScreenBlock)) {
             Util.toast(context.getPlayer(), "notAScreen");
             return InteractionResult.SUCCESS;
         }
@@ -91,15 +91,15 @@ public class ItemLinker extends Item implements WDItem {
         Multiblock.findOrigin(context.getLevel(), pos, side, null);
 
         BlockEntity te = context.getLevel().getBlockEntity(pos.toBlock());
-        if(te == null || !(te instanceof TileEntityScreen)) {
+        if (te == null || !(te instanceof ScreenBlockEntity)) {
             Util.toast(context.getPlayer(), "turnOn");
             return InteractionResult.SUCCESS;
         }
 
-        TileEntityScreen.Screen 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)
+        else if ((scr.rightsFor(context.getPlayer()) & ScreenRights.MANAGE_UPGRADES) == 0)
             Util.toast(context.getPlayer(), "restrictions");
         else {
             tag = new CompoundTag();
@@ -120,5 +120,4 @@ public class ItemLinker extends Item implements WDItem {
     public String getWikiName(@Nonnull ItemStack is) {
         return is.getItem().getName(is).getString();
     }
-
 }