diff --git a/gradle.properties b/gradle.properties index 8e6429748ea..4d333111948 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ artifact_basename=appliedenergistics2-neoforge minecraft_release=1.21 minecraft_version=1.21 minecraft_version_range=1.21 -neoforge_version=21.0.0-beta +neoforge_version=21.0.13-beta neoforge_version_range=[21.0.0-beta,) ######################################################### @@ -32,19 +32,19 @@ top_version=1.20.4_neo-11.0.1-2 emi_version=1.1.4+1.20.4 # please learn how to use semver... top_version_range=[1.20.0,) -jade_version_range=[12.1.0,) -rei_version=14.0.688 -wthit_version=10.0.1 -jade_file_id=5109393 +jade_version_range=[15.0.0,) +rei_version=16.0.729 +wthit_version=12.1.2 +jade_file_id=5427817 curios_version=7.1.0+1.20.4 # Pick which item list mod gets picked at runtime in dev # Available options: emi, rei, none -runtime_itemlist_mod=none +runtime_itemlist_mod=rei # Set to wthit, jade, top or none to pick which tooltip mod gets picked at runtime # for the dev environment. -runtime_tooltip_mod=none +runtime_tooltip_mod=jade # Set to true to use Curio at runtime runtime_curio=false diff --git a/src/main/java/appeng/integration/modules/jade/BodyProviderAdapter.java b/src/main/java/appeng/integration/modules/jade/BodyProviderAdapter.java index cdd3cd1cff8..547272644d1 100644 --- a/src/main/java/appeng/integration/modules/jade/BodyProviderAdapter.java +++ b/src/main/java/appeng/integration/modules/jade/BodyProviderAdapter.java @@ -6,7 +6,7 @@ import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.ITooltip; -import snownee.jade.api.Identifiers; +import snownee.jade.api.JadeIds; import snownee.jade.api.config.IPluginConfig; import appeng.api.integrations.igtooltip.providers.BodyProvider; @@ -28,8 +28,8 @@ public BodyProviderAdapter(ResourceLocation id, int priority, BodyProvider line = tooltip.get(i, align); for (int j = 0; j < line.size(); j++) { IElement el = line.get(j); - if (Identifiers.CORE_MOD_NAME.equals(el.getTag())) { + if (JadeIds.CORE_MOD_NAME.equals(el.getTag())) { line.set(j, IElementHelper.get().text( Component.literal(modName) .withStyle(IWailaConfig.get().getFormatting().getItemModNameStyle()))); diff --git a/src/main/java/appeng/integration/modules/jade/NameProviderAdapter.java b/src/main/java/appeng/integration/modules/jade/NameProviderAdapter.java index d38d8b99b82..24d58006207 100644 --- a/src/main/java/appeng/integration/modules/jade/NameProviderAdapter.java +++ b/src/main/java/appeng/integration/modules/jade/NameProviderAdapter.java @@ -6,7 +6,7 @@ import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.ITooltip; -import snownee.jade.api.Identifiers; +import snownee.jade.api.JadeIds; import snownee.jade.api.config.IPluginConfig; import appeng.api.integrations.igtooltip.providers.NameProvider; @@ -32,7 +32,7 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi // Replace the object name if (name != null) { - tooltip.remove(Identifiers.CORE_OBJECT_NAME); + tooltip.remove(JadeIds.CORE_OBJECT_NAME); tooltip.add(0, name.copy().withStyle(style -> { // Don't overwrite a text color if one is present if (style.getColor() == null) { @@ -40,7 +40,7 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi } else { return style; } - }), Identifiers.CORE_OBJECT_NAME); + }), JadeIds.CORE_OBJECT_NAME); } } }