From c59d559a46c40cb2e6ca898d9e02433502d26a58 Mon Sep 17 00:00:00 2001 From: bconlon Date: Sat, 16 Sep 2023 20:31:26 -0700 Subject: [PATCH] update: 1.20.1 --- .github/workflows/trigger-build.yml | 2 +- build.gradle | 15 +++++++++------ docs/CHANGELOG.md | 4 ++++ docs/README.md | 6 +++--- gradle.properties | 11 ++++++----- settings.gradle | 2 +- .../block/ExtinguishingBlocks.java | 10 +++++----- .../providers/ExtinguishingRecipeProvider.java | 5 +++-- src/main/resources/META-INF/mods.toml | 10 +++++----- update.json | 3 ++- 10 files changed, 39 insertions(+), 29 deletions(-) diff --git a/.github/workflows/trigger-build.yml b/.github/workflows/trigger-build.yml index 6d67bbd..72c1236 100644 --- a/.github/workflows/trigger-build.yml +++ b/.github/workflows/trigger-build.yml @@ -16,7 +16,7 @@ on: remote_branch: description: 'GitHub branch that the pull request is merging from' required: true - default: '1.19.4-develop' + default: '1.20.1-develop' type: string jobs: diff --git a/build.gradle b/build.gradle index caeea74..ce4eff0 100644 --- 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.parchmentmc.librarian.forgegradle' version '[1,2)' id 'org.moddingx.modgradle.mapping' version '[4,5)' id 'org.moddingx.modgradle.sourcejar' version '[4,5)' apply false @@ -10,7 +10,7 @@ plugins { id 'com.modrinth.minotaur' version '[2,3)' } -version = "${mc_version}-${mod_version}-forge" +version = "${mc_version}-${mod_version}-neoforge" group = 'com.aetherteam.enhanced_extinguishing' base { @@ -33,6 +33,8 @@ minecraft { property "${mod_id}.iside", 'true' property 'forge.logging.console.level', 'info' + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" mods { "${mod_id}" { @@ -55,7 +57,7 @@ minecraft { } data { - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/'), '--existing-mod', 'aether' + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/'), '--existing-mod', 'nitrogen_internals', '--existing-mod', 'aether' environment 'target', 'fmluserdevdata' } } @@ -66,10 +68,11 @@ 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 fg.deobf("com.aetherteam.aether:aether:${project.aether_version}") - implementation fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}") + implementation fg.deobf("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}") + implementation fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}+${project.mc_version}") } repositories { @@ -146,7 +149,7 @@ modrinth { changelog = new File("$rootDir/docs/CHANGELOG.md").text uploadFile = tasks.jar gameVersions = ["${project.mc_version}"] - loaders = ["forge"] + loaders = ["forge", "neoforge"] dependencies { required.version "aether", "${project.aether_version}" } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e7073d2..d94380c 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,7 @@ +# Enhanced Extinguishing - Forge - 1.0.0-1.20.1 + +- Port to 1.20.1. + # Enhanced Extinguishing - Forge - 1.0.0-1.19.4 - Add Extinguished Torch, which is created by placing a Torch in the Aether dimension. diff --git a/docs/README.md b/docs/README.md index 0071139..ac6c7d8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -30,7 +30,7 @@ If you're interested in sponsoring Enhanced Extinguishing or The Aether Team, pl [![Modrinth Version](https://img.shields.io/modrinth/game-versions/FDrEl7QY?color=00AF5C&label=latest&logo=modrinth&last=true)](https://modrinth.com/mod/aether-enhanced-extinguishing) [![CurseForge Downloads](http://cf.way2muchnoise.eu/884860.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-enhanced-extinguishing) [![CurseForge Version](http://cf.way2muchnoise.eu/versions/884860_latest.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-enhanced-extinguishing) -[![CircleCI](https://circleci.com/gh/The-Aether-Team/Enhanced-Extinguishing/tree/1.19.4-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Enhanced-Extinguishing?branch=1.19.4-develop) +[![CircleCI](https://circleci.com/gh/The-Aether-Team/Enhanced-Extinguishing/tree/1.20.1-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Enhanced-Extinguishing?branch=1.20.1-develop) ### Release builds Enhanced Extinguished has stable release builds available on [Modrinth](https://modrinth.com/mod/aether-enhanced-extinguishing) and [CurseForge](https://www.curseforge.com/minecraft/mc-mods/aether-enhanced-extinguishing). @@ -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/Enhanced-Extinguishing/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/Enhanced-Extinguishing/blob/1.19.4-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Enhanced-Extinguishing/blob/1.19.4-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/Enhanced-Extinguishing/blob/1.20.1-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Enhanced-Extinguishing/blob/1.20.1-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/Enhanced-Extinguishing/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/Enhanced-Extinguishing/blob/1.19.4-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/Enhanced-Extinguishing/blob/1.20.1-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 Enhanced Extinguishing, 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). diff --git a/gradle.properties b/gradle.properties index 3ede293..ae7a735 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,13 +7,14 @@ org.gradle.daemon=false mod_id=aether_enhanced_extinguishing mod_name=Enhanced Extinguishing 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.5.1-forge -curios_version=1.19.4-5.1.5.3 +aether_version=1.20.1-1.0.0-beta.1-neoforge +nitrogen_version=1.20.1-0.1.2-neoforge +curios_version=5.3.1 # Publishing curseforge_id=884860 diff --git a/settings.gradle b/settings.gradle index 7753134..32694a5 100644 --- 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://maven.parchmentmc.org' } maven { url = 'https://maven.moddingx.org' } } diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java index 417cc03..027c470 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java @@ -3,10 +3,10 @@ import com.aetherteam.enhanced_extinguishing.EnhancedExtinguishing; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.LanternBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -14,7 +14,7 @@ public class ExtinguishingBlocks { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, EnhancedExtinguishing.MODID); - public static final RegistryObject EXTINGUISHED_TORCH = BLOCKS.register("extinguished_torch", () -> new ExtinguishedTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().sound(SoundType.WOOD).lootFrom(() -> Blocks.TORCH))); - public static final RegistryObject EXTINGUISHED_WALL_TORCH = BLOCKS.register("extinguished_wall_torch", () -> new ExtinguishedWallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().sound(SoundType.WOOD).lootFrom(() -> Blocks.TORCH))); - public static final RegistryObject EXTINGUISHED_LANTERN = BLOCKS.register("extinguished_lantern", () -> new ExtinguishedLanternBlock(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(3.5F).sound(SoundType.LANTERN).noOcclusion().lootFrom(() -> Blocks.LANTERN))); + public static final RegistryObject EXTINGUISHED_TORCH = BLOCKS.register("extinguished_torch", () -> new ExtinguishedTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY).lootFrom(() -> Blocks.TORCH))); + public static final RegistryObject EXTINGUISHED_WALL_TORCH = BLOCKS.register("extinguished_wall_torch", () -> new ExtinguishedWallTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY).lootFrom(() -> Blocks.TORCH))); + public static final RegistryObject EXTINGUISHED_LANTERN = BLOCKS.register("extinguished_lantern", () -> new ExtinguishedLanternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).forceSolidOn().requiresCorrectToolForDrops().strength(3.5F).sound(SoundType.LANTERN).pushReaction(PushReaction.DESTROY).noOcclusion().lootFrom(() -> Blocks.LANTERN))); } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/data/providers/ExtinguishingRecipeProvider.java b/src/main/java/com/aetherteam/enhanced_extinguishing/data/providers/ExtinguishingRecipeProvider.java index 925cf41..4d27f79 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/data/providers/ExtinguishingRecipeProvider.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/data/providers/ExtinguishingRecipeProvider.java @@ -1,8 +1,9 @@ package com.aetherteam.enhanced_extinguishing.data.providers; import com.aetherteam.aether.recipe.AetherRecipeSerializers; -import com.aetherteam.aether.recipe.BlockStateIngredient; -import com.aetherteam.aether.recipe.builder.*; +import com.aetherteam.aether.recipe.builder.BiomeParameterRecipeBuilder; +import com.aetherteam.nitrogen.recipe.BlockStateIngredient; +import com.aetherteam.nitrogen.recipe.builder.BlockStateRecipeBuilder; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a7d0ac8..0b5d8e9 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[45,)" +loaderVersion = "[47,)" license = "Assets: All Rights Reserved; Code: LGPL-3.0" issueTrackerURL="https://github.com/The-Aether-Team/Enhanced-Extinguishing/issues" @@ -7,7 +7,7 @@ issueTrackerURL="https://github.com/The-Aether-Team/Enhanced-Extinguishing/issue modId = "aether_enhanced_extinguishing" version = "${file.jarVersion}" displayName = "Enhanced Extinguishing" -updateJSONURL="https://github.com/The-Aether-Team/Enhanced-Extinguishing/raw/1.19.4-develop/update.json" +updateJSONURL="https://github.com/The-Aether-Team/Enhanced-Extinguishing/raw/1.20.1-develop/update.json" displayURL = "https://modrinth.com/mod/aether-enhanced-extinguishing" logoFile ="enhanced_extinguishing_icon.png" credits = "The Aether Team" @@ -17,18 +17,18 @@ description = '''Improves the consistency of fire being disallowed in the Aether [[dependencies.aether_enhanced_extinguishing]] modId = "forge" mandatory = true -versionRange = "[45.1.0,]" +versionRange = "[47.1.0,]" ordering = "NONE" side = "BOTH" [[dependencies.aether_enhanced_extinguishing]] modId = "aether" mandatory = true -versionRange = "[1.19.4-1.0.0-beta.5.1-forge,)" +versionRange = "[1.20.1-1.0.0-beta.1-forge,)" ordering = "NONE" side = "BOTH" [[dependencies.aether_enhanced_extinguishing]] modId = "minecraft" mandatory = true -versionRange = "[1.19.4]" +versionRange = "[1.20.1]" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/update.json b/update.json index 4d1a676..6e955d1 100644 --- a/update.json +++ b/update.json @@ -1,6 +1,7 @@ { "homepage": "https://modrinth.com/mod/aether-enhanced-extinguishing", "promos": { - "1.19.4-recommended": "1.19.4-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-forge" } } \ No newline at end of file