Skip to content

Commit

Permalink
Fix NPE for non-OreDict entries
Browse files Browse the repository at this point in the history
  • Loading branch information
glowredman committed Jan 17, 2021
1 parent 38a635b commit 15c95c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
11 changes: 2 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply plugin: 'forge'
sourceCompatibility = 1.8
targetCompatibility = 1.8

version = "1.0"
group= "glowredman.wherearetheores" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
version = "1.0.1"
group= "glowredman.wherearetheores"
archivesBaseName = "WhereAreTheOres"

minecraft {
Expand All @@ -46,19 +46,12 @@ dependencies {

processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public void loadCraftingRecipes(ItemStack result) {
// decode ore:
List<ItemStack> decodedOres = new ArrayList<ItemStack>();
if (key.startsWith("[")) {
key.replaceFirst("[", "");
for (String item : key.split(";")) {
for (String item : key.substring(1).split(";")) {
decodedOres.add(WATO.findItem(item));
}
} else {
Expand Down

0 comments on commit 15c95c1

Please sign in to comment.