Bump to latest Jade/REI/WTHIT (#7917)

AppliedEnergistics · Jun 16, 2024 · 4dced9a · 4dced9a
1 parent f43269a
commit 4dced9a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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<? sup
 
     @Override
     public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfig config) {
-        tooltip.remove(Identifiers.UNIVERSAL_ENERGY_STORAGE_DETAILED);
-        tooltip.remove(Identifiers.UNIVERSAL_FLUID_STORAGE_DETAILED);
+        tooltip.remove(JadeIds.UNIVERSAL_ENERGY_STORAGE_DETAILED);
+        tooltip.remove(JadeIds.UNIVERSAL_FLUID_STORAGE_DETAILED);
 
         var context = ContextHelper.getContext(accessor);
         var tooltipBuilder = new JadeTooltipBuilder(tooltip);

diff --git a/src/main/java/appeng/integration/modules/jade/ModNameProviderAdapter.java b/src/main/java/appeng/integration/modules/jade/ModNameProviderAdapter.java
@@ -8,7 +8,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 snownee.jade.api.config.IWailaConfig;
 import snownee.jade.api.ui.IElement;
@@ -40,7 +40,7 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi
                     List<IElement> 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
@@ -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,15 +32,15 @@ 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) {
                     return style.withColor(ChatFormatting.WHITE);
                 } else {
                     return style;
                 }
-            }), Identifiers.CORE_OBJECT_NAME);
+            }), JadeIds.CORE_OBJECT_NAME);
         }
     }
 }