Initial port to 1.21

Author: pupnewfster

.github/ISSUE_TEMPLATE/general_issue.yml

@@ -25,7 +25,7 @@ body:
       description: What version of Minecraft are you using?
       options:
         - 1.20.4 (Latest)
-        - 1.20.6 (Dev Branch, Manually Compiled)
+        - 1.21 (Dev Branch, Manually Compiled)
         - 1.20.1 or earlier (No longer being developed)
     validations:
       required: true

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "1.20.6" ]
+    branches: [ "1.21.x" ]
   pull_request:
-    branches: [ "1.20.6" ]
+    branches: [ "1.21.x" ]
     types:
       - synchronize
       - opened

.github/workflows/gametests.yml

@@ -2,9 +2,9 @@ name: "Run Game Tests"
 
 on:
   push:
-    branches: [ "1.20.6" ]
+    branches: [ "1.21.x" ]
   pull_request:
-    branches: [ "1.20.6" ]
+    branches: [ "1.21.x" ]
     types:
       - synchronize
       - opened

build.gradle

@@ -358,6 +358,15 @@ repositories { RepositoryHandler handler ->
     exclusiveRepo(handler, 'https://maven.minecraftforge.net/releases/', 'com.github.glitchfiend')
     exclusiveRepo(handler, 'https://maven.thiakil.com', 'com.thiakil', 'moze_intel')
     exclusiveRepo(handler, 'https://maven.parchmentmc.org/', 'org.parchmentmc.data')
+
+    maven {
+        name 'Maven for PR #1076' // https://github.com/neoforged/NeoForge/pull/1076
+        url 'https://prmaven.neoforged.net/NeoForge/pr1076'
+        content {
+            includeModule('net.neoforged', 'testframework')
+            includeModule('net.neoforged', 'neoforge')
+        }
+    }
 }
 
 tasks.named('test').configure {
@@ -380,24 +389,25 @@ dependencies {
     //We use https://github.com/jqwik-team/jqwik to allow for implementing property based testing
     testImplementation("net.jqwik:jqwik:${jqwik_version}")
 
-    compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-common-api:${jei_version}")
-    compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge-api:${jei_version}")
+    compileOnly("mezz.jei:jei-${previous_minecraft_version}-common-api:${jei_version}")
+    compileOnly("mezz.jei:jei-${previous_minecraft_version}-neoforge-api:${jei_version}")
     if (recipe_viewer == 'jei' || recipe_viewer == 'hybrid') {
         //TODO: Re-enable when JEI updates
         //localRuntime("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge:${jei_version}")
     }
 
-    compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
-    def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
+    compileOnly("dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}:api")
+    def emi = "dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}"
     //TODO: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
     //Compile against full emi in datagen
     datagenMainCompileOnly(emi)
-    if (recipe_viewer == 'emi' || recipe_viewer == 'hybrid') {
+    //TODO: Re-enable when EMI updates
+    /*if (recipe_viewer == 'emi' || recipe_viewer == 'hybrid') {
         localRuntime(emi)
     } else {
         //We still need it to load in datagen regardless of if we are using emi or a different viewer so that we can access EMI related objects
         datagenMainRuntimeOnly(emi)
-    }
+    }*/
 
     //TODO: Re-enable once an update is released for the current MC version
     //localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
@@ -411,18 +421,20 @@ dependencies {
         transitive = false
     }*/
     compileOnly("curse.maven:jade-api-324717:${jade_api_id}")
-    localRuntime("curse.maven:jade-324717:${jade_id}")
+    //TODO: Re-enable when Jade updates
+    //localRuntime("curse.maven:jade-324717:${jade_id}")
     compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
 
-    def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${minecraft_version}:${crafttweaker_version}"
+    def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
     compileOnly(crt)
-    localRuntime(crt)
-    def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-${previous_minecraft_version}:${jeitweaker_version}"
+    //TODO: Re-enable when CrT updates
+    //localRuntime(crt)
+    def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-1.20.1:${jeitweaker_version}"
     compileOnly(jeiTweaker)
     //TODO: Re-enable when it updates
     //localRuntime(jeiTweaker)
 
-    compileOnly("dev.gigaherz.jsonthings:JsonThings-${previous_minor_minecraft_version}:${json_things_version}")
+    compileOnly("dev.gigaherz.jsonthings:JsonThings-${previous_minecraft_version}:${json_things_version}")
 
     //Mods we have dependencies on but don't bother loading into the dev environment
     //compileOnly("curse.maven:projecte-api-226410:${projecte_api_id}")
@@ -431,15 +443,17 @@ dependencies {
     compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}:api")
     compileOnly("com.blamejared.recipestages:RecipeStages:${recipe_stages_version}")
     compileOnly("curse.maven:opencomputers2-437654:${oc2_id}")
-    compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cc_tweaked_version}")
+    compileOnly("cc.tweaked:cc-tweaked-${previous_minor_minecraft_version}-forge-api:${cc_tweaked_version}")
     //localRuntime("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_tweaked_version}")
     compileOnly("curse.maven:female-gender-forge-481655:${wildfire_gender_mod_id}")
 
     //Dependencies for data generators for mod compat reference
-    datagenMainImplementation("appeng:appliedenergistics2-neoforge:${ae2_version}")
-    datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${minecraft_version}-${glitchcore_version}")
-    datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}")
-    datagenMainImplementation("com.github.glitchfiend:BiomesOPlenty-neoforge:${minecraft_version}-${biomesoplenty_version}")
+    //TODO: Switch back to datagenMainImplementation when it updated
+    datagenMainCompileOnly("appeng:appliedenergistics2-neoforge:${ae2_version}")
+    //datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${previous_minor_minecraft_version}-${glitchcore_version}")
+    //datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${previous_minor_minecraft_version}-${terrablender_version}")
+    //TODO: Switch back to datagenMainImplementation when it updated
+    datagenMainCompileOnly("com.github.glitchfiend:BiomesOPlenty-neoforge:${previous_minor_minecraft_version}-${biomesoplenty_version}")
     //TODO - 1.20.2: Switch back to datagenMainImplementation
     datagenMainCompileOnly("curse.maven:farmers-delight-398521:${farmers_delight_id}")
     //TODO - 1.20.2: Re-enable after projecte is updated

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx4G
 #org.gradle.configuration-cache=true
 
 java_version=21
-minecraft_version=1.20.6
+minecraft_version=1.21
 #Used as a helper for porting when deps we use have not updated yet
-previous_minecraft_version=1.20.1
-previous_minor_minecraft_version=1.20.4
-loader_version_range=[3,)
-forge_version=20.6.115
+previous_minecraft_version=1.20.4
+previous_minor_minecraft_version=1.20.6
+loader_version_range=[4,)
+forge_version=21.0.0-alpha.1.21-rc1.20240612.183440
 mod_version=10.5.20
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
 forge_version_range=[20.6.113-beta,)
-minecraft_version_range=[1.20.6]
+minecraft_version_range=[1.21-rc1]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
 release_type=beta

src/additions/java/mekanism/additions/client/render/entity/RenderBabyCreeper.java

@@ -15,7 +15,7 @@
  */
 public class RenderBabyCreeper extends MobRenderer<EntityBabyCreeper, ModelBabyCreeper> {
 
-    private static final ResourceLocation CREEPER_TEXTURES = new ResourceLocation("textures/entity/creeper/creeper.png");
+    private static final ResourceLocation CREEPER_TEXTURES = ResourceLocation.withDefaultNamespace("textures/entity/creeper/creeper.png");
 
     public RenderBabyCreeper(EntityRendererProvider.Context context) {
         super(context, new ModelBabyCreeper(context.getModelSet().bakeLayer(ModelBabyCreeper.CREEPER_LAYER)), 0.5F);

src/additions/java/mekanism/additions/client/render/entity/RenderBabyEnderman.java

@@ -20,7 +20,7 @@
  */
 public class RenderBabyEnderman extends MobRenderer<EntityBabyEnderman, ModelBabyEnderman> {
 
-    private static final ResourceLocation ENDERMAN_TEXTURES = new ResourceLocation("textures/entity/enderman/enderman.png");
+    private static final ResourceLocation ENDERMAN_TEXTURES = ResourceLocation.withDefaultNamespace("textures/entity/enderman/enderman.png");
     private final RandomSource random = RandomSource.create();
 
     public RenderBabyEnderman(EntityRendererProvider.Context context) {

src/additions/java/mekanism/additions/client/render/entity/layer/BabyCreeperChargeLayer.java

@@ -11,7 +11,7 @@
 
 public class BabyCreeperChargeLayer extends EnergySwirlLayer<EntityBabyCreeper, ModelBabyCreeper> {
 
-    private static final ResourceLocation POWER_LOCATION = new ResourceLocation("textures/entity/creeper/creeper_armor.png");
+    private static final ResourceLocation POWER_LOCATION = ResourceLocation.withDefaultNamespace("textures/entity/creeper/creeper_armor.png");
     private final ModelBabyCreeper creeperModel;
 
     public BabyCreeperChargeLayer(RenderLayerParent<EntityBabyCreeper, ModelBabyCreeper> renderer, EntityModelSet entityModelSet) {

src/additions/java/mekanism/additions/client/render/entity/layer/BabyEndermanEyesLayer.java

@@ -10,7 +10,7 @@
 
 public class BabyEndermanEyesLayer extends EyesLayer<EntityBabyEnderman, ModelBabyEnderman> {
 
-    private static final RenderType RENDER_TYPE = RenderType.eyes(new ResourceLocation("textures/entity/enderman/enderman_eyes.png"));
+    private static final RenderType RENDER_TYPE = RenderType.eyes(ResourceLocation.withDefaultNamespace("textures/entity/enderman/enderman_eyes.png"));
 
     public BabyEndermanEyesLayer(RenderLayerParent<EntityBabyEnderman, ModelBabyEnderman> renderer) {
         super(renderer);

src/additions/java/mekanism/additions/common/AdditionsTags.java

@@ -42,7 +42,7 @@ private Items() {
         public static final TagKey<Item> PLASTIC_BLOCKS_TRANSPARENT = tag("plastic_blocks/transparent");
 
         private static TagKey<Item> commonTag(String name) {
-            return ItemTags.create(new ResourceLocation("c", name));
+            return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", name));
         }
 
         private static TagKey<Item> tag(String name) {
@@ -75,7 +75,7 @@ private Blocks() {
         public static final TagKey<Block> PLASTIC_BLOCKS_TRANSPARENT = tag("plastic_blocks/transparent");
 
         private static TagKey<Block> commonTag(String name) {
-            return BlockTags.create(new ResourceLocation("c", name));
+            return BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", name));
         }
 
         private static TagKey<Block> tag(String name) {
@@ -104,7 +104,7 @@ private Entities() {
         public static final TagKey<EntityType<?>> ENDERMEN = commonTag("endermen");
 
         private static TagKey<EntityType<?>> commonTag(String name) {
-            return TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("c", name));
+            return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("c", name));
         }
     }
 }