Merge branch '1.20.1' into Qboi123-ultreon-browser

# Conflicts: # .gitignore # build.gradle # common/build.gradle # common/src/main/java/com/ultreon/devices/Devices.java # common/src/main/java/com/ultreon/devices/Reference.java # fabric-datagen-helper/build.gradle # fabric-testmod/build.gradle # fabric/build.gradle # forge/build.gradle # gradle.properties # merge-fabric/build.gradle
Ultreon · Oct 16, 2023 · 845ec4f · 845ec4f
2 parents 52011ca + c2386e3
commit 845ec4f
Show file tree

Hide file tree

Showing 461 changed files with 10,219 additions and 4,236 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,12 +19,9 @@ jobs:
             command: "chmod +x gradlew"
       - run:
             name: "Build Project"
-            command: "./gradlew build mergeJars"
+            command: "./gradlew build"
             environment:
               CIRCLE_CI: true
-      - store_artifacts:
-          name: "Store Merged Artifacts"
-          path: build/libs/merged
       - store_artifacts:
           name: "Store Fabric Artifacts"
           path: fabric/build/libs

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,31 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+*.json text eol=lf
+*.toml text eol=lf
+*.properties text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+*.mcmeta text eol=lf
+*.kt text eol=lf
+*.cpp text eol=lf
+*.hpp text eol=lf
+*.cc text eol=lf
+*.c text eol=lf
+*.h text eol=lf
+*.cs text eol=lf
+*.py text eol=lf
+*.rby text eol=lf
+*.html text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+*.xml text eol=lf
+*.svg text eol=lf
+*.java text eol=lf
+*.groovy text eol=lf
+*.gradle text eol=lf
+*.scala text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.ulang text eol=lf
+*.ezlang text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -132,4 +132,4 @@ run/
 !libs/*
 
 # Cache
-common/src/main/generated/resources/.cache
+/common/src/main/generated/resources/.cache
diff --git a/.run/Build Merged Jar.run.xml → .run/Clean Projects.run.xml b/.run/Build Merged Jar.run.xml → .run/Clean Projects.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build Merged Jar" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Clean Projects" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,16 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="mergeJars" />
+          <option value="clean" />
         </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="build" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-    </method>
+    <ForceTestExec>false</ForceTestExec>
+    <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Generate Sources.run.xml b/.run/Generate Sources.run.xml
@@ -10,14 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="genSources" />
+          <option value="genSourcesWithCfr" />
         </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 # Ultreon Devices Mod [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Ultreon/devices-mod/tree/1.19.3-development.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/Ultreon/devices-mod/tree/1.19.3-development)
 **Language:** Java  
-**Minecraft Version:** `1.19.3`  
-**Mod Loader:** [Forge](https://files.minecraftforge.net/) & [Fabric](https://fabricmc.net/)
+**Minecraft Version:** `1.19.3`, `1.20.1`  
+**Mod Loader:** [Forge](https://files.minecraftforge.net/), [NeoForge](https://neoforged.net/), [Fabric](https://fabricmc.net/)  
+**Download:** [[CurseForge]](https://curseforge.com/minecraft/mc-mods/devices-mod), [[CurseForge Legacy]](https://legacy.curseforge.com/minecraft/mc-mods/devices-mod), [[Modrinth]](https://modrinth.com/mod/devices-mod)
 
 *Fork of [MrCrayfish's Device Mod](https://github.com/MrCrayfish/MrCrayfishDeviceMod)*
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,11 +1,13 @@
 # Maintained Versions
 
-Will be be updated regularly
+Will be updated regularly
 
 | Minecraft Version | Supported          |
 | ------- | ------------------ |
-| 1.19.2   | :white_check_mark: |
-| 1.18.2   | :warning: (Support ending one month after 1.19.3 is released)|
+| 1.20.1 | :white_check_mark: |
+| 1.19.3   | :warning: (EOL)                         |
+| 1.19.2   | :x: |
+| 1.18.2   | :x: (Features may be occasionally ported to 1.18.2)|
 | 1.16.5  | :x: (no version exists, so stop asking)               |
 | 1.12.2 | :x:                |
 
@@ -14,12 +16,14 @@ Will be be updated regularly
 
 Will be updated to patch security vulnerabilities
 
-| Minecraft Version | Supported          |
-| ------- | ------------------ |
-| 1.19.2   | :white_check_mark: |
-| 1.18.2   | :warning: (Support ending one month after 1.19.3 is released)|
-| 1.16.5  | :x: (no version exists, so stop asking)               |
-| 1.12.2 | :white_check_mark:                |
+| Minecraft Version | Supported                               |
+| ------- |-----------------------------------------|
+| 1.20.1 | :white_check_mark: |
+| 1.19.3   | :warning: (EOL)                         |
+| 1.19.2   | :x:                                     |
+| 1.18.2   | :x:                                     |
+| 1.16.5  | :x: (no version exists, so stop asking) |
+| 1.12.2 | :white_check_mark:                      |
 
 ## Reporting a Vulnerability
 

diff --git a/build.gradle b/build.gradle
@@ -2,40 +2,25 @@
 //file:noinspection GrMethodMayBeStatic
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
-    id "io.github.pacifistmc.forgix" version "1.2.2"
+    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
     id "org.jetbrains.kotlin.jvm" version "1.7.10"
 }
 repositories {
     gradlePluginPortal()
 }
 
 architectury {
-    minecraft = rootProject.minecraft_version
+    minecraft = minecraft_version
 }
-version = "${mod_version}"//-${System.getenv("GITHUB_BUILD_NUMBER") == null ? "local" : System.getenv("GITHUB_BUILD_NUMBER")}"
+
+version mod_version
 
 Object getInGameVersion() {
-    return "${mod_version}"//+${System.getenv("GITHUB_BUILD_NUMBER") == null ? "local" : System.getenv("GITHUB_BUILD_NUMBER")}"
+    return "${mod_version}"
 }
 
 Object getModDescription() {
-    return "${mod_description}"
-}
-forgix {
-    group = "com.ultreon.mods"
-    mergedJarName = "devices-${version}.jar"
-    outputDir = "build/libs/merged"
-
-    forge {
-        projectName = "merge-forge"
-        jarLocation = "build/libs/devices-${version}.jar"
-    }
-
-    fabric {
-        projectName = "merge-fabric"
-        jarLocation = "build/libs/devices-${version}.jar"
-    }
+    return mod_description
 }
 
 subprojects {
@@ -45,24 +30,57 @@ subprojects {
         silentMojangMappingsLicense()
     }
 
+    repositories {
+        mavenCentral()
+
+        maven {
+            name = 'Sponge / Mixin'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        }
+
+        maven {
+            name = "Fuzs Mod Resources"
+            url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
+        }
+
+        maven {
+            name = 'BlameJared Maven (CrT / Bookshelf)'
+            url = 'https://maven.blamejared.com'
+        }
+        maven {
+            name = 'ParchmentMC'
+            url = 'https://maven.parchmentmc.org'
+        }
+
+        maven {
+            name 'Quilt (Release)'
+            url 'https://maven.quiltmc.org/repository/release/'
+        }
+
+
+        maven {
+            url "https://cursemaven.com"
+            content {
+                includeGroup "curse.maven"
+            }
+        }
+        maven {
+            // location of the maven that hosts JEI files
+            name = "Progwml6 maven"
+            url = "https://dvs1.progwml6.com/files/maven/"
+        }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
+    }
+
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         // The following line declares the mojmap mappings, you may use other mappings as well
         mappings loom.layered() {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-1.19.2:2022.08.10@zip")
+            parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
         }
     }
-
-    if (Objects.equals(System.getenv("CIRCLE_CI"), "true")) {
-        def copyToArtifacts = tasks.register("copyToArtifacts", Copy) {
-            it.mustRunAfter(build)
-            it.from files("$buildDir/libs/merged/*.jar")
-            it.into file("/tmp/artifacts/")
-        }
-        remapJar.finalizedBy copyToArtifacts
-        remapSourcesJar.finalizedBy copyToArtifacts
-    }
 }
 
 allprojects {
@@ -85,18 +103,24 @@ allprojects {
         maven { url "https://jitpack.io/" }
         maven { url "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" }
         maven { url "https://cursemaven.com/" }
-        flatDir { dir "${rootProject.projectDir}/libs/" }
+        flatDir { dir "$rootProject.projectDir/libs/" }
     }
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
         //noinspection GroovyAccessibility
-        options.release = 17
+        options.release.set(17)
     }
 
     java {
         withSourcesJar()
     }
+
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xmaxerrs" << "9999"
+        }
+    }
 }
 
 void setupRepositories(RepositoryHandler repositories) {
@@ -112,19 +136,3 @@ void setupRepositories(RepositoryHandler repositories) {
         }
     }
 }
-
-mergeJars.mustRunAfter build
-mergeJars.mustRunAfter ":merge-fabric:build"
-mergeJars.mustRunAfter ":merge-forge:build"
-
-if (Objects.equals(System.getenv("CIRCLE_CI"), "true")) {
-    def copyToArtifacts = tasks.register("copyToArtifacts", Copy) {
-        it.mustRunAfter(mergeJars)
-        it.from files("$buildDir/libs/merged/*.jar")
-        it.into file("/tmp/artifacts/")
-    }
-    mergeJars.finalizedBy(copyToArtifacts)
-}
-
-
-//build.dependsOn mergeJars
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,10 +1,10 @@
 //file:noinspection GradlePackageUpdate
 architectury {
-    common("fabric", "forge")
+    common platforms.split(",")
 }
 
 loom {
-    accessWidenerPath = file("src/main/resources/devices.accesswidener")
+    accessWidenerPath = file "src/main/resources/devices.accesswidener"
 }
 
 repositories {
@@ -14,9 +14,9 @@ repositories {
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modImplementation "net.fabricmc:fabric-loader:$fabric_loader_version"
     // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury:$architectury_version"
 
     modImplementation 'com.github.Ultreon.ultreonlib:ultreon-lib:1.3.2'
 
@@ -27,7 +27,7 @@ dependencies {
     modApi("com.ultreon:ultranlang:0.1.0+6")
     modApi("com.jab125:apoint:1.0.0")
 
-    modCompileOnly "curse.maven:forgeapiportfabric-547434:3671141"
+    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'