diff --git a/build.gradle b/build.gradle index ce4eff0..92d9768 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,7 @@ plugins { id 'eclipse' id 'maven-publish' - 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 + id 'net.neoforged.gradle.userdev' version '7.0.+' id 'io.github.0ffz.github-packages' version '[1,2)' id 'com.matthewprenger.cursegradle' version '[1.4,1.5)' id 'com.modrinth.minotaur' version '[2,3)' @@ -19,47 +16,30 @@ base { java.toolchain.languageVersion = JavaLanguageVersion.of(17) -apply plugin: 'org.moddingx.modgradle.sourcejar' +runs { + configureEach { + workingDirectory project.file('run') + systemProperty "${mod_id}.iside", 'true' + systemProperty 'forge.logging.console.level', 'info' -minecraft { - mappings channel: 'sugarcane', version: project.mappings - - copyIdeResources = true - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - runs { - configureEach { - workingDirectory project.file('run') - - 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}" { - source sourceSets.main - } - } - } + modSource project.sourceSets.main + } - client { - property 'forge.enabledGameTestNamespaces', mod_id - } + client { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + } - server { - property 'forge.enabledGameTestNamespaces', mod_id - args '--nogui' - } + server { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + programArgument '--nogui' + } - gameTestServer { - property 'forge.enabledGameTestNamespaces', mod_id - } + gameTestServer { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + } - data { - 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' - } + data { + programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath(), '--existing', file('src/generated/resources/').getAbsolutePath(), '--existing-mod', 'nitrogen_internals', '--existing-mod', 'aether' } } @@ -68,11 +48,11 @@ sourceSets.main.resources { } dependencies { - minecraft "net.neoforged:forge:${project.mc_version}-${project.neoforge_version}" + implementation "net.neoforged:neoforge:${project.neoforge_version}" - implementation fg.deobf("com.aetherteam.aether:aether:${project.aether_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}") + implementation "com.aetherteam.aether:aether:${project.aether_version}" + implementation "com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}" + implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.mc_version}" } repositories { @@ -92,23 +72,24 @@ tasks.named('jar', Jar).configure { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } - finalizedBy 'reobfJar' -} - -tasks.named(sourceSets.main.compileJavaTaskName) { - outputs.file("${it.temporaryDir}/${it.name}-refmap.json").withPropertyName("mixin refmap") } compileJava { options.incremental = false } +tasks.register('sourceJar', Jar) { + dependsOn 'classes' + from sourceSets.main.allSource + archiveClassifier = 'sources' +} + publishing { publications { mavenJava(MavenPublication) { artifactId project.archivesBaseName - artifact jar - artifact sourceJar + artifact project.jar + artifact project.sourceJar } } repositories { @@ -131,6 +112,7 @@ curseforge { changelog = file("$rootDir/docs/CHANGELOG.md") changelogType = "markdown" addGameVersion("${project.mc_version}") + addGameVersion("NeoForge") mainArtifact(tasks.jar) { displayName = "${project.mod_name} - ${version}" relations { @@ -149,7 +131,7 @@ modrinth { changelog = new File("$rootDir/docs/CHANGELOG.md").text uploadFile = tasks.jar gameVersions = ["${project.mc_version}"] - loaders = ["forge", "neoforge"] + loaders = ["neoforge"] dependencies { required.version "aether", "${project.aether_version}" } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d94380c..de277cc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,4 +1,12 @@ -# Enhanced Extinguishing - Forge - 1.0.0-1.20.1 +# Enhanced Extinguishing - NeoForge - 1.0.0-1.20.4 + +- Port to 1.20.4. + +# Enhanced Extinguishing - NeoForge - 1.0.0-1.20.2 + +- Port to 1.20.2. + +# Enhanced Extinguishing - NeoForge - 1.0.0-1.20.1 - Port to 1.20.1. diff --git a/docs/README.md b/docs/README.md index b5bdbe5..52ad505 100644 --- a/docs/README.md +++ b/docs/README.md @@ -32,7 +32,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.20.1-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Enhanced-Extinguishing?branch=1.20.1-develop) +[![CircleCI](https://circleci.com/gh/The-Aether-Team/Enhanced-Extinguishing/tree/1.20.4-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Enhanced-Extinguishing?branch=1.20.4-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.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. +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.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.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/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.20.1-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.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 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 ae7a735..fe621e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,18 +3,21 @@ 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_enhanced_extinguishing mod_name=Enhanced Extinguishing mod_version=1.0.0 -mc_version=1.20.1 -neoforge_version=47.1.70 -mappings=2023.08.20-1.20.1 +mc_version=1.20.4 +neoforge_version=20.4.200 +mappings=2023.12.31 # Dependencies -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 +aether_version=1.20.4-1.4.0-neoforge +nitrogen_version=1.20.4-1.1.0-neoforge +curios_version=7.3.4 # Publishing curseforge_id=884860 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..17655d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/settings.gradle b/settings.gradle index 32694a5..7d8be9f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,22 +1,8 @@ pluginManagement { - resolutionStrategy { - eachPlugin { - var plugin = requested.id.toString() - - // ModGradle - if (plugin.startsWith('org.moddingx.modgradle.')) { - useModule "org.moddingx:ModGradle:${requested.version}" - } - } - } repositories { gradlePluginPortal() 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' } } } - -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' -} diff --git a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 index d88bd6d..1b7904e 100644 --- a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 +++ b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 @@ -1,2 +1,2 @@ -// 1.19.4 2023-07-03T21:03:24.7351096 Pack Metadata -18f2c92d6fe03e61b05b34bbe1cecc1f9a120bb4 pack.mcmeta +// 1.20.4 2024-04-14T15:46:57.3951905 Pack Metadata +de99a201253d77c4d1edbc458cae0e4e16616504 pack.mcmeta diff --git a/src/generated/resources/.cache/2166f48f9b4916f698a3684df8f4ab46a095eeb0 b/src/generated/resources/.cache/2166f48f9b4916f698a3684df8f4ab46a095eeb0 index d905f3d..1aa21a4 100644 --- a/src/generated/resources/.cache/2166f48f9b4916f698a3684df8f4ab46a095eeb0 +++ b/src/generated/resources/.cache/2166f48f9b4916f698a3684df8f4ab46a095eeb0 @@ -1,4 +1,4 @@ -// 1.19.4 2023-07-03T23:10:28.5146643 Block States: aether_enhanced_extinguishing +// 1.20.4 2024-04-14T15:46:57.353201 Block States: aether_enhanced_extinguishing be96f08f1470b00455e456ffac7da41c9f0e8733 assets/aether_enhanced_extinguishing/blockstates/extinguished_lantern.json 1bb429c2685ac1c94b1ca8795435867ba4841af0 assets/aether_enhanced_extinguishing/blockstates/extinguished_torch.json 70e801f59cf3a10a6d79092625ee69fda39fd417 assets/aether_enhanced_extinguishing/blockstates/extinguished_wall_torch.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/6073c70f3dc7ed4d31a0769270b3be4bdbc0ddc8 similarity index 50% rename from src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 rename to src/generated/resources/.cache/6073c70f3dc7ed4d31a0769270b3be4bdbc0ddc8 index b34eb0d..7434999 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/6073c70f3dc7ed4d31a0769270b3be4bdbc0ddc8 @@ -1,2 +1,2 @@ -// 1.19.4 2023-07-03T23:36:43.1696061 Languages: en_us +// 1.20.4 2024-04-14T15:46:57.3661897 Languages: en_us for mod: aether_enhanced_extinguishing 054564165425aec5b35ec63fa09c6f85272c2631 assets/aether_enhanced_extinguishing/lang/en_us.json diff --git a/src/generated/resources/.cache/86e7b08150d5b7fd5e503c2765dc35f846e63e54 b/src/generated/resources/.cache/86e7b08150d5b7fd5e503c2765dc35f846e63e54 index 56dd4dd..bc8fc11 100644 --- a/src/generated/resources/.cache/86e7b08150d5b7fd5e503c2765dc35f846e63e54 +++ b/src/generated/resources/.cache/86e7b08150d5b7fd5e503c2765dc35f846e63e54 @@ -1,3 +1,3 @@ -// 1.19.4 2023-07-03T22:19:00.5615687 Tags for minecraft:block mod id aether_enhanced_extinguishing +// 1.20.4 2024-04-14T15:46:57.3841903 Tags for minecraft:block mod id aether_enhanced_extinguishing 23c668e2f3ed8790a22a0233bcd29f822790b43c data/minecraft/tags/blocks/mineable/pickaxe.json fd6aefed57ca423ecaac7dc14dc0632f95e2f748 data/minecraft/tags/blocks/wall_post_override.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a4661c4..a395664 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.4 2023-07-03T22:59:22.8517548 Recipes +// 1.20.4 2024-04-14T15:46:57.3791892 Recipes e7ba7064e57c5c3f475280bf81c391cb26f95631 data/aether_enhanced_extinguishing/recipes/lantern_extinguishing_conversion.json dae2cd7d4dacfb738e50e5df6381ce5f63c1597d data/aether_enhanced_extinguishing/recipes/torch_extinguishing_conversion.json e251b826224ea3c46cc4699f272548ae8e9330e4 data/aether_enhanced_extinguishing/recipes/wall_torch_extinguishing_conversion.json diff --git a/src/generated/resources/assets/aether_enhanced_extinguishing/lang/ru_ru.json b/src/generated/resources/assets/aether_enhanced_extinguishing/lang/ru_ru.json new file mode 100644 index 0000000..3c053cf --- /dev/null +++ b/src/generated/resources/assets/aether_enhanced_extinguishing/lang/ru_ru.json @@ -0,0 +1,3 @@ +{ + "pack.aether_enhanced_extinguishing.mod.description": "Эфир: Расширенные ресурсы тушения" +} \ No newline at end of file diff --git a/src/generated/resources/pack.mcmeta b/src/generated/resources/pack.mcmeta index 728a3dd..dbb75aa 100644 --- a/src/generated/resources/pack.mcmeta +++ b/src/generated/resources/pack.mcmeta @@ -3,7 +3,10 @@ "description": { "translate": "pack.aether_enhanced_extinguishing.mod.description" }, - "forge:server_data_pack_format": 12, - "pack_format": 13 + "pack_format": 26, + "supported_formats": [ + 0, + 2147483647 + ] } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/EnhancedExtinguishing.java b/src/main/java/com/aetherteam/enhanced_extinguishing/EnhancedExtinguishing.java index f8991a1..d9acb46 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/EnhancedExtinguishing.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/EnhancedExtinguishing.java @@ -6,6 +6,7 @@ import com.aetherteam.enhanced_extinguishing.data.generators.ExtinguishingRecipeData; import com.aetherteam.enhanced_extinguishing.data.generators.tags.ExtinguishingBlockTagData; import com.mojang.logging.LogUtils; +import net.minecraft.DetectedVersion; import net.minecraft.SharedConstants; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; @@ -13,23 +14,26 @@ import net.minecraft.data.metadata.PackMetadataGenerator; import net.minecraft.network.chat.Component; import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.PathPackResources; import net.minecraft.server.packs.metadata.pack.PackMetadataSection; 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.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.event.AddPackFindersEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.resource.PathPackResources; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import net.neoforged.neoforge.event.AddPackFindersEvent; +import net.neoforged.neoforge.registries.DeferredRegister; import org.slf4j.Logger; import java.nio.file.Path; -import java.util.Map; +import java.util.List; +import java.util.Optional; import java.util.concurrent.CompletableFuture; @Mod(EnhancedExtinguishing.MODID) @@ -37,19 +41,17 @@ public class EnhancedExtinguishing { public static final String MODID = "aether_enhanced_extinguishing"; private static final Logger LOGGER = LogUtils.getLogger(); - public EnhancedExtinguishing() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - + public EnhancedExtinguishing(IEventBus bus, Dist dist) { DeferredRegister[] registers = { ExtinguishingBlocks.BLOCKS, }; for (DeferredRegister register : registers) { - register.register(modEventBus); + register.register(bus); } - modEventBus.addListener(this::dataSetup); - modEventBus.addListener(this::packSetup); + bus.addListener(this::dataSetup); + bus.addListener(this::packSetup); } public void dataSetup(GatherDataEvent event) { @@ -63,14 +65,14 @@ public void dataSetup(GatherDataEvent event) { generator.addProvider(event.includeClient(), new ExtinguishingLanguageData(packOutput)); // Server Data - generator.addProvider(event.includeServer(), new ExtinguishingRecipeData(packOutput)); + generator.addProvider(event.includeServer(), new ExtinguishingRecipeData(packOutput, lookupProvider)); generator.addProvider(event.includeServer(), new ExtinguishingBlockTagData(packOutput, lookupProvider, fileHelper)); // pack.mcmeta - PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput); - Map packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); - packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_enhanced_extinguishing.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_enhanced_extinguishing.mod.description"), + DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA), + Optional.of(new InclusiveRange<>(0, Integer.MAX_VALUE))))); } public void packSetup(AddPackFindersEvent event) { @@ -81,16 +83,14 @@ public void packSetup(AddPackFindersEvent event) { private void setupRecipeOverridePack(AddPackFindersEvent event) { if (event.getPackType() == PackType.SERVER_DATA) { Path resourcePath = ModList.get().getModFileById(EnhancedExtinguishing.MODID).getFile().findResource("packs/recipe_override"); - PathPackResources pack = new PathPackResources(ModList.get().getModFileById(EnhancedExtinguishing.MODID).getFile().getFileName() + ":" + resourcePath, true, resourcePath); PackMetadataSection metadata = new PackMetadataSection(Component.literal(""), SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); event.addRepositorySource((source) -> source.accept(Pack.create( "builtin/extinguishing_recipe_override", Component.literal(""), true, - (string) -> pack, - new Pack.Info(metadata.getDescription(), metadata.getPackFormat(PackType.SERVER_DATA), metadata.getPackFormat(PackType.CLIENT_RESOURCES), FeatureFlagSet.of(), true), - PackType.SERVER_DATA, + new PathPackResources.PathResourcesSupplier(resourcePath, true), + new Pack.Info(metadata.description(), PackCompatibility.COMPATIBLE, FeatureFlagSet.of(), List.of(), true), Pack.Position.TOP, false, PackSource.BUILT_IN) diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedLanternBlock.java b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedLanternBlock.java index 5447b5b..856a6bb 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedLanternBlock.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedLanternBlock.java @@ -3,7 +3,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LanternBlock; import net.minecraft.world.level.block.state.BlockState; @@ -20,7 +20,7 @@ public String getDescriptionId() { } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) { + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { return Blocks.LANTERN.getCloneItemStack(state, target, level, pos, player); } } diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedTorchBlock.java b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedTorchBlock.java index 698302b..4fa2fcd 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedTorchBlock.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedTorchBlock.java @@ -28,7 +28,7 @@ public String getDescriptionId() { } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) { + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { return Blocks.TORCH.getCloneItemStack(state, target, level, pos, player); } diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedWallTorchBlock.java b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedWallTorchBlock.java index 1b1b468..d3ba9ca 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedWallTorchBlock.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishedWallTorchBlock.java @@ -37,7 +37,7 @@ public String getDescriptionId() { } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) { + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { return Blocks.WALL_TORCH.getCloneItemStack(state, target, level, pos, player); } 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 027c470..31e5342 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/block/ExtinguishingBlocks.java @@ -1,20 +1,21 @@ package com.aetherteam.enhanced_extinguishing.block; import com.aetherteam.enhanced_extinguishing.EnhancedExtinguishing; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; 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; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; public class ExtinguishingBlocks { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, EnhancedExtinguishing.MODID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(BuiltInRegistries.BLOCK, EnhancedExtinguishing.MODID); - 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))); + public static final Supplier 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 Supplier 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 Supplier 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/generators/ExtinguishingBlockStateData.java b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingBlockStateData.java index 95cd5b8..2ad3e12 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingBlockStateData.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingBlockStateData.java @@ -4,7 +4,7 @@ import com.aetherteam.enhanced_extinguishing.block.ExtinguishingBlocks; import com.aetherteam.enhanced_extinguishing.data.providers.ExtinguishingBlockStateProvider; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; public class ExtinguishingBlockStateData extends ExtinguishingBlockStateProvider { public ExtinguishingBlockStateData(PackOutput output, ExistingFileHelper helper) { diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingLanguageData.java b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingLanguageData.java index 558b396..9f2ea8b 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingLanguageData.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingLanguageData.java @@ -2,7 +2,7 @@ import com.aetherteam.enhanced_extinguishing.EnhancedExtinguishing; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.LanguageProvider; +import net.neoforged.neoforge.common.data.LanguageProvider; public class ExtinguishingLanguageData extends LanguageProvider { public ExtinguishingLanguageData(PackOutput output) { diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingRecipeData.java b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingRecipeData.java index 47133ba..078254c 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingRecipeData.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/ExtinguishingRecipeData.java @@ -4,20 +4,20 @@ import com.aetherteam.enhanced_extinguishing.EnhancedExtinguishing; import com.aetherteam.enhanced_extinguishing.block.ExtinguishingBlocks; import com.aetherteam.enhanced_extinguishing.data.providers.ExtinguishingRecipeProvider; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.level.block.Blocks; -import java.util.function.Consumer; +import java.util.concurrent.CompletableFuture; public class ExtinguishingRecipeData extends ExtinguishingRecipeProvider { - public ExtinguishingRecipeData(PackOutput output) { - super(output, EnhancedExtinguishing.MODID); + public ExtinguishingRecipeData(PackOutput output, CompletableFuture lookupProvider) { + super(output, lookupProvider, EnhancedExtinguishing.MODID); } @Override - @SuppressWarnings("removal") - protected void buildRecipes(Consumer< FinishedRecipe > consumer) { + protected void buildRecipes(RecipeOutput consumer) { convertPlacement(ExtinguishingBlocks.EXTINGUISHED_TORCH.get(), Blocks.TORCH, AetherTags.Biomes.ULTRACOLD).save(consumer, name("torch_extinguishing_conversion")); convertPlacement(ExtinguishingBlocks.EXTINGUISHED_WALL_TORCH.get(), Blocks.WALL_TORCH, AetherTags.Biomes.ULTRACOLD).save(consumer, name("wall_torch_extinguishing_conversion")); convertPlacement(ExtinguishingBlocks.EXTINGUISHED_LANTERN.get(), Blocks.LANTERN, AetherTags.Biomes.ULTRACOLD).save(consumer, name("lantern_extinguishing_conversion")); diff --git a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/tags/ExtinguishingBlockTagData.java b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/tags/ExtinguishingBlockTagData.java index f8d5654..a2d93ec 100644 --- a/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/tags/ExtinguishingBlockTagData.java +++ b/src/main/java/com/aetherteam/enhanced_extinguishing/data/generators/tags/ExtinguishingBlockTagData.java @@ -5,8 +5,8 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.BlockTags; -import net.minecraftforge.common.data.BlockTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.BlockTagsProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; @@ -16,7 +16,6 @@ public ExtinguishingBlockTagData(PackOutput output, CompletableFuture lookupProvider, String id) { + super(output, lookupProvider); ID = id; } @@ -23,7 +25,7 @@ protected static ResourceLocation name(String name) { return new ResourceLocation(ID, name); } - protected static BlockStateRecipeBuilder convertPlacement(Block result, Block ingredient, TagKey biome) { - return BiomeParameterRecipeBuilder.recipe(BlockStateIngredient.of(ingredient), result, biome, AetherRecipeSerializers.PLACEMENT_CONVERSION.get()); + protected static BiomeParameterRecipeBuilder convertPlacement(Block result, Block ingredient, TagKey biome) { + return BiomeParameterRecipeBuilder.recipe(BlockStateIngredient.of(ingredient), result, biome, PlacementConversionRecipe::new); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 0b5d8e9..f32689c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[47,)" +loaderVersion = "[1,)" 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.20.1-develop/update.json" +updateJSONURL="https://github.com/The-Aether-Team/Enhanced-Extinguishing/raw/1.20.4-develop/update.json" displayURL = "https://modrinth.com/mod/aether-enhanced-extinguishing" logoFile ="enhanced_extinguishing_icon.png" credits = "The Aether Team" @@ -15,20 +15,20 @@ authors = "bconlon" description = '''Improves the consistency of fire being disallowed in the Aether by adding new extinguished variants of blocks.''' [[dependencies.aether_enhanced_extinguishing]] -modId = "forge" -mandatory = true -versionRange = "[47.1.0,]" -ordering = "NONE" -side = "BOTH" + modId="neoforge" + type = "required" + versionRange="[20.4.167,)" + ordering="NONE" + side="BOTH" [[dependencies.aether_enhanced_extinguishing]] -modId = "aether" -mandatory = true -versionRange = "[1.20.1-1.0.0-beta.1-forge,)" -ordering = "NONE" -side = "BOTH" + modId = "aether" + type = "required" + versionRange = "[1.20.4-1.4.0-neoforge,)" + ordering = "NONE" + side = "BOTH" [[dependencies.aether_enhanced_extinguishing]] -modId = "minecraft" -mandatory = true -versionRange = "[1.20.1]" -ordering = "NONE" -side = "BOTH" \ No newline at end of file + modId = "minecraft" + type = "required" + versionRange="[1.20.4]" + ordering = "NONE" + side = "BOTH" \ No newline at end of file diff --git a/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_block_ban.json b/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_block_ban.json index a0857e4..443d148 100644 --- a/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_block_ban.json +++ b/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_block_ban.json @@ -1,8 +1,7 @@ { - "type":"forge:conditional", - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:false" + "type": "neoforge:false" } ] } \ No newline at end of file diff --git a/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_item_ban.json b/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_item_ban.json index a0857e4..443d148 100644 --- a/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_item_ban.json +++ b/src/main/resources/packs/recipe_override/data/aether/recipes/lantern_item_ban.json @@ -1,8 +1,7 @@ { - "type":"forge:conditional", - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:false" + "type": "neoforge:false" } ] } \ No newline at end of file diff --git a/src/main/resources/packs/recipe_override/data/aether/recipes/torch_block_ban.json b/src/main/resources/packs/recipe_override/data/aether/recipes/torch_block_ban.json index a0857e4..443d148 100644 --- a/src/main/resources/packs/recipe_override/data/aether/recipes/torch_block_ban.json +++ b/src/main/resources/packs/recipe_override/data/aether/recipes/torch_block_ban.json @@ -1,8 +1,7 @@ { - "type":"forge:conditional", - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:false" + "type": "neoforge:false" } ] } \ No newline at end of file diff --git a/src/main/resources/packs/recipe_override/data/aether/recipes/torch_item_ban.json b/src/main/resources/packs/recipe_override/data/aether/recipes/torch_item_ban.json index a0857e4..443d148 100644 --- a/src/main/resources/packs/recipe_override/data/aether/recipes/torch_item_ban.json +++ b/src/main/resources/packs/recipe_override/data/aether/recipes/torch_item_ban.json @@ -1,8 +1,7 @@ { - "type":"forge:conditional", - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:false" + "type": "neoforge:false" } ] } \ No newline at end of file diff --git a/update.json b/update.json index 6e955d1..018bc76 100644 --- a/update.json +++ b/update.json @@ -1,7 +1,10 @@ { "homepage": "https://modrinth.com/mod/aether-enhanced-extinguishing", "promos": { + "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-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.4-recommended": "1.20.4-1.0.0-neoforge" } } \ No newline at end of file