From d3ad2a78a6e14086b938124584d14389b6053291 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Fri, 14 Jun 2024 22:54:38 +0100 Subject: [PATCH] Update Jade dep version to 1.21 --- build.gradle | 6 +++--- gradle.properties | 4 ++-- .../WailaIntegration.java => jade/JadeIntegration.java} | 4 ++-- .../{waila => jade}/RouterComponentProvider.java | 6 +++--- .../integration/{waila => jade}/RouterDataProvider.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/me/desht/modularrouters/integration/{waila/WailaIntegration.java => jade/JadeIntegration.java} (86%) rename src/main/java/me/desht/modularrouters/integration/{waila => jade}/RouterComponentProvider.java (93%) rename src/main/java/me/desht/modularrouters/integration/{waila => jade}/RouterDataProvider.java (97%) diff --git a/build.gradle b/build.gradle index a9e2b9fe..b9fe31ec 100644 --- 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 index 54e6aa1f..f8052b2f 100644 --- 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/src/main/java/me/desht/modularrouters/integration/waila/WailaIntegration.java b/src/main/java/me/desht/modularrouters/integration/jade/JadeIntegration.java similarity index 86% rename from src/main/java/me/desht/modularrouters/integration/waila/WailaIntegration.java rename to src/main/java/me/desht/modularrouters/integration/jade/JadeIntegration.java index 3da8eea0..7669c633 100644 --- a/src/main/java/me/desht/modularrouters/integration/waila/WailaIntegration.java +++ b/src/main/java/me/desht/modularrouters/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/src/main/java/me/desht/modularrouters/integration/waila/RouterComponentProvider.java b/src/main/java/me/desht/modularrouters/integration/jade/RouterComponentProvider.java similarity index 93% rename from src/main/java/me/desht/modularrouters/integration/waila/RouterComponentProvider.java rename to src/main/java/me/desht/modularrouters/integration/jade/RouterComponentProvider.java index a3d9a4ea..579c74ef 100644 --- a/src/main/java/me/desht/modularrouters/integration/waila/RouterComponentProvider.java +++ b/src/main/java/me/desht/modularrouters/integration/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,7 +26,7 @@ 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))); } @@ -34,7 +34,7 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi 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/src/main/java/me/desht/modularrouters/integration/waila/RouterDataProvider.java b/src/main/java/me/desht/modularrouters/integration/jade/RouterDataProvider.java similarity index 97% rename from src/main/java/me/desht/modularrouters/integration/waila/RouterDataProvider.java rename to src/main/java/me/desht/modularrouters/integration/jade/RouterDataProvider.java index dbed21eb..3a45de6f 100644 --- a/src/main/java/me/desht/modularrouters/integration/waila/RouterDataProvider.java +++ b/src/main/java/me/desht/modularrouters/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;