Array Index Guard (#29)

This commit is contained in:
koolkrafter5 authored and GitHub committed 2026-05-28 00:45:49 +02:00
1 parent d09d78f0f0
commit fa46f39c7e
5 files changed
+19 -25

No files matched your search

+8 -20
View File
@@ -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")
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
}
@@ -35,12 +35,13 @@ public class ItemWandCaps extends Item {
@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<ItemStack> list) {
for (int x = 0; x < types.length; x++) {
list.add(new ItemStack(this, 1, x));
}
@@ -48,6 +49,8 @@ public class ItemWandCaps extends Item {
@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];
}
}
@@ -45,6 +45,7 @@ public class ItemWandCores extends Item {
@SideOnly(Side.CLIENT)
@Override
public IIcon getIconFromDamage(int meta) {
if (meta >= icon.length) meta = 0;
return this.icon[meta];
}
@@ -97,6 +98,8 @@ public class ItemWandCores extends Item {
@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];
}
}