mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-17 03:05:10 +00:00
Fixed the crash bug in the latest forge, i think.
This commit is contained in:
1 parent
8312a8eb81
commit
0780f7169a
6 files changed
+31
-26
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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<String, CarvingGroup> carvingGroupsByName = new HashMap<String, CarvingGroup>();
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user