Downgrade to NeoForge 1.20.4

Hexeption · Jun 14, 2024 · 31a280b · 31a280b
1 parent be9a63e
commit 31a280b
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
-    mod_version = 'neoforge-1.20.6-1.0.0' + "+" + "${env.GITHUB_RUN_NUMBER}"
+    mod_version = 'neoforge-1.20.4-1.0.0' + "+" + "${env.GITHUB_RUN_NUMBER}"
 }
 
 version = mod_version
@@ -78,9 +78,9 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    runtimeOnly "mezz.jei:jei-1.20.6-neoforge:18.0.0.62"
-    compileOnly "appeng:appliedenergistics2-neoforge:18.1.3-alpha"
-    runtimeOnly "appeng:appliedenergistics2-neoforge:18.1.3-alpha"
+    runtimeOnly "mezz.jei:jei-1.20.4-neoforge:17.3.0.1"
+    compileOnly "appeng:appliedenergistics2-neoforge:17.13.0-beta"
+    runtimeOnly "appeng:appliedenergistics2-neoforge:17.13.0-beta"
 }
 
 tasks.withType(ProcessResources).configureEach {
@@ -99,7 +99,7 @@ tasks.withType(ProcessResources).configureEach {
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/neoforge.mods.toml']) {
+    filesMatching(['META-INF/mods.toml']) {
         expand replaceProperties
     }
 }
@@ -126,7 +126,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     mainFile.releaseType = 'release'
     mainFile.changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     mainFile.changelogType = 'markdown'
-    mainFile.gameVersions = ['1.20.6']
+    mainFile.gameVersions = ['1.20.4']
     mainFile.addModLoader("neoforge")
     mainFile.displayName = "AEInfinityBooster ${version}"
 
@@ -139,9 +139,9 @@ modrinth {
     versionName = "AEInfinityBooster $version"
     changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     uploadFile = jar
-    gameVersions = ["1.20.6"]
+    gameVersions = ["1.20.4"]
     loaders = ["neoforge"]
     dependencies {
-        required.version "ae2", "18.1.3-alpha"
+        required.version "ae2", "17.13.0-beta"
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.05.01
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.02.25
 
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6,1.21)
+minecraft_version=1.20.4
+minecraft_version_range=[1.20.4,1.20.5)
 
-neo_version=20.6.112-beta
-neo_version_range=[20.6,)
+neo_version=20.4.214
+neo_version_range=[20.4,)
 
 loader_version_range=[2,)
 

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,5 +1,5 @@
-// 1.20.6	2024-06-14T07:38:03.303348	Recipes
-999f2de23df4045d930cc5c6f13e5e99cdbe8f1b data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
-67dfca204b213514d07f518b8ed53de18ad64a64 data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
-a8aaa987085afbbd29c17987057086df95515aa0 data/aeinfinitybooster/recipes/dimension_card.json
-24e3b977ab090b5add6378dfb8625a4cd8b10f39 data/aeinfinitybooster/recipes/infinity_card.json
+// 1.20.4	2024-06-14T10:02:08.947973	Recipes
+a413f33416f5552e33e24a1216f40781f0a06eff data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
+df2d07a1999c9f41bc232af74485e983cb9a9114 data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
+27c7a523b96cd6b17473d2201aa8263623a0e239 data/aeinfinitybooster/recipes/dimension_card.json
+608d99b1d35fb629b78a831e8a7128a33decf736 data/aeinfinitybooster/recipes/infinity_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
@@ -5,7 +5,9 @@
       "conditions": {
         "items": [
           {
-            "items": "aeinfinitybooster:infinity_card"
+            "items": [
+              "aeinfinitybooster:infinity_card"
+            ]
           }
         ]
       },

diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
@@ -5,7 +5,9 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:netherite_ingot"
+            "items": [
+              "minecraft:netherite_ingot"
+            ]
           }
         ]
       },

diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json
@@ -18,7 +18,6 @@
     "RNR"
   ],
   "result": {
-    "count": 1,
-    "id": "aeinfinitybooster:dimension_card"
+    "item": "aeinfinitybooster:dimension_card"
   }
 }
diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json
@@ -21,7 +21,6 @@
     "NNN"
   ],
   "result": {
-    "count": 1,
-    "id": "aeinfinitybooster:infinity_card"
+    "item": "aeinfinitybooster:infinity_card"
   }
 }
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/DataGenerators.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/DataGenerators.java
@@ -3,7 +3,7 @@
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DataProvider;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import uk.co.hexeption.aeinfinitybooster.AEInfinityBooster;
 
@@ -13,7 +13,7 @@
  * @author Hexeption [email protected]
  * @since 14/02/2021 - 06:48 pm
  */
-@EventBusSubscriber(modid = AEInfinityBooster.MODID, bus = EventBusSubscriber.Bus.MOD)
+@Mod.EventBusSubscriber(modid = AEInfinityBooster.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public final class DataGenerators {
 
     private DataGenerators() {
@@ -23,6 +23,6 @@ private DataGenerators() {
     public static void onGatherData(GatherDataEvent event) {
         DataGenerator generator = event.getGenerator();
 
-        generator.addProvider(true, (DataProvider.Factory<RecipeGenerator>) p_253851_ -> new RecipeGenerator(generator.getPackOutput(), event.getLookupProvider()));
+        generator.addProvider(true, (DataProvider.Factory<RecipeGenerator>) p_253851_ -> new RecipeGenerator(generator.getPackOutput()));
     }
 }
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java
@@ -23,8 +23,9 @@
  */
 public class RecipeGenerator extends RecipeProvider {
 
-    public RecipeGenerator(PackOutput pOutput, CompletableFuture<HolderLookup.Provider> pRegistries) {
-        super(pOutput, pRegistries);
+    public RecipeGenerator(PackOutput pOutput) {
+
+        super(pOutput);
     }
 
     @Override

diff --git a/...ain/resources/META-INF/neoforge.mods.toml → src/main/resources/META-INF/mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → src/main/resources/META-INF/mods.toml
@@ -34,6 +34,6 @@ config="AEInfinityBooster.mixins.json"
 [[dependencies.${mod_id}]]
 modId="ae2"
 type="required"
-versionRange="[18.1.3-alpha,)"
+versionRange="[17.13.0-beta,)"
 ordering="AFTER"
 side="BOTH"