From 1ac13b520d315d5fd7edc7bd93dc85e018e90101 Mon Sep 17 00:00:00 2001 From: Hexeption Date: Wed, 19 Jun 2024 07:23:29 +0100 Subject: [PATCH] Updated to NeoForge 1.21 --- build.gradle | 14 +++++++------- gradle.properties | 10 +++++----- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 10 +++++----- .../recipes/misc/dimension_card.json | 0 .../recipes/misc/infinity_card.json | 0 .../{recipes => recipe}/dimension_card.json | 0 .../{recipes => recipe}/infinity_card.json | 0 .../datagen/RecipeGenerator.java | 4 ++-- src/main/resources/META-INF/neoforge.mods.toml | 2 +- .../textures/item/dimension_card.png | Bin 286 -> 439 bytes .../textures/item/infinity_card.png | Bin 278 -> 437 bytes 11 files changed, 20 insertions(+), 20 deletions(-) rename src/generated/resources/data/aeinfinitybooster/{advancements => advancement}/recipes/misc/dimension_card.json (100%) rename src/generated/resources/data/aeinfinitybooster/{advancements => advancement}/recipes/misc/infinity_card.json (100%) rename src/generated/resources/data/aeinfinitybooster/{recipes => recipe}/dimension_card.json (100%) rename src/generated/resources/data/aeinfinitybooster/{recipes => recipe}/infinity_card.json (100%) diff --git a/build.gradle b/build.gradle index b26bbb5..6ff1ff7 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { def env = System.getenv() if (env.GITHUB_RUN_NUMBER) { - mod_version = '1.20.6-1.0.1' + "." + "${env.GITHUB_RUN_NUMBER}" + mod_version = '1.21-1.0.1' + "." + "${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.21-neoforge:19.0.0.5" + compileOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha" + runtimeOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha" } tasks.withType(ProcessResources).configureEach { @@ -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.21'] 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.21"] loaders = ["neoforge"] dependencies { - required.version "ae2", "18.1.3-alpha" + required.version "ae2", "19.0.4-alpha" } } diff --git a/gradle.properties b/gradle.properties index 1b90078..26685ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ org.gradle.daemon=false neogradle.subsystems.parchment.minecraftVersion=1.20.6 neogradle.subsystems.parchment.mappingsVersion=2024.05.01 -minecraft_version=1.20.6 -minecraft_version_range=[1.20.6,1.21) +minecraft_version=1.21 +minecraft_version_range=[1.21,1.21.1) -neo_version=20.6.112-beta -neo_version_range=[20.6,) +neo_version=21.0.18-beta +neo_version_range=[21.0.0-beta,) -loader_version_range=[2,) +loader_version_range=[4,) ## Mod Properties mod_id=aeinfinitybooster diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 877bd70..8cfec44 100644 --- 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.21 2024-06-19T07:19:19.880141 Recipes +999f2de23df4045d930cc5c6f13e5e99cdbe8f1b data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json +67dfca204b213514d07f518b8ed53de18ad64a64 data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json +a8aaa987085afbbd29c17987057086df95515aa0 data/aeinfinitybooster/recipe/dimension_card.json +24e3b977ab090b5add6378dfb8625a4cd8b10f39 data/aeinfinitybooster/recipe/infinity_card.json diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json similarity index 100% rename from src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json rename to src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json similarity index 100% rename from src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json rename to src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/recipe/dimension_card.json similarity index 100% rename from src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json rename to src/generated/resources/data/aeinfinitybooster/recipe/dimension_card.json diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/recipe/infinity_card.json similarity index 100% rename from src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json rename to src/generated/resources/data/aeinfinitybooster/recipe/infinity_card.json diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java index d2ddc92..095c9e5 100644 --- a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java +++ b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java @@ -36,14 +36,14 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) { .define('S', Items.NETHER_STAR) .define('N', Items.NETHERITE_INGOT) .unlockedBy("has_item", has(Items.NETHERITE_INGOT)) - .save(pRecipeOutput, new ResourceLocation(AEInfinityBooster.MODID, "infinity_card")); + .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(AEInfinityBooster.MODID, "infinity_card")); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.DIMENSION_CARD.get()) .pattern("RNR").pattern("NEN").pattern("RNR") .define('R', ModItems.INFINITY_CARD.get()) .define('E', Items.ENDER_EYE) .define('N', Items.NETHER_STAR) .unlockedBy("has_item", has(ModItems.INFINITY_CARD.get())) - .save(pRecipeOutput, new ResourceLocation(AEInfinityBooster.MODID, "dimension_card")); + .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(AEInfinityBooster.MODID, "dimension_card")); } } diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 34ea87f..b905ed1 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -34,6 +34,6 @@ config="AEInfinityBooster.mixins.json" [[dependencies.${mod_id}]] modId="ae2" type="required" -versionRange="[18.1.3-alpha,)" +versionRange="[19.0.4-alpha,)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png b/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png index 139336d105e0979720a1a8074012470b86e30506..2cc8874d1c658ca1e62d39f28f16c9ae1bed0cf8 100644 GIT binary patch delta 424 zcmV;Z0ayN>0=EN@8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00D7HL_t(Ijir)1O9N35 zg})V1_bTKe24mr~FhPskVK&0Z~cdqZglkm7XZ9w!o*h6{Cs}Vd^7nzy1`wWVQM8!W#i!g1+$Oe z@ObwpKNP{tm3TS6SLXUUf$h7C6HSbrB#r$Hw$;F_8=iv0U1eS|aV!>ZEiJE8d#@sf zNB-EY2H<&M7=NZ>qM|?-LMnJp_G4_%OE5q<6v44=MSY75@^$&C*G+hWSoFRw-(9Z3?>$;tg-r^S{o(*ADJl853=|X;@vsax zH#d)L8Ba?~9v&V%IXOi{L??7qJ+p#3t$j0=Z4opjB4tT9r+GcLgf^dZErehoU`05k zcP@xxAYVn(=jc4LfGdDpA!A1SyFF0b^AWR2t5s7+S+cA@oKB;626K z@D3^SA}wh&R_o1nw;v6k4tz`}3TJ7Mi~e%B-YA~WqeDb7P^qO8WBXA$!t|F1U4;cv URdZ0h00000Ne4wvM6N<$g830+_y7O^ diff --git a/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png b/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png index 166c4e9980d7435b5ec9ee7910b822130ee90527..c19812932604fb4981387a2feca5ae8cd7f8d612 100644 GIT binary patch delta 422 zcmV;X0a^Z*0<{B>8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00D1FL_t(Ijir)7OM*cV zhM%vp`c@+~3MG&t0xP^kUAk3t>=Zp&w8`q;qtLxH6jEj1Ayf4 zE&y-e$L|D46t>BE@_#p|=^ngWM18)~j)#ZHzGiUyaYcq5a|0zMw%vntiad@U{3IOk z_nH~Fc3=yk8Gl4mtBgOaBb}no`+EZ@DVs~EPu6yT^IN3bj7t<=pKG%4`t&_a{lJ)?5rzg5L77kg)2DT7Y<{K-NlUcf=VamxY!LxG!4lge> z*d)PHQdR&uC;F)O>ZrP(rP+Dc(1xFA3t`zpSpMh$03S79doPtrzag#J7sTC#)xii_ QSpWb407*qoM6N<$g5tly!2kdN delta 261 zcmV+g0s8*61C|1i8Gi!+001a04^sdD09Q~{o(*ADJl853=|X;@vsax zH#d)L8Ba?~9v&V%IXOi{L~$yuOB;DtAc<%wqj@a1WG0J55>e)%-{-#Oq5SSNd%~PAb