Merge branch 'fixes/printer' into versions/1.20.1

# Conflicts:
#	.gitignore
#	common/src/main/java/com/ultreon/devices/ClientModEvents.java
#	common/src/main/java/com/ultreon/devices/Devices.java
#	fabric/src/main/java/com/ultreon/devices/datagen/DevicesRecipeProvider.java
#	forge/build.gradle

Author: Omnixerion

.gitignore

@@ -7,6 +7,8 @@
 *.ipr
 *.iws
 
+local/
+
 # IntelliJ
 out/
 # mpeltonen/sbt-idea plugin
@@ -137,3 +139,6 @@ run/
 /fabric/runs/
 /fabric/run/
 /forge/runs/
+
+/*/bin/
+/.vscode/

.idea/discord.xml

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
     id "org.jetbrains.kotlin.jvm" version "1.7.10"
 }
 repositories {
@@ -66,6 +66,9 @@ subprojects {
                 includeGroup "curse.maven"
             }
         }
+        maven {
+            url "https://jitpack.io"
+        }
         maven {
             // location of the maven that hosts JEI files
             name = "Progwml6 maven"
@@ -75,7 +78,9 @@ subprojects {
     }
 
     dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}", {
+            transitive = false
+        }
         // The following line declares the mojmap mappings, you may use other mappings as well
         mappings loom.layered() {
             officialMojangMappings()

build.gradle

@@ -25,6 +25,8 @@ dependencies {
     modCompileOnly "fuzs.forgeconfigapiport:forgeconfigapiport-common:8.0.0"
     modCompileOnly 'com.electronwill.night-config:core:3.6.3'
     modCompileOnly 'com.electronwill.night-config:toml:3.6.3'
+    modImplementation "com.github.Ultreon.advanced-debug:advanced-debug:$advanced_debug_version"
+    implementation "io.github.spair:imgui-java-binding:1.86.10" // FIXME make dep an api(...) in advanced debug.
 
 }
 

common/build.gradle

@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "devices:laptop",
+      "required": false
+    },
+    {
+      "id": "devices:mac_max_x",
+      "required": false
+    }
+  ]
+}

common/src/main/generated/resources/data/devices/tags/block_entity_type/computers.json

@@ -1,8 +1,7 @@
 {
   "replace": false,
   "values": [
-    "devices:laptop",
-    "devices:printer",
-    "devices:mac_max_x"
+    "#devices:computers",
+    "#devices:printers"
   ]
 }

common/src/main/generated/resources/data/devices/tags/block_entity_type/network_devices.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "devices:printer",
+      "required": false
+    }
+  ]
+}

common/src/main/generated/resources/data/devices/tags/block_entity_type/printers.json

@@ -14,6 +14,7 @@
 import com.ultreon.devices.programs.system.object.ColorSchemePresets;
 import dev.architectury.platform.Platform;
 import dev.architectury.registry.ReloadListenerRegistry;
+import dev.architectury.registry.client.level.entity.EntityModelLayerRegistry;
 import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry;
 import dev.architectury.registry.client.rendering.RenderTypeRegistry;
 import dev.architectury.registry.registries.RegistrarManager;
@@ -41,7 +42,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
-
 public class ClientModEvents {
     private static final Marker SETUP = MarkerFactory.getMarker("SETUP");
     private static final Logger LOGGER = Devices.LOGGER;
@@ -71,17 +71,17 @@ public static void clientSetup() {
         registerRenderLayers();
         registerRenderers();
         registerLayerDefinitions();
+        registerBlockRenderTypes();
+
         if (Platform.isForge()) { // Note: Forge requires the icon atlas to be generator beforehand.
             generateIconAtlas();
         }
 
-        registerOSContent();
-
         ReloadListenerRegistry.register(PackType.CLIENT_RESOURCES, new ReloaderListener());
     }
 
-    private static void registerOSContent() {
-        ColorSchemePresets.init();
+    private static void registerBlockRenderTypes() {
+        DeviceBlocks.getAllLaptops().forEach(it -> RenderTypeRegistry.register(RenderType.cutout(), it));
     }
 
     @ApiStatus.Internal
@@ -237,13 +237,6 @@ public void finish() {
         imageWriter.finish();
     }
 
-//    @ExpectPlatform
-//    private static void.json updateIcon(AppInfo info, int iconU, int iconV) {
-//        throw new AssertionError();
-////        ObfuscationReflectionHelper.setPrivateValue(AppInfo.class, info, iconU, "iconU");
-////        ObfuscationReflectionHelper.setPrivateValue(AppInfo.class, info, iconV, "iconV");
-//    }
-
     public static void setRenderLayer(Block block, RenderType type) {
         RenderRegistry.register(block, type
         );
@@ -261,6 +254,6 @@ public static void registerRenderers() {
 
     public static void registerLayerDefinitions() {
         LOGGER.info("Registering layer definitions.");
-//        EntityModelLayerRegistry.register(PrinterRenderer.PaperModel.LAYER_LOCATION, PrinterRenderer.PaperModel::createBodyLayer);
+        EntityModelLayerRegistry.register(PrinterRenderer.PaperModel.LAYER_LOCATION, PrinterRenderer.PaperModel::createBodyLayer);
     }
 }