From fecb09c0bef154a8c55c52eff67ece593bb39981 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Wed, 27 May 2026 18:19:44 -0400 Subject: [PATCH 1/2] Guard against crashes caused by invalid metadata --- .../fox/spiteful/forbidden/items/wands/ItemWandCaps.java | 7 +++++-- .../fox/spiteful/forbidden/items/wands/ItemWandCores.java | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java index 0041126..88b44d5 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java @@ -35,12 +35,13 @@ public void registerIcons(IIconRegister ir) { @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamage(int meta) { + if (meta >= icon.length) meta = 0; return this.icon[meta]; } @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item item, CreativeTabs xCreativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs xCreativeTabs, List list) { for (int x = 0; x < types.length; x++) { list.add(new ItemStack(this, 1, x)); } @@ -48,6 +49,8 @@ public void getSubItems(Item item, CreativeTabs xCreativeTabs, List list) { @Override public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + types[stack.getItemDamage()]; + int meta = stack.getItemDamage(); + if (meta >= types.length) meta = 0; + return super.getUnlocalizedName() + "." + types[meta]; } } diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java index 7e7440f..1eba05d 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java @@ -45,6 +45,7 @@ public void registerIcons(IIconRegister ir) { @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamage(int meta) { + if (meta >= icon.length) meta = 0; return this.icon[meta]; } @@ -97,6 +98,8 @@ private static ItemStack buildWand(WandCap cap, WandRod rod) { @Override public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + types[stack.getItemDamage()]; + int meta = stack.getItemDamage(); + if (meta >= types.length) meta = 0; + return super.getUnlocalizedName() + "." + types[meta]; } } From c5eac9787345df07754f3edb373c39a5527240f9 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Wed, 27 May 2026 18:25:54 -0400 Subject: [PATCH 2/2] Clean deps and update deps/bs --- dependencies.gradle | 28 +++++++----------------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index e2aebda..341f037 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,26 +1,14 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GTNHLib:0.9.41:dev") - api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - api('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') - api("com.github.GTNewHorizons:GTNHLib:0.9.31:dev") + api("com.github.GTNewHorizons:GTNHLib:0.10.8:dev") + api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") + api("com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev") - compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.12:dev') - compileOnly('com.github.GTNewHorizons:Botania:1.13.15-GTNH:api') - compileOnly("com.github.GTNewHorizons:AppleCore:3.3.9:dev") + compileOnly("com.github.GTNewHorizons:BloodMagic:1.9.4:dev") + compileOnly("com.github.GTNewHorizons:Botania:1.13.21-GTNH:api") + compileOnly("com.github.GTNewHorizons:AppleCore:3.3.11:dev") + compileOnly("curse.maven:ee3-65509:2305023") - - compileOnly('curse.maven:ee3-65509:2305023') - - // deps may transitively add Baubles, so we replace it - project.getConfigurations() - .all(c -> { - final DependencySubstitutions ds = c.getResolutionStrategy() - .getDependencySubstitution(); - ds.substitute(ds.module("com.github.GTNewHorizons:Baubles")) - .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH")) - .withClassifier("dev") - .because("Baubles-Expanded replaces Baubles"); - }); + runtimeOnlyNonPublishable("com.github.GTNewHorizons:AspectRecipeIndex:1.1.0:dev") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6..dbc3ce4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index d1af453..407aea2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' }