🔄️ Updating to 1.20.4

README.md

@@ -8,8 +8,8 @@
 
 ## License Notes
 Some code is used from other projects with other licenses.
-* The package `com.jab125` and all it's subpackages are licensed under All Rights Reserved.
-* Everything in [updater/](updater) also is licensed under All Rights Reserved.
+* The package `com.jab125` and all it's subpackages are licensed the GPL 3.0.
+* Everything in [updater/](updater) also is licensed under the GPL 3.0.
 
 [@MrCrayfish](https://github.com/MrCrayfish) has said on his discord server that we can use his code and even the assets for this port.
 

api/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("java")
+}
+
+group = "com.ultreon.mods.devices"
+version = "0.9.0"
+
+repositories {
+    mavenCentral()
+
+    maven("https://github.com/Ultreon/ultreon-data/raw/main/.mvnrepo")
+    maven("https://github.com/Ultreon/corelibs/raw/main/.mvnrepo")
+}
+
+dependencies {
+    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+
+    implementation("org.jetbrains:annotations:23.0.0")
+
+    implementation("io.github.ultreon:ubo:1.3.0")
+    implementation("io.github.ultreon.corelibs:commons-v0:0.2.0")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "org.jetbrains.kotlin.jvm" version "1.7.10"
 }
 repositories {
@@ -22,6 +22,10 @@ Object getModDescription() {
 }
 
 subprojects {
+    if (project.name == "api") {
+        return
+    }
+
     apply plugin: "dev.architectury.loom"
 
     loom {
@@ -91,9 +95,12 @@ subprojects {
 
 allprojects {
     apply plugin: "java"
-    apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
+    if (project.name != "api") {
+        apply plugin: "architectury-plugin"
+    }
+
     archivesBaseName = rootProject.archives_base_name
     version = rootProject.version
     group = rootProject.maven_group
@@ -104,8 +111,14 @@ allprojects {
         // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
         // See https://docs.gradle.org/current/userguide/declaring_repositories.html
         // for more information about repositories.
+        mavenCentral()
         maven { url "https://maven.parchmentmc.org" }
         maven { url "https://maven.jab125.dev" }
+        maven { url "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" }
+        maven { url "https://cursemaven.com" }
+        maven { url "https://maven.terraformersmc.com/releases" }
+        maven { url "https://github.com/Ultreon/ultreon-data/raw/main/.mvnrepo" }
+        maven { url "https://github.com/Ultreon/corelibs/raw/main/.mvnrepo" }
         flatDir { dir "$rootProject.projectDir/libs/" }
     }
 

common/build.gradle

@@ -18,10 +18,14 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury:$architectury_version"
 
+    implementation("io.github.ultreon:ubo:1.3.0")
+
+    modApi "fuzs.forgeconfigapiport:forgeconfigapiport-common-neoforgeapi:$forgeconfigapiport_version"
+
+    implementation project(":api")
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10"
 //    modApi "com.ultreon:ultranlang:0.1.0+6"
-    modApi "com.jab125:apoint:1.0.0"
 
     modCompileOnly "fuzs.forgeconfigapiport:forgeconfigapiport-common:8.0.0"
     modCompileOnly 'com.electronwill.night-config:core:3.6.3'

common/src/main/generated/resources/assets/devices/models/item/glass_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "devices:item/glass_dust"
+  }
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/ethernet_cable.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_plastic": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:plastic"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:ethernet_cable"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_plastic",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:ethernet_cable"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/gpu.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_plastic": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:plastic"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:gpu"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_plastic",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:gpu"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/hard_drive.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_plastic": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:plastic"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:hard_drive"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_plastic",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:hard_drive"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/plastic.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_plastic_unrefined": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:plastic_unrefined"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:plastic"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_plastic_unrefined",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:plastic"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/plastic_frame.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_plastic": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:plastic"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:plastic_frame"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_plastic",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:plastic_frame"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/plastic_unrefined.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_slime_ball": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:slime_ball"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:plastic_unrefined"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_slime_ball",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:plastic_unrefined"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/main/generated/resources/data/devices/advancements/recipes/misc/ram.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_circuit_board": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "devices:circuit_board"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "devices:ram"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_circuit_board",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "devices:ram"
+    ]
+  },
+  "sends_telemetry_event": false
+}