diff --git a/build.gradle b/build.gradle index 526d3cf7..e7eed662 100644 --- a/build.gradle +++ b/build.gradle @@ -45,24 +45,24 @@ 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 + { + // 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 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 - } + // 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' - } -} + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } // some crazy stuff to make sure the chicken stuff is in the mods folder... // because it wont work otherwise... because FML doesnt laod coremods from the classpath diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 452586e2..abaccda4 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -82,43 +82,40 @@ public class Chisel } // Fix mapping of snakestoneSand, snakestoneStone, limestoneStairs, marbleStairs when loading an old (1.5.4) save - else if (m.type == Type.BLOCK) + else if(m.type == Type.BLOCK) { Block block = null; - if (General.cleanTags(m.name).equals("sandSnakestone")) + if(General.cleanTags(m.name).equals("sandSnakestone")) block = GameRegistry.findBlock(Chisel.MOD_ID, "tile.snakestoneSand"); - else if (General.cleanTags(m.name).equals("snakestone")) + else if(General.cleanTags(m.name).equals("snakestone")) block = GameRegistry.findBlock(Chisel.MOD_ID, "tile.snakestoneStone"); else block = GameRegistry.findBlock(Chisel.MOD_ID, General.cleanTags(m.name)); - if (block != null) + if(block != null) { m.remap(block); FMLLog.getLogger().info("Remapping block " + m.name + " to " + General.getName(block)); - } - else + } else FMLLog.getLogger().warn("Block " + m.name + " could not get remapped."); - } - else if (m.type == Type.ITEM) + } else if(m.type == Type.ITEM) { Item item = null; - if (General.cleanTags(m.name).equals("sandSnakestone")) + if(General.cleanTags(m.name).equals("sandSnakestone")) item = GameRegistry.findItem(Chisel.MOD_ID, "tile.snakestoneSand"); - else if (General.cleanTags(m.name).equals("snakestone")) + else if(General.cleanTags(m.name).equals("snakestone")) item = GameRegistry.findItem(Chisel.MOD_ID, "tile.snakestoneStone"); else item = GameRegistry.findItem(Chisel.MOD_ID, General.cleanTags(m.name)); - if (item != null) + if(item != null) { m.remap(item); FMLLog.getLogger().info("Remapping item " + m.name + " to " + General.getName(item)); - } - else + } else FMLLog.getLogger().warn("Item " + m.name + " could not get remapped."); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java index cf76659c..0f9e4ade 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java @@ -43,8 +43,8 @@ public class GuiChisel extends GuiContainer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - String line = isExtended() ? - I18n.format(this.container.inventory.getInventoryName() + ".titleShort") : + String line = isExtended() ? + I18n.format(this.container.inventory.getInventoryName() + ".titleShort") : I18n.format(this.container.inventory.getInventoryName() + ".title"); fontRendererObj.drawString(line, 88 - fontRendererObj.getStringWidth(line) / 2, 13, 0x404040); }