From 0780f7169a413b667bc8b55cc44b09d34169d558 Mon Sep 17 00:00:00 2001 From: Fenn Date: Sat, 14 Jun 2014 10:49:32 +0100 Subject: [PATCH] Fixed the crash bug in the latest forge, i think. --- build.gradle | 9 ++------- .../info/jbcs/minecraft/chisel/Chisel.java | 2 +- .../jbcs/minecraft/chisel/ChiselBlocks.java | 19 ++++++++++++++++--- .../minecraft/chisel/block/BlockCarvable.java | 15 ++++++--------- .../minecraft/chisel/carving/Carving.java | 10 +++++----- src/main/resources/mcmod.info | 2 +- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index ee8a04ba..c79a9d6a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,6 @@ buildscript { repositories { - maven { - name 'CB Maven FS' - url "http://chickenbones.net/maven/" - } - mavenCentral() maven { name = "forge" @@ -26,12 +21,12 @@ buildscript { apply plugin: 'forge' -version = "1.5.4d" +version = "1.5.4f" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel" minecraft { - version = "1.7.2-10.12.0.1056" + version = "1.7.2-10.12.2.1124" assetDir = "eclipse/assets" } diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 3bc55d7b..54c6052c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -36,7 +36,7 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; -@Mod(modid = "chisel", name = "Chisel", version = "1.5.4e", dependencies = "after:ForgeMicroblock;") +@Mod(modid = "chisel", name = "Chisel", version = "1.5.4f", dependencies = "after:ForgeMicroblock;") public class Chisel { public static ItemChisel chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 1810f31b..02f7890a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -63,6 +63,7 @@ public class ChiselBlocks public static BlockCarvable blockTemple; public static BlockCarvable blockTempleMossy; public static BlockCarvable blockFactory; + public static BlockCarvablePane blockPaperwall; public static BlockSnakestone blockSnakestone; public static BlockSnakestone blockSandSnakestone; @@ -102,8 +103,8 @@ public class ChiselBlocks if(Chisel.multipartLoaded) { - // for(int i = 0; i < 16; i++) - // MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(blockMarble, i), "blockMarble" + i); + // for(int i = 0; i < 16; i++) + // MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(blockMarble, i), "blockMarble" + i); } blockMarbleSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockMarble).setHardness(2.0F).setResistance(10F); @@ -1177,11 +1178,23 @@ public class ChiselBlocks Carving.chisel.registerOre(blockName, oreName); for(CarvableVariation cv : blockStainedGlassPane[glassId].carverHelper.variations) { - if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 8) continue; + if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 8) + continue; blockStainedGlassPane[glassId].carverHelper.registerVariation(blockName, cv, blockStainedGlassPane[glassId], cv.metadata); } } + if(Chisel.featureEnabled("paperWall")) + { + //blockPaperwall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(Chisel.tabChisel).setHardness(2.0F).setResistance(10F); + //blockFactory.carverHelper.setBlockName("Paperwall"); + //blockFactory.carverHelper.addVariation("Basic paperwall", 0, "paper/basic"); + + + //blockTempleMossy.carverHelper.register(blockPaperwall, "paperwall"); + + } + Blocks.stone.setHarvestLevel("chisel", 0, 0); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index d7de72f1..f90f02e6 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -1,14 +1,11 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.Chisel; - -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,6 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import java.util.List; + public class BlockCarvable extends Block implements ICarvable { public CarvableHelper carverHelper; @@ -30,9 +29,7 @@ public class BlockCarvable extends Block implements ICarvable public BlockCarvable(Material m) { super(m); - carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index 1a913907..2089b56a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -1,15 +1,15 @@ package info.jbcs.minecraft.chisel.carving; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; + public class Carving { HashMap carvingGroupsByName = new HashMap(); @@ -105,7 +105,7 @@ public class Carving // Check name first CarvingGroup res; - if((res = carvingGroupsByOre.get(OreDictionary.getOreName(OreDictionary.getOreID(new ItemStack(block, 1, metadata))))) != null) + if((res = carvingGroupsByOre.get(OreDictionary.getOreIDs(new ItemStack(block, 1, metadata)))) != null) return res; if((res = carvingGroupsByVariation.get(key(block, metadata))) != null) diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3996c18e..34e944e6 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "chisel", "name": "Chisel", "description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.", - "version": "1.5.4e", + "version": "1.5.4f", "credits": "This mod uses a lot of textures from the Painterly pack: http://painterlypack.net/. Also one stone variation is designed to look like a block from Doku. Oh, and asie for porting the mod to 1.7.2", "logoFile": "", "mcversion": "1.7.2",