Merge pull request #4959 from SidPrinceDesFlammes/1.18.2

Ice and Fire 1.20.1 port
AlexModGuy · Oct 9, 2023 · c742552 · c742552
2 parents ff86fe9 + 0611bb3
commit c742552
Show file tree

Hide file tree

Showing 636 changed files with 7,000 additions and 6,793 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ buildscript {
         maven { url = 'https://maven.parchmentmc.org' } // Add this line
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
         classpath 'org.parchmentmc:librarian:1.+'
     }
@@ -18,20 +17,25 @@ buildscript {
 }
 plugins {
     id 'eclipse'
+    id 'idea'
     id 'maven-publish'
+    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
+
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
+
+
 repositories {
     maven {
-        name = "CurseForge"
-        url = "https://minecraft.curseforge.com/api/maven/"
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
     }
     maven {
-        name = "Progwml6 maven"
-        url = "https://dvs1.progwml6.com/files/maven/"
+        name = "CurseForge"
+        url = "https://minecraft.curseforge.com/api/maven/"
     }
     maven {
         name = "CurseMaven"
@@ -42,7 +46,7 @@ repositories {
 def build_snapshot = System.getenv("BUILD_SNAPSHOT") == "true"
 def build_id = System.getenv("BUILD_ID")
 
-version = '2.1.12-1.18.2'
+version = '2.1.13-1.20.1'
 
 if (build_snapshot) {
     version += '-SNAPSHOT'
@@ -58,35 +62,34 @@ 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: 'parchment', version: '2022.11.06-1.18.2'
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    mappings channel: 'parchment', version: '2023.08.13-1.20.1'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    copyIdeResources = true
 
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
     runs {
-        client {
+
+        configureEach {
             workingDirectory project.file('run')
+            property 'forge.logging.console.level', 'debug'
+            property 'fml.earlyprogresswindow', 'false'
+            property 'mixin.env.disableRefMap', 'true'
+
+            mods {
+                "iceandfire" {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        client {
             arg "-mixin.config=citadel.mixins.json"
             properties 'mixin.env.remapRefMap': 'true'
             property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
 
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRYDUMP'
 
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
 
-            mods {
-                iceandfire {
-                    source sourceSets.main
-                }
-            }
         }
 
         server {
@@ -96,13 +99,7 @@ minecraft {
             arg "-mixin.config=citadel.mixins.json"
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-            property 'forge.logging.console.level', 'debug'
 
-            mods {
-                iceandfire {
-                    source sourceSets.main
-                }
-            }
         }
 
         data {
@@ -111,19 +108,9 @@ minecraft {
             properties 'mixin.env.remapRefMap': 'true'
             property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
 
-            //property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.markers', 'REGISTRYDUMP'
-
-            property 'forge.logging.console.level', 'debug'
-
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', 'iceandfire', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
-            mods {
-                iceandfire {
-                    source sourceSets.main
-                }
-            }
         }
     }
 }
@@ -135,20 +122,28 @@ mixin {
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-processResources {}
+processResources {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.2-40.2.0'
+    minecraft 'net.neoforged:forge:1.20.1-47.1.65'
 
     annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
-    compileOnly fg.deobf("mezz.jei:jei-1.18.2-common-api:10.2.1.283")
-    compileOnly fg.deobf("mezz.jei:jei-1.18.2-forge-api:10.2.1.283")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.18.2-forge:10.2.1.283")
-    implementation "curse.maven:citadel-331936:3783098"
+    // compile against the JEI API but do not include it at runtime
+    compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
+    // at runtime, use the full JEI jar
+    runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+    //compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.2.0.25")
+    //compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.2.0.25")
+    //runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge-15.2.0.25")
+    implementation fg.deobf("curse.maven:citadel-331936:4744075")
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
+    duplicatesStrategy(DuplicatesStrategy.INCLUDE)
     manifest {
         attributes([
                 "Specification-Title": "iceandfire",

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,7 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+
+mc_version=1.20.1
+jei_version=15.2.0.25
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'NeoForged'
+            url = 'https://maven.neoforged.net/releases'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/src/generated/resources/assets/minecraft/atlases/chests.json b/src/generated/resources/assets/minecraft/atlases/chests.json
@@ -0,0 +1,16 @@
+{
+  "sources": [
+    {
+      "type": "minecraft:single",
+      "resource": "iceandfire:models/ghost/ghost_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "iceandfire:models/ghost/ghost_chest_left"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "iceandfire:models/ghost/ghost_chest_right"
+    }
+  ]
+}
diff --git a/src/generated/resources/data/iceandfire/forge/biome_modifier/iaf_features.json b/src/generated/resources/data/iceandfire/forge/biome_modifier/iaf_features.json
@@ -0,0 +1,30 @@
+{
+  "type": "iceandfire:iaf_features",
+  "features": [
+    "iceandfire:fire_dragon_roost",
+    "iceandfire:ice_dragon_roost",
+    "iceandfire:lightning_dragon_roost",
+    "iceandfire:fire_dragon_cave",
+    "iceandfire:ice_dragon_cave",
+    "iceandfire:lightning_dragon_cave",
+    "iceandfire:cyclops_cave",
+    "iceandfire:pixie_village",
+    "iceandfire:siren_island",
+    "iceandfire:hydra_cave",
+    "iceandfire:myrmex_hive_desert",
+    "iceandfire:myrmex_hive_jungle",
+    "iceandfire:spawn_death_worm",
+    "iceandfire:spawn_dragon_skeleton_lightning",
+    "iceandfire:spawn_dragon_skeleton_fire",
+    "iceandfire:spawn_dragon_skeleton_ice",
+    "iceandfire:spawn_hippocampus",
+    "iceandfire:spawn_sea_serpent",
+    "iceandfire:spawn_stymphalian_bird",
+    "iceandfire:spawn_wandering_cyclops",
+    "iceandfire:silver_ore",
+    "iceandfire:sapphire_ore",
+    "iceandfire:fire_lily",
+    "iceandfire:frost_lily",
+    "iceandfire:lightning_lily"
+  ]
+}
diff --git a/src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/amphithere.json b/src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/amphithere.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "iceandfire:amphithere"
+  ]
+}
diff --git a/src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/bird.json b/src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/bird.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "iceandfire:bird"
+  ]
+}