diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-05-13 23:40:44 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-05-13 23:40:44 +0100 |
| commit | 31f1b76453435be4fd57a95a6a3001928d4a2b59 (patch) | |
| tree | 9da0e6e7bcef0fad509d83845e4edcdfbae06a6f | |
| parent | 9d08d6c58a0622d31494d612d5b401a1fed186df (diff) | |
Minor change
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index acb2502..6d00cb8 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'curseforge' project.ext { massive = "1" major = "0" - minor = "9" + minor = "10" mcVersion = "1.7.10" } @@ -40,7 +40,7 @@ targetCompatibility = JavaVersion.VERSION_1_8 minecraft { version = "1.7.10-10.13.3.1395-1710ls" - assetDir = "minecraft/assets" + runDir = "minecraft/assets" // replacing stuff in the source replace '@MASSIVE@', project.massive @@ -70,7 +70,7 @@ processResources{ } curse { - apiKey = System.getenv("onyxdarkknight_curse") + apiKey = project.curseForgeApiKey projectId = "229927" // my project url is http://minecraft.curseforge.com/mc-mods/229927-jewelrycraft-2 changelog = new File('changelog.txt').text releaseType = "release" diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java index 30b6f64..fb94b25 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java @@ -88,7 +88,7 @@ public class GuiJewelryModifier extends GuiContainer if (this.searchField.textboxKeyTyped(character, key)){ int items = 0; for(ItemStack item: JewelrycraftUtil.objects) - if (item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++; + if (item != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++; maxPages = items / 48 + 1; page = 1; this.pages.setText(page + "/" + maxPages); |