update: 1.20.1

The-Aether-Team · Sep 23, 2023 · 338eb21 · 338eb21
1 parent b802d58
commit 338eb21
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 76 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.neoforged.gradle' version '[6.0.13, 6.2)'
     id 'org.spongepowered.mixin' version '[0.7,0.8)'
     id 'org.parchmentmc.librarian.forgegradle' version '[1,2)'
     id 'org.moddingx.modgradle.mapping' version '[4,5)'
@@ -11,7 +11,7 @@ plugins {
     id 'com.modrinth.minotaur' version '[2,3)'
 }
 
-version = "${mc_version}-${mod_version}-forge"
+version = "${mc_version}-${mod_version}-neoforge"
 group = 'com.aetherteam.emissivity' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 
 base {
@@ -69,7 +69,7 @@ sourceSets.main.resources {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
+    minecraft "net.neoforged:forge:${project.mc_version}-${project.neoforge_version}"
 
     implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:0.2.0-beta.9"))
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
@@ -79,7 +79,7 @@ dependencies {
 
     implementation fg.deobf("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}")
     implementation fg.deobf("com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}")
-    implementation fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}")
+    implementation fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}+${project.mc_version}")
 }
 
 repositories {
@@ -113,57 +113,57 @@ compileJava {
     options.incremental = false
 }
 
-//publishing {
-//    publications {
-//        mavenJava(MavenPublication) {
-//            artifactId project.archivesBaseName
-//            artifact jar
-//            artifact sourceJar
-//        }
-//    }
-//    repositories {
-//        maven {
-//            name = "GitHubPackages"
-//            url = "https://maven.pkg.github.com/The-Aether-Team/Emissivity"
-//            credentials {
-//                username = System.getenv("GITHUB_ACTOR")
-//                password = System.getenv("GITHUB_TOKEN")
-//            }
-//        }
-//    }
-//}
-//
-//curseforge {
-//    project {
-//        apiKey = System.getenv("CURSEFORGE_TOKEN")
-//        id = "${project.curseforge_id}"
-//        releaseType = "${project.version_type}"
-//        changelog = file("$rootDir/docs/CHANGELOG.md")
-//        changelogType = "markdown"
-//        addGameVersion("${project.mc_version}")
-//        mainArtifact(tasks.jar) {
-//            displayName = "${project.mod_name} - ${version}"
-//            relations {
-//                requiredDependency "aether"
-//            }
-//        }
-//    }
-//}
-//
-//modrinth {
-//    token = System.getenv("MODRINTH_TOKEN")
-//    projectId = "${project.modrinth_id}"
-//    versionNumber = "${version}"
-//    versionType = "${project.version_type}"
-//    versionName = "${project.mod_name} - ${version}"
-//    changelog = new File("$rootDir/docs/CHANGELOG.md").text
-//    uploadFile = tasks.jar
-//    gameVersions = ["${project.mc_version}"]
-//    loaders = ["forge"]
-//    dependencies {
-//        required.version "aether", "${project.aether_version}"
-//    }
-//}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId project.archivesBaseName
+            artifact jar
+            artifact sourceJar
+        }
+    }
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/The-Aether-Team/Emissivity"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
+
+curseforge {
+    project {
+        apiKey = System.getenv("CURSEFORGE_TOKEN")
+        id = "${project.curseforge_id}"
+        releaseType = "${project.version_type}"
+        changelog = file("$rootDir/docs/CHANGELOG.md")
+        changelogType = "markdown"
+        addGameVersion("${project.mc_version}")
+        mainArtifact(tasks.jar) {
+            displayName = "${project.mod_name} - ${version}"
+            relations {
+                requiredDependency "aether"
+            }
+        }
+    }
+}
+
+modrinth {
+    token = System.getenv("MODRINTH_TOKEN")
+    projectId = "${project.modrinth_id}"
+    versionNumber = "${version}"
+    versionType = "${project.version_type}"
+    versionName = "${project.mod_name} - ${version}"
+    changelog = new File("$rootDir/docs/CHANGELOG.md").text
+    uploadFile = tasks.jar
+    gameVersions = ["${project.mc_version}"]
+    loaders = ["forge", "neoforge"]
+    dependencies {
+        required.version "aether", "${project.aether_version}"
+    }
+}
 
 mixin {
     config "${project.mod_id}.mixins.json"

diff --git a/gradle.properties b/gradle.properties
@@ -7,15 +7,15 @@ org.gradle.daemon=false
 mod_id=aether_emissivity
 mod_name=Emissivity
 mod_version=1.0.0
-mc_version=1.19.4
-forge_version=45.1.0
-mappings=2023.06.26-1.19.4
+mc_version=1.20.1
+neoforge_version=47.1.70
+mappings=2023.08.20-1.20.1
 
 # Dependencies
-aether_version=1.19.4-1.0.0-beta.6.2-forge
-nitrogen_version=1.19.4-0.9.1-forge
-cumulus_version=1.19.4-0.3.3-forge
-curios_version=1.19.4-5.1.5.3
+aether_version=1.20.1-1.0.0-beta.1.2-neoforge
+nitrogen_version=1.20.1-0.1.3-neoforge
+cumulus_version=1.20.1-0.1.4-neoforge
+curios_version=5.3.1
 mixinextras_version=0.2.0-beta.9
 
 # Publishing

diff --git a/settings.gradle b/settings.gradle
@@ -11,7 +11,7 @@ pluginManagement {
     }
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
+        maven { url = 'https://maven.neoforged.net/releases/' }
         maven { url = 'https://repo.spongepowered.org/maven' }
         maven { url = 'https://maven.parchmentmc.org' }
         maven { url = 'https://maven.moddingx.org' }

diff --git a/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/GlovesRendererMixin.java b/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/GlovesRendererMixin.java
@@ -23,8 +23,8 @@
 
 @Mixin(GlovesRenderer.class)
 public class GlovesRendererMixin<T extends LivingEntity, M extends HumanoidModel<T>, A extends HumanoidModel<T>> {
-    @Inject(method = "render(Lnet/minecraft/world/item/ItemStack;Ltop/theillusivec4/curios/api/SlotContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/MultiBufferSource;IFFFFFF)V", at = @At(value = "INVOKE", target = "Lcom/aetherteam/aether/client/renderer/accessory/model/GlovesModel;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V"), cancellable = true)
-    private void render(ItemStack stack, SlotContext slotContext, PoseStack poseStack, RenderLayerParent<T, M> renderLayerParent, MultiBufferSource buffer, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci, @Local GlovesModel model, @Local VertexConsumer vertexConsumer) {
+    @Inject(method = "render(Lnet/minecraft/world/item/ItemStack;Ltop/theillusivec4/curios/api/SlotContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/MultiBufferSource;IFFFFFF)V", at = @At(value = "INVOKE", target = "Lcom/aetherteam/aether/client/renderer/accessory/model/GlovesModel;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V", ordinal = 0), cancellable = true)
+    private void render(ItemStack stack, SlotContext slotContext, PoseStack poseStack, RenderLayerParent<T, M> renderLayerParent, MultiBufferSource buffer, int packedLight, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci, @Local(ordinal = 0) GlovesModel model, @Local VertexConsumer vertexConsumer) {
         if (stack.is(AetherItems.PHOENIX_GLOVES.get()) && EmissivityConfig.CLIENT.emissive_phoenix_armor.get()) {
             model.renderToBuffer(poseStack, vertexConsumer, LightTexture.pack(15, 15), OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
             ci.cancel();

diff --git a/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/HumanoidArmorLayerMixin.java b/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/HumanoidArmorLayerMixin.java
@@ -11,15 +11,16 @@
 import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ArmorItem;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(HumanoidArmorLayer.class)
 public class HumanoidArmorLayerMixin {
-    @Inject(method = "renderModel(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IZLnet/minecraft/client/model/Model;FFFLnet/minecraft/resources/ResourceLocation;)V", at = @At("HEAD"), cancellable = true, remap = false)
-    private void renderModel(PoseStack poseStack, MultiBufferSource buffer, int packedLight, boolean withGlint, Model model, float red, float green, float blue, ResourceLocation armorResource, CallbackInfo ci) {
+    @Inject(method = "renderModel(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/ArmorItem;Lnet/minecraft/client/model/Model;ZFFFLnet/minecraft/resources/ResourceLocation;)V", at = @At("HEAD"), cancellable = true, remap = false)
+    private void renderModel(PoseStack poseStack, MultiBufferSource buffer, int packedLight, ArmorItem armorItem, Model model, boolean withGlint, float red, float green, float blue, ResourceLocation armorResource, CallbackInfo ci) {
         if (armorResource.toString().contains("phoenix_layer") && EmissivityConfig.CLIENT.emissive_phoenix_armor.get()) {
             VertexConsumer vertexconsumer = ItemRenderer.getArmorFoilBuffer(buffer, RenderType.armorCutoutNoCull(armorResource), false, withGlint);
             model.renderToBuffer(poseStack, vertexconsumer, LightTexture.pack(15, 15), OverlayTexture.NO_OVERLAY, red, green, blue, 1.0F);

diff --git a/...in/java/com/aetherteam/emissivity/mixin/mixins/client/ShieldOfRepulsionRendererMixin.java b/...in/java/com/aetherteam/emissivity/mixin/mixins/client/ShieldOfRepulsionRendererMixin.java
@@ -17,6 +17,7 @@
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -46,8 +47,8 @@ public class ShieldOfRepulsionRendererMixin<T extends LivingEntity, M extends En
     @Unique
     private static final ResourceLocation SHIELD_OF_REPULSION_SLIM_INACTIVE_OVERLAY = new ResourceLocation(Emissivity.MODID, "textures/models/accessory/shield_of_repulsion/shield_of_repulsion_slim_inactive_accessory_overlay.png");
 
-    @Inject(method = "lambda$render$0(Ltop/theillusivec4/curios/api/SlotResult;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/client/renderer/entity/RenderLayerParent;Ltop/theillusivec4/curios/api/SlotContext;Lnet/minecraft/client/renderer/MultiBufferSource;Lcom/mojang/blaze3d/vertex/PoseStack;ILtop/theillusivec4/curios/api/type/inventory/ICurioStacksHandler;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/HumanoidModel;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V"), cancellable = true)
-    private void render(SlotResult slotResult, LivingEntity livingEntity, RenderLayerParent<T, M> renderLayerParent, SlotContext slotContext, MultiBufferSource buffer, PoseStack poseStack, int light, ICurioStacksHandler stacksHandler, CallbackInfo ci, @Local ShieldOfRepulsionItem shield, @Local ResourceLocation texture, @Local HumanoidModel<T> model) {
+    @Inject(method = "render(Lnet/minecraft/world/item/ItemStack;Ltop/theillusivec4/curios/api/SlotContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/MultiBufferSource;IFFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/HumanoidModel;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V"), cancellable = true)
+    private void render(ItemStack stack, SlotContext slotContext, PoseStack poseStack, RenderLayerParent<T, M> renderLayerParent, MultiBufferSource buffer, int combinedLight, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci, @Local ShieldOfRepulsionItem shield, @Local ResourceLocation texture, @Local HumanoidModel<T> model) {
         if (EmissivityConfig.CLIENT.emissive_shield_of_repulsion.get()) {
             ResourceLocation baseTexture = null;
             ResourceLocation overlayTexture = null;
@@ -66,7 +67,7 @@ private void render(SlotResult slotResult, LivingEntity livingEntity, RenderLaye
             }
             if (baseTexture != null) {
                 VertexConsumer baseConsumer = ItemRenderer.getArmorFoilBuffer(buffer, RenderType.entityTranslucent(baseTexture), false, false);
-                model.renderToBuffer(poseStack, baseConsumer, light, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
+                model.renderToBuffer(poseStack, baseConsumer, combinedLight, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
                 VertexConsumer overlayConsumer = ItemRenderer.getArmorFoilBuffer(buffer, RenderType.entityTranslucent(overlayTexture), false, false);
                 model.renderToBuffer(poseStack, overlayConsumer, LightTexture.pack(15, 15), OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
                 ci.cancel();

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,13 +1,13 @@
 modLoader = "javafml"
-loaderVersion = "[45,)"
+loaderVersion = "[47,)"
 license = "Assets: All Rights Reserved; Code: LGPL-3.0"
 issueTrackerURL = "https://github.com/The-Aether-Team/Emissivity/issues"
 
 [[mods]]
 modId = "aether_emissivity"
 version = "${file.jarVersion}"
 displayName = "Emissivity"
-updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.19.4-develop/update.json"
+updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.20.1-develop/update.json"
 displayURL = "https://modrinth.com/mod/aether-emissivity"
 logoFile = "emissivity_icon.png"
 credits = "The Aether Team"
@@ -17,18 +17,18 @@ description = '''Adds various emissive textures for the Aether's content.'''
 [[dependencies.aether_emissivity]]
     modId = "forge"
     mandatory = true
-    versionRange = "[4.15.0,)"
+    versionRange = "[47.1.0,)"
     ordering = "NONE"
     side = "BOTH"
 [[dependencies.aether_emissivity]]
     modId = "aether"
     mandatory = true
-    versionRange = "[1.19.4-1.0.0-beta.5.1-forge,)"
+    versionRange = "[1.20.1-1.0.0-beta.1.2-neoforge,)"
     ordering = "NONE"
     side = "BOTH"
 [[dependencies.aether_emissivity]]
     modId = "minecraft"
     mandatory = true
-    versionRange = "[1.19.4]"
+    versionRange = "[1.20.1]"
     ordering = "NONE"
     side = "BOTH"
diff --git a/update.json b/update.json
@@ -1,6 +1,8 @@
 {
   "homepage": "https://modrinth.com/mod/aether-emissivity",
   "promos": {
-    "1.19.4-recommended": "1.19.4-1.0.0-forge"
+    "1.19.2-recommended": "1.19.2-1.0.0-forge",
+    "1.19.4-recommended": "1.19.4-1.0.0-forge",
+    "1.20.1-recommended": "1.20.1-1.0.0-neoforge"
   }
 }