From 3c3a9c299f0106cb36dde96e5b53339b48c14268 Mon Sep 17 00:00:00 2001 From: "Plamen K. Kosseff" Date: Sun, 17 Oct 2021 13:32:37 +0300 Subject: [PATCH 1/2] Add integration with Inventory Profiles Next for End Stone Smelter. --- build.gradle | 2 + gradle.properties | 39 ++++++++++--------- .../gui/EndStoneSmelterScreenHandler.java | 2 + 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index d38d26c9..dd3b8c1b 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,7 @@ dependencies { } else { useApi "com.github.paulevsGitch:BCLib:${project.bclib_version}" } + useApi "org.anti-ad.mc:inventory-profiles-next:fabric-1.17.1-${project.ipn_version}" useOptional "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" useOptional "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" @@ -70,6 +71,7 @@ def useApi(String dep) { dependencies.modApi(dep) { exclude group: 'net.fabricmc.fabric-api' exclude group: 'net.fabricmc' + exclude group: 'com.terraformersmc' if (!dep.contains("me.shedaniel")) { exclude group: 'me.shedaniel.cloth' exclude group: 'me.shedaniel' diff --git a/gradle.properties b/gradle.properties index e50bd3af..c6cb1cf5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,21 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx2G -# Fabric Properties -# check these on https://fabricmc.net/use -minecraft_version=1.17.1 -yarn_mappings=6 -loader_version=0.11.6 -# Mod Properties -mod_version=0.12.0-pre -maven_group=ru.betterend -archives_base_name=better-end -# Dependencies -# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -patchouli_version = 55-FABRIC-SNAPSHOT -fabric_version = 0.36.1+1.17 -bclib_version = 0.4.1 -rei_version = 6.0.264-alpha -canvas_version = 1.0.+ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx2G +# Fabric Properties +# check these on https://fabricmc.net/use +minecraft_version=1.17.1 +yarn_mappings=6 +loader_version=0.11.6 +# Mod Properties +mod_version=0.12.0-pre +maven_group=ru.betterend +archives_base_name=better-end + +# Dependencies +# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + +patchouli_version = 55-FABRIC-SNAPSHOT +fabric_version = 0.36.1+1.17 +bclib_version = 0.4.1 +rei_version = 6.0.264-alpha +canvas_version = 1.0.+ +ipn_version=1.1.0 diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java index b8c13e93..0ca2b76a 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java @@ -18,6 +18,7 @@ import net.minecraft.world.inventory.StackedContentsCompatible; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.Level; +import org.anti_ad.mc.ipn.api.IPNIgnore; import ru.betterend.BetterEnd; import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; @@ -25,6 +26,7 @@ import ru.betterend.client.gui.slot.SmelterFuelSlot; import ru.betterend.client.gui.slot.SmelterOutputSlot; import ru.betterend.recipe.builders.AlloyingRecipe; +@IPNIgnore public class EndStoneSmelterScreenHandler extends RecipeBookMenu { public final static MenuType HANDLER_TYPE = ScreenHandlerRegistry.registerSimple( From 6148bdc451493d23f06847747a83b6d28ac7888a Mon Sep 17 00:00:00 2001 From: Frank Bauer Date: Sun, 17 Oct 2021 18:45:35 +0200 Subject: [PATCH 2/2] Removed build-dependency to IPN --- build.gradle | 1 - gradle.properties | 1 - src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java diff --git a/build.gradle b/build.gradle index dd3b8c1b..a0d6479d 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ dependencies { } else { useApi "com.github.paulevsGitch:BCLib:${project.bclib_version}" } - useApi "org.anti-ad.mc:inventory-profiles-next:fabric-1.17.1-${project.ipn_version}" useOptional "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" useOptional "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" diff --git a/gradle.properties b/gradle.properties index c6cb1cf5..005d6133 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,3 @@ fabric_version = 0.36.1+1.17 bclib_version = 0.4.1 rei_version = 6.0.264-alpha canvas_version = 1.0.+ -ipn_version=1.1.0 diff --git a/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java b/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java new file mode 100644 index 00000000..b01c8a3f --- /dev/null +++ b/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java @@ -0,0 +1,8 @@ +package org.anti_ad.mc.ipn.api; + +import java.lang.annotation.*; + +// Included from "Inventory Profiles Next" (https://github.com/blackd/Inventory-Profiles) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface IPNIgnore {} \ No newline at end of file