Update Jade dep version to 1.21

desht · Jun 14, 2024 · d3ad2a7 · d3ad2a7
1 parent 8fa5a00
commit d3ad2a7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -105,14 +105,14 @@ dependencies {
         transitive = false
     }
 
-    compileOnly "curse.maven:jade-324717:${jade_curse_id}"
+    implementation "curse.maven:jade-324717:${jade_curse_id}"
 
     compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
     //runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
 
 
-    compileOnly "mezz.jei:jei-1.20.4-common-api:${jei_version}"
-    compileOnly "mezz.jei:jei-1.20.4-neoforge-api:${jei_version}"
+    compileOnly "mezz.jei:jei-1.20.6-common-api:${jei_version}"
+    compileOnly "mezz.jei:jei-1.20.6-neoforge-api:${jei_version}"
 //    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
 //    compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
     //runtimeOnly "mezz.jei:jei-${minecraft_version}-common:${jei_version}"

diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@ neogradle.subsystems.parchment.minecraftVersion=1.20.6
 neogradle.subsystems.parchment.mappingsVersion=2024.06.02
 
 # Dependencies
-jei_version=17.3.0.48
-jade_curse_id=5366595
+jei_version=18.0.0.62
+jade_curse_id=5427817
 top_version=1.20.5_neo-11.1.1-2
 patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT
diff --git a/...s/integration/waila/WailaIntegration.java → ...ers/integration/jade/JadeIntegration.java b/...s/integration/waila/WailaIntegration.java → ...ers/integration/jade/JadeIntegration.java
@@ -1,4 +1,4 @@
-package me.desht.modularrouters.integration.waila;
+package me.desht.modularrouters.integration.jade;
 
 import me.desht.modularrouters.block.ModularRouterBlock;
 import me.desht.modularrouters.block.tile.ModularRouterBlockEntity;
@@ -8,7 +8,7 @@
 import snownee.jade.api.WailaPlugin;
 
 @WailaPlugin
-public class WailaIntegration implements IWailaPlugin {
+public class JadeIntegration implements IWailaPlugin {
     @Override
     public void register(IWailaCommonRegistration registration) {
         registration.registerBlockDataProvider(new RouterDataProvider(), ModularRouterBlockEntity.class);

diff --git a/...ration/waila/RouterComponentProvider.java → ...gration/jade/RouterComponentProvider.java b/...ration/waila/RouterComponentProvider.java → ...gration/jade/RouterComponentProvider.java
@@ -1,4 +1,4 @@
-package me.desht.modularrouters.integration.waila;
+package me.desht.modularrouters.integration.jade;
 
 import me.desht.modularrouters.block.tile.ModularRouterBlockEntity;
 import me.desht.modularrouters.logic.settings.RedstoneBehaviour;
@@ -26,15 +26,15 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi
                 }
                 CompoundTag upgrades = data.getCompound("Upgrades");
                 if (!upgrades.isEmpty()) {
-                    iTooltip.add(xlate("modularrouters.itemText.misc.upgrades"));
+                    iTooltip.add(xlate("modularrouters.itemText.misc.upgrades").append(":"));
                     for (String k : upgrades.getAllKeys()) {
                         iTooltip.add(xlate("modularrouters.itemText.misc.upgradeCount", upgrades.getInt(k), xlate(k)));
                     }
                 }
                 RedstoneBehaviour rrb = RedstoneBehaviour.values()[data.getInt("RedstoneMode")];
                 iTooltip.add(xlate("modularrouters.guiText.tooltip.redstone.label")
                         .append(": " + ChatFormatting.AQUA)
-                        .append(xlate("modularrouters.guiText.tooltip.redstone." + rrb))
+                        .append(xlate(rrb.getTranslationKey()))
                 );
                 if (data.getBoolean("EcoMode")) {
                     iTooltip.add(xlate("modularrouters.itemText.misc.ecoMode").withStyle(ChatFormatting.GREEN));

diff --git a/...integration/waila/RouterDataProvider.java → .../integration/jade/RouterDataProvider.java b/...integration/waila/RouterDataProvider.java → .../integration/jade/RouterDataProvider.java
@@ -1,4 +1,4 @@
-package me.desht.modularrouters.integration.waila;
+package me.desht.modularrouters.integration.jade;
 
 import me.desht.modularrouters.block.tile.ModularRouterBlockEntity;
 import me.desht.modularrouters.item.upgrade.UpgradeItem;