update: 1.20.4

build.gradle

@@ -49,13 +49,6 @@ sourceSets.main.resources {
     srcDir 'src/generated/resources'
 }
 
-subsystems {
-    parchment {
-        minecraftVersion = project.mc_version
-        mappingsVersion = project.mappings
-    }
-}
-
 dependencies {
     implementation "net.neoforged:neoforge:${project.neoforge_version}"
 

docs/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Emissivity - NeoForge - 1.0.0-1.20.4
+
+- Port to 1.20.4
+
 # Emissivity - NeoForge - 1.0.0-1.20.2
 
 - Port to 1.20.2

docs/README.md

@@ -32,7 +32,7 @@ If you're interested in sponsoring Emissivity or The Aether Team, please [contac
 [![Modrinth Version](https://img.shields.io/modrinth/game-versions/sKHHynnb?color=00AF5C&label=latest&logo=modrinth&last=true)](https://modrinth.com/mod/aether-emissivity)
 [![CurseForge Downloads](http://cf.way2muchnoise.eu/916028.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity)
 [![CurseForge Version](http://cf.way2muchnoise.eu/versions/916028_latest.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity)
-[![CircleCI](https://circleci.com/gh/The-Aether-Team/Emissivity/tree/1.20.2-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Emissivity?branch=1.20.2-develop)
+[![CircleCI](https://circleci.com/gh/The-Aether-Team/Emissivity/tree/1.20.4-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Emissivity?branch=1.20.4-develop)
 ### Release builds
 Emissivity has stable release builds available on [Modrinth](https://modrinth.com/mod/aether-emissivity) and [CurseForge](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity).
 
@@ -97,13 +97,13 @@ dependencies {
 If you're running into bugs or other problems, feel free to open an issue on our [issue tracker](https://github.com/The-Aether-Team/Emissivity/issues). When doing so, make sure to use one of the provided templates and fill out all the requested information. Make sure to keep your issue's description clear and concise. Your issue's title should also be easy to digest, giving our developers and reporters a good idea of what's wrong without including too many details. Failure to follow any of the above may result in your issue being closed.
 
 ## :wrench: Contribute to the project
-Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/docs/AGREEMENT.md) before getting started.
+Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Emissivity/blob/1.20.4-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.4-develop/docs/AGREEMENT.md) before getting started.
 
 Not sure what to help with? Take a look at our issue tracker for some ideas! [Here's a quick link](https://github.com/The-Aether-Team/Emissivity/labels/status%2Fhelp-wanted) which shows all the currently open issues that we'd love some help on.
 
 ## :scroll: License information
 [![Asset license (Unlicensed)](https://img.shields.io/badge/assets%20license-All%20Rights%20Reserved-red.svg?style=flat-square)](https://en.wikipedia.org/wiki/All_rights_reserved)
-[![Code license (LGPL v3.0)](https://img.shields.io/badge/code%20license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/LICENSE.txt)
+[![Code license (LGPL v3.0)](https://img.shields.io/badge/code%20license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.4-develop/LICENSE.txt)
 
 If you're wanting to create a gameplay video/review, extension or addon, parody, or any other fan work of your own for Emissivity, go for it! We love seeing the content our community creates, and we hope to make it as welcoming as possible for everyone. We ask however that you please don't advertise using our brand (our specific logo assets, team name, official social media posts).
 

gradle.properties

@@ -3,19 +3,22 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
+neogradle.subsystems.parchment.minecraftVersion=1.20.3
+neogradle.subsystems.parchment.mappingsVersion=2023.12.31
+
 # Mod
 mod_id=aether_emissivity
 mod_name=Emissivity
 mod_version=1.0.0
-mc_version=1.20.2
-neoforge_version=20.2.88
-mappings=2023.12.10
+mc_version=1.20.4
+neoforge_version=20.4.200
+mappings=2023.12.31
 
 # Dependencies
-aether_version=1.20.2-1.3.1-neoforge
-nitrogen_version=1.20.2-1.0.23-neoforge
-cumulus_version=1.20.2-1.0.0-neoforge
-curios_version=6.1.0
+aether_version=1.20.4-1.4.0-neoforge
+nitrogen_version=1.20.4-1.1.0-neoforge
+cumulus_version=1.20.4-1.0.1-neoforge
+curios_version=7.3.4
 
 # Publishing
 curseforge_id=916028

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86

@@ -1,2 +1,2 @@
-// 1.19.4	2023-08-13T15:32:52.8498841	Pack Metadata
-51f7d6bb422e16e3d3ba0a217518d7b83aa9f5a5 pack.mcmeta
+// 1.20.4	2024-04-14T15:39:08.6758642	Pack Metadata
+e82f30f8ca137741680d7faed4e6060c911d5207 pack.mcmeta

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 → src/generated/resources/.cache/b47ebfdbdca416340a5d1afb706a6ef7597a62bc

@@ -1,2 +1,2 @@
-// 1.19.4	2023-09-22T11:43:25.7131006	Languages: en_us
+// 1.20.4	2024-04-14T15:39:08.6808631	Languages: en_us for mod: aether_emissivity
 5dfd371406e8baeac3656db92270023f2ef49230 assets/aether_emissivity/lang/en_us.json

src/generated/resources/pack.mcmeta

@@ -3,7 +3,10 @@
     "description": {
       "translate": "pack.aether_emissivity.mod.description"
     },
-    "neoforge:server_data_pack_format": 12,
-    "pack_format": 13
+    "pack_format": 26,
+    "supported_formats": [
+      0,
+      2147483647
+    ]
   }
 }

src/main/java/com/aetherteam/emissivity/Emissivity.java

@@ -2,6 +2,7 @@
 
 import com.aetherteam.emissivity.data.generators.EmissivityLanguageData;
 import com.mojang.logging.LogUtils;
+import net.minecraft.DetectedVersion;
 import net.minecraft.SharedConstants;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
@@ -13,6 +14,7 @@
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackCompatibility;
 import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.util.InclusiveRange;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
@@ -27,6 +29,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Mod(Emissivity.MODID)
 public class Emissivity {
@@ -47,10 +50,10 @@ public void dataSetup(GatherDataEvent event) {
         generator.addProvider(event.includeClient(), new EmissivityLanguageData(packOutput));
 
         // pack.mcmeta
-        PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput);
-        Map<PackType, Integer> packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA));
-        packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_emissivity.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes));
-        generator.addProvider(true, packMeta);
+        generator.addProvider(true, new PackMetadataGenerator(packOutput).add(PackMetadataSection.TYPE, new PackMetadataSection(
+                Component.translatable("pack.aether_emissivity.mod.description"),
+                DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA),
+                Optional.of(new InclusiveRange<>(0, Integer.MAX_VALUE)))));
     }
 
     public void packSetup(AddPackFindersEvent event) {
@@ -68,7 +71,7 @@ private void setupRecipeOverridePack(AddPackFindersEvent event) {
                     Component.literal(""),
                     true,
                     new PathPackResources.PathResourcesSupplier(resourcePath, true),
-                    new Pack.Info(metadata.description(), metadata.packFormat(PackType.SERVER_DATA), metadata.packFormat(PackType.CLIENT_RESOURCES), PackCompatibility.COMPATIBLE, FeatureFlagSet.of(), List.of(), true),
+                    new Pack.Info(metadata.description(), PackCompatibility.COMPATIBLE, FeatureFlagSet.of(), List.of(), true),
                     Pack.Position.TOP,
                     false,
                     PackSource.BUILT_IN)

src/main/resources/META-INF/mods.toml

@@ -7,7 +7,7 @@ issueTrackerURL = "https://github.com/The-Aether-Team/Emissivity/issues"
 modId = "aether_emissivity"
 version = "${file.jarVersion}"
 displayName = "Emissivity"
-updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.20.2-develop/update.json"
+updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.20.4-develop/update.json"
 displayURL = "https://modrinth.com/mod/aether-emissivity"
 logoFile = "emissivity_icon.png"
 credits = "The Aether Team"
@@ -16,20 +16,20 @@ description = '''Adds various emissive textures for the Aether's content.'''
 
 [[dependencies.aether_emissivity]]
     modId="neoforge"
-    mandatory=true
-    versionRange="[20.2.0,)"
+    type = "required"
+    versionRange="[20.4.167,)"
     ordering = "NONE"
     side = "BOTH"
 [[dependencies.aether_emissivity]]
     modId = "aether"
-    mandatory = true
-    versionRange = "[1.20.1-1.0.0-beta.1.2-neoforge,)"
+    type = "required"
+    versionRange = "[1.20.4-1.4.0-neoforge,)"
     ordering = "NONE"
     side = "BOTH"
 [[dependencies.aether_emissivity]]
     modId = "minecraft"
-    mandatory = true
-    versionRange="[1.20.2,1.20.3)"
+    type = "required"
+    versionRange="[1.20.4]"
     ordering = "NONE"
     side = "BOTH"
 

update.json

@@ -4,6 +4,7 @@
     "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",
-    "1.20.2-recommended": "1.20.2-1.0.0-neoforge"
+    "1.20.2-recommended": "1.20.2-1.0.0-neoforge",
+    "1.20.4-recommended": "1.20.4-1.0.0-neoforge"
   }
 }