Added in road line recipes, clears #9

This commit is contained in:
Fenn committed 2014-06-09 21:32:33 +01:00
1 parent 6026e2f7ec
commit 759be8775f
4 files changed
+29 -11

No files matched your search

+11 -2
View File
@@ -1,5 +1,13 @@
buildscript {
repositories {
maven {
name 'CB Maven FS'
url "http://chickenbones.net/maven/"
}
mavenCentral()
maven {
name = "forge"
@@ -13,12 +21,13 @@ buildscript {
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}
apply plugin: 'forge'
version = "1.5.4d"
group= "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Chisel"
minecraft {
@@ -33,7 +42,7 @@ processResources
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
expand 'version': project.version, 'mcversion': project.minecraft.version
}
// copy everything else, thats not the mcmod.info
@@ -36,7 +36,7 @@ import net.minecraftforge.common.config.Configuration;
import java.io.File;
@Mod(modid = "chisel", name = "Chisel", version = "1.5.4e")
@Mod(modid = "chisel", name = "Chisel", version = "1.5.4e", dependencies = "after:ForgeMicroblock;")
public class Chisel
{
public static ItemChisel chisel;
@@ -47,6 +47,8 @@ public class Chisel
public static CreativeTabs tabChisel;
public static boolean multipartLoaded = false;
public static boolean configExists;
public static boolean oldPillars;
public static boolean disableCTM;
@@ -1,5 +1,7 @@
package info.jbcs.minecraft.chisel;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import info.jbcs.minecraft.chisel.block.*;
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
@@ -9,10 +11,10 @@ import info.jbcs.minecraft.chisel.item.ItemMarbleSlab;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraftforge.oredict.ShapedOreRecipe;
public class ChiselBlocks
{
@@ -98,6 +100,12 @@ public class ChiselBlocks
OreDictionary.registerOre("blockMarble", blockMarble);
Carving.chisel.registerOre("marble", "blockMarble");
if(Chisel.multipartLoaded)
{
// 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);
blockMarbleSlab.carverHelper.setBlockName("Marble Slab");
blockMarbleSlab.carverHelper.addVariation("Raw marble slab", 0, "marble");
@@ -416,6 +424,7 @@ public class ChiselBlocks
{
blockRoadLine = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setHardness(0.01F).setBlockName("roadLine");
GameRegistry.registerBlock(blockRoadLine, ItemCarvable.class, "roadLine");
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockRoadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone}));
LanguageRegistry.addName(new ItemStack(blockRoadLine, 1, 0), "Road lines");
}
@@ -81,7 +81,8 @@ public class CTM
public static int getTexture(IBlockAccess world, int x, int y, int z, int side)
{
if(world == null) return 0;
if(world == null)
return 0;
int texture = 0;
Block block = world.getBlock(x, y, z);
@@ -283,11 +284,8 @@ public class CTM
break;
}
return
world.getBlock(x, y, z).equals(block) &&
world.getBlockMetadata(x, y, z) == meta &&
(!world.getBlock(x2, y2, z2).equals(block) || world.getBlockMetadata(x2, y2, z2) != meta)
;
return world.getBlock(x, y, z).equals(block) && world.getBlockMetadata(x, y, z) == meta && (!world.getBlock(x2, y2, z2).equals(block) || world.getBlockMetadata(x2, y2, z2) != meta);
}