diff --git a/build.gradle b/build.gradle index ec92274b..aaabd101 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ neoForge { data() // instead of using --all, skip file check validation programArguments.addAll('--server', '--client', '--dev', '--reports') - programArguments.addAll ('--mod', 'exdeorum', '--output', file('src/generated/resources/').absolutePath, '--existing', file('src/main/resources/').absolutePath) + programArguments.addAll('--mod', 'exdeorum', '--output', file('src/generated/resources/').absolutePath, '--existing', file('src/main/resources/').absolutePath) } } @@ -77,35 +77,33 @@ repositories { url = 'https://maven.blamejared.com/' content { includeGroup "mezz.jei" } } - maven { - name = 'rei' - url = "https://maven.shedaniel.me" - } maven { name = 'Architectury API' - url = "https://maven.architectury.dev" - content { includeGroup "dev.architectury" } + url = 'https://maven.architectury.dev' + content { includeGroup 'dev.architectury' } } maven { name = 'KubeJS and Rhino' - url = "https://maven.saps.dev/minecraft" - content { - includeGroup "dev.latvian.mods" - includeGroup "dev.latvian.apps" - } + url = 'https://maven.latvian.dev/releases' + content { includeGroupAndSubgroups 'dev.latvian' } } maven { name = 'ModKit' url 'https://jitpack.io' - content { includeGroup 'com.github.thedarkcolour' } + content { + includeGroup 'com.github.thedarkcolour' + // Required for KubeJS + includeGroup 'com.github.rtyley' + } } maven { - name = 'TerraformersMC' + name = 'EMI' url = 'https://maven.terraformersmc.com' + content { includeGroup 'dev.emi' } } maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" + name = 'Modrinth' + url = 'https://api.modrinth.com/maven' content { includeModule("maven.modrinth", "oculus") includeModule("maven.modrinth", "embeddium") @@ -113,16 +111,7 @@ repositories { } maven { url "https://cursemaven.com" - content { - includeGroup "curse.maven" - } - } - // Required for KubeJS - maven { - url 'https://jitpack.io' - content { - includeGroup "com.github.rtyley" - } + content { includeGroup "curse.maven" } } } @@ -136,20 +125,16 @@ dependencies { // JEI OPTIONAL compileOnly("mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}") runtimeOnly("mezz.jei:jei-${mc_version}-neoforge:${jei_version}") - // REI OPTIONAL todo add - compileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") - compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}") // EMI OPTIONAL compileOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}:api") //runtimeOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}") - //implementation("curse.maven:reipc-521393:4837449") // KubeJS OPTIONAL implementation("dev.architectury:architectury-neoforge:${architectury_version}") implementation("dev.latvian.mods:rhino:${rhino_version}") implementation("dev.latvian.mods:kubejs-neoforge:${kubejs_version}") // ModKit DEV ONLY - implementation('com.github.thedarkcolour:ModKit:81a0889b26') + implementation('com.github.thedarkcolour:ModKit:4f83c92767') // Core mod implementation(project(':coremod')) @@ -169,9 +154,9 @@ dependencies { tasks.withType(ProcessResources).configureEach { var replaceProperties = [ - mc_version: mc_version, - mod_version: version, - neo_version_range: neo_version_range, + mc_version : mc_version, + mod_version : version, + neo_version_range : neo_version_range, loader_version_range: loader_version_range ] inputs.properties replaceProperties diff --git a/gradle.properties b/gradle.properties index 69110953..a7088dab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,19 +6,18 @@ org.gradle.parallel=true org.gradle.caching=true mc_version=1.21.1 -neo_version=21.1.51 +neo_version=21.1.97 neo_version_range=[21.1,) loader_version_range=[4,) -jei_version=19.19.6.236 -rei_version=14.0.688 -emi_version=1.1.13 +jei_version=19.21.0.247 +emi_version=1.1.18 cloth_config_version=15.0.127 top_version=12.0.3-5 -kubejs_version=2101.7.0-build.171 -rhino_version=2101.2.5-build.54 -architectury_version=13.0.6 +kubejs_version=2101.7.1-build.181 +rhino_version=2101.2.7-build.74 +architectury_version=13.0.8 -parchment_minecraft_version=1.21 -parchment_mappings_version=2024.07.28 \ No newline at end of file +parchment_minecraft_version=1.21.1 +parchment_mappings_version=2024.11.17 \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/compat/rei/ExDeorumReiPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/rei/ExDeorumReiPlugin.java deleted file mode 100644 index 27e4ba69..00000000 --- a/src/main/java/thedarkcolour/exdeorum/compat/rei/ExDeorumReiPlugin.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Ex Deorum - * Copyright (c) 2024 thedarkcolour - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package thedarkcolour.exdeorum.compat.rei; - -import me.shedaniel.rei.api.client.entry.filtering.base.BasicFilteringRule; -import me.shedaniel.rei.api.client.plugins.REIClientPlugin; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; -import me.shedaniel.rei.forge.REIPluginClient; -import net.minecraft.world.item.ItemStack; -import thedarkcolour.exdeorum.compat.CompatUtil; - -@SuppressWarnings("UnstableApiUsage") -@REIPluginClient -public class ExDeorumReiPlugin implements REIClientPlugin { - @Override - public void registerBasicEntryFiltering(BasicFilteringRule rule) { - rule.hide(() -> { - var builder = EntryIngredient.builder(); - - for (var barrel : CompatUtil.getAvailableBarrels(false)) { - builder.add(EntryStack.of(VanillaEntryTypes.ITEM, new ItemStack(barrel))); - } - for (var sieve : CompatUtil.getAvailableSieves(false, false)) { - builder.add(EntryStack.of(VanillaEntryTypes.ITEM, new ItemStack(sieve))); - } - for (var crucible : CompatUtil.getAvailableLavaCrucibles(false)) { - builder.add(EntryStack.of(VanillaEntryTypes.ITEM, new ItemStack(crucible))); - } - for (var crucible : CompatUtil.getAvailableWaterCrucibles(false)) { - builder.add(EntryStack.of(VanillaEntryTypes.ITEM, new ItemStack(crucible))); - } - return builder.build(); - }); - } -} diff --git a/src/main/java/thedarkcolour/exdeorum/compat/rei/package-info.java b/src/main/java/thedarkcolour/exdeorum/compat/rei/package-info.java deleted file mode 100644 index 20fd902d..00000000 --- a/src/main/java/thedarkcolour/exdeorum/compat/rei/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Ex Deorum - * Copyright (c) 2024 thedarkcolour - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -@net.minecraft.MethodsReturnNonnullByDefault -@javax.annotation.ParametersAreNonnullByDefault -package thedarkcolour.exdeorum.compat.rei;