Begin major feature structor overhaul. Just recipes left to do.

This commit is contained in:
tterrag1098 committed 2015-01-08 05:46:10 -05:00
1 parent 5cf9829e0c
commit bbeb991027
32 files changed
+424 -2116

No files matched your search

@@ -21,9 +21,11 @@ import com.cricketcraft.chisel.client.gui.GuiPresent;
import com.cricketcraft.chisel.compat.Compatibility;
import com.cricketcraft.chisel.compat.FMPIntegration;
import com.cricketcraft.chisel.compat.ModIntegration;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.init.ModTabs;
import com.cricketcraft.chisel.config.Configurations;
import com.cricketcraft.chisel.init.Features;
import com.cricketcraft.chisel.init.ChiselBlocks;
import com.cricketcraft.chisel.init.ChiselItems;
import com.cricketcraft.chisel.init.ChiselTabs;
import com.cricketcraft.chisel.inventory.ContainerAutoChisel;
import com.cricketcraft.chisel.inventory.ContainerChisel;
import com.cricketcraft.chisel.inventory.ContainerPresent;
@@ -140,16 +142,15 @@ public class Chisel {
Configurations.config.load();
Configurations.refreshConfig();
Features.preInit();
PacketHandler.init();
ModTabs.load();
ModBlocks.load();
ModItems.load();
ChiselTabs.load();
proxy.preInit();
}
@EventHandler
public void init(FMLInitializationEvent event) {
Crafting.init();
Features.init();
NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() {
@@ -190,11 +191,11 @@ public class Chisel {
}
});
GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.marble, 32, Configurations.marbleAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.andesite, 32, Configurations.andesiteAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.granite, 32, Configurations.graniteAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.diorite, 32, Configurations.dioriteAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.marble, 32, Configurations.marbleAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.limestone, 32, Configurations.limestoneAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.andesite, 32, Configurations.andesiteAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.granite, 32, Configurations.graniteAmount), 1000);
GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.diorite, 32, Configurations.dioriteAmount), 1000);
if (event.getSide() == Side.CLIENT) {
initModIntegration();
@@ -209,7 +210,6 @@ public class Chisel {
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
ModBlocks.postLoad();
ModIntegration.postInit();
Compatibility.init(event);
}
@@ -10,159 +10,161 @@ import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.config.Configurations;
import com.cricketcraft.chisel.init.ChiselBlocks;
import com.cricketcraft.chisel.init.ChiselItems;
import cpw.mods.fml.common.registry.GameRegistry;
public class Crafting {
public static void init() {
@Deprecated
private static void init() {
Block concreteRecipeBlock = Block.getBlockFromName(Configurations.config.get("tweaks", "concrete recipe block", "gravel",
"Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)").getString());
if (concreteRecipeBlock == null)
concreteRecipeBlock = Blocks.gravel;
if (Configurations.featureEnabled("concrete"))
FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ModBlocks.concrete), 0.1F);
FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.concrete), 0.1F);
if (Configurations.featureEnabled("sandstoneScribbles"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.sandstoneScribbles, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 8), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.sandstone_scribbles, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 8), });
for (int meta = 0; meta < 16; meta++) {
if (Configurations.featureEnabled("marble"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.marbleSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.marble, 1, meta) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.marble, 1, meta) });
if (Configurations.featureEnabled("limestone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.limestoneSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.limestone, 1, meta) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.limestone_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.limestone, 1, meta) });
if (Configurations.featureEnabled("marblePillar"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillarSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.marblePillar, 1, meta) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.marble_pillar, 1, meta) });
if (Configurations.featureEnabled("marblePillar"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillar, 6), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ModBlocks.marble, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar, 6), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble, 1, meta), });
if (Configurations.featureEnabled("marble"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.marble, 4), new Object[] { "XX", "XX", 'X', new ItemStack(ModBlocks.marblePillar, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble, 4), new Object[] { "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble_pillar, 1, meta), });
if (Configurations.featureEnabled("icePillar"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.icePillar, 6, 1), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ModBlocks.ice, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice_pillar, 6, 1), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice, 1, meta), });
if (Configurations.featureEnabled("ice"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.ice, 4, 1), new Object[] { "XX", "XX", 'X', new ItemStack(ModBlocks.icePillar, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice, 4, 1), new Object[] { "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice_pillar, 1, meta), });
if (Configurations.featureEnabled("sandstone"))
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstoneScribbles, 1, meta), });
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone_scribbles, 1, meta), });
if (Configurations.featureEnabled("carpet"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.carpet, 8, meta), new Object[] { "YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet_block, 8, meta), new Object[] { "YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta), });
if (Configurations.featureEnabled("carpetFloor"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.carpetFloor, 3, meta), new Object[] { "XX", 'X', new ItemStack(ModBlocks.carpet, 1, meta), });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet, 3, meta), new Object[] { "XX", 'X', new ItemStack(ChiselBlocks.carpet_block, 1, meta), });
}
// The following recipe is due to bugs with Chisel 1.5.1 to 1.5.6a
if (Configurations.featureEnabled("sandstone"))
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 0), });
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 0), });
// The following recipe is due to bug with Chisel 1.5.6b
if (Configurations.featureEnabled("sandstone"))
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 1), });
GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 1), });
if (Configurations.featureEnabled("holystone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.holystone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.holystone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1) });
if (Configurations.featureEnabled("grimstone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.grimstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.coal, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.grimstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.coal, 1) });
if (Configurations.featureEnabled("lavastone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.lavastone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.lavastone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1) });
if (Configurations.featureEnabled("waterstone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.waterstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.waterstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1) });
if (Configurations.featureEnabled("fantasy")) {
GameRegistry.addRecipe(new ItemStack(ModBlocks.fantasy, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fantasy2, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(ModBlocks.fantasy, 1), 'X', "dyeWhite" }));
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.fantasy, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.fantasyblock2, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(ChiselBlocks.fantasy, 1), 'X', "dyeWhite" }));
}
if (Configurations.featureEnabled("futuristicArmorPlating"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.tyrian, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.tyrian, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) });
if (Configurations.featureEnabled("templeBlock"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.temple, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.templeblock, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4) });
if (Configurations.featureEnabled("factory"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.factory, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X',
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X',
new ItemStack(Items.iron_ingot, 1) });
if (Configurations.featureEnabled("voidstone")) {
GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstone, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1), 'o',
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1), 'o',
new ItemStack(Blocks.obsidian, 1) });
GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstone2, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_eye, 1), 'o',
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone2, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_eye, 1), 'o',
new ItemStack(Blocks.obsidian, 1) });
}
if (Configurations.featureEnabled("voidstonePillars")) {
GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstonePillar, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ModBlocks.voidstone, 1) });
GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstonePillar2, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ModBlocks.voidstone2, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar2, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone2, 1) });
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.roadLine, 8, 0), new Object[] { "wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.road_line, 8, 0), new Object[] { "wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone }));
if (Configurations.chiselRecipe) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[] { " YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1, 1), new Object[] { " YY", " YY", "x ", 'x', "stickWood", 'Y', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1), new Object[] { " YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1, 1), new Object[] { " YY", " YY", "x ", 'x', "stickWood", 'Y', "ingotIron" }));
} else {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[] { " Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1, 1), new Object[] { " y", "x ", 'x', "stickWood", 'y', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1), new Object[] { " Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1, 1), new Object[] { " y", "x ", 'x', "stickWood", 'y', "ingotIron" }));
}
if (Configurations.featureEnabled("ballOfMoss"))
GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[] { "XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick });
GameRegistry.addRecipe(new ItemStack(ChiselItems.itemBallOMoss, 1), new Object[] { "XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick });
if (Configurations.featureEnabled("cloud"))
GameRegistry.addRecipe(new ItemStack(ModItems.itemCloudInABottle, 1), new Object[] { "X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz });
GameRegistry.addRecipe(new ItemStack(ChiselItems.itemCloudInABottle, 1), new Object[] { "X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz });
if (Configurations.featureEnabled("smashingrock"))
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.smashingRock, 16), new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1),
GameRegistry.addShapelessRecipe(new ItemStack(ChiselItems.smashingRock, 16), new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1),
new ItemStack(Items.stone_shovel) });
if (Configurations.featureEnabled("paperWall"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.paperWall, 8), new Object[] { "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall, 8), new Object[] { "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood" }));
String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" };
for (int i = 0; i < 16; i++) {
OreDictionary.registerOre("stainedClay" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, i));
OreDictionary.registerOre("blockWool" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, i));
if (Configurations.featureEnabled("woolenClay"))
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.woolenClay, 2, i), new Object[] { "blockWool" + sGNames[i].replaceAll(" ", ""),
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.woolen_clay, 2, i), new Object[] { "blockWool" + sGNames[i].replaceAll(" ", ""),
"stainedClay" + sGNames[i].replaceAll(" ", "") }));
}
if (Configurations.featureEnabled("laboratory"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.laboratory, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1) });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.laboratoryblock, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1) });
if (Configurations.autoChisel)
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.autoChisel, 1), new Object[] { "XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'),
ModItems.chisel }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.autoChisel, 1), new Object[] { "XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'),
ChiselItems.chisel }));
if (Configurations.featureEnabled("hexPlating"))
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hexPlating, 8, 0), new Object[] { "XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.hexPlating, 8, 0), new Object[] { "XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal" }));
if (Configurations.featureEnabled("bone"))
GameRegistry.addRecipe(new ItemStack(ModBlocks.bone, 4), new Object[] { "XX", "XX", 'X', Items.bone });
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.bone, 4), new Object[] { "XX", "XX", 'X', Items.bone });
if (Configurations.featureEnabled("pumpkin")) {
for (int x = 0; x < 16; x++) {
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.jackolantern[x]),
new Object[] { new ItemStack(ModBlocks.pumpkin[x], 1), new ItemStack(Item.getItemFromBlock(Blocks.torch), 1) });
GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.jackolantern[x]),
new Object[] { new ItemStack(ChiselBlocks.pumpkin[x], 1), new ItemStack(Item.getItemFromBlock(Blocks.torch), 1) });
}
}
if (Configurations.featureEnabled("technical")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y',
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y',
Items.iron_ingot }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', "ingotIron",
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', "ingotIron",
'z', Blocks.glass }));
}
if (Configurations.featureEnabled("chest")) {
for (int x = 0; x < 16; x++) {
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.present[x]), new Object[] { new ItemStack(Blocks.chest, 1), new ItemStack(Items.dye, 1, x) });
GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.present[x]), new Object[] { new ItemStack(Blocks.chest, 1), new ItemStack(Items.dye, 1, x) });
}
}
if (Configurations.featureEnabled("warningSign")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.sign, 4, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.sign, 4, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign }));
}
if (Configurations.featureEnabled("scorching")) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.scorching, 8, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.blaze_rod }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.scorching, 8, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.blaze_rod }));
}
if (Configurations.featureEnabled("coloredSand")) {
for (int x = 0; x < 16; x++) {
String[] dyes = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" };
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.coloredSand, 1, x), new Object[] { "sss", "sds", "sss", 's', Blocks.sand, 'd', "dye" + dyes[x] }));
GameRegistry.addSmelting(new ItemStack(ModBlocks.coloredSand, 1, x), new ItemStack(Blocks.stained_glass, 1, x), 0.3F);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.colored_sand, 1, x), new Object[] { "sss", "sds", "sss", 's', Blocks.sand, 'd', "dye" + dyes[x] }));
GameRegistry.addSmelting(new ItemStack(ChiselBlocks.colored_sand, 1, x), new ItemStack(Blocks.stained_glass, 1, x), 0.3F);
}
}
}
@@ -14,7 +14,7 @@ import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.api.ICarvable;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.carving.CarvableVariation;
import com.cricketcraft.chisel.init.ModTabs;
import com.cricketcraft.chisel.init.ChiselTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -33,7 +33,7 @@ public class BlockCarvable extends Block implements ICarvable {
carverHelper = new CarvableHelper();
setResistance(10.0F);
setHardness(2.0F);
setCreativeTab(ModTabs.tabOtherChiselBlocks);
setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
}
public BlockCarvable setStained(boolean a) {
@@ -13,7 +13,7 @@ import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.api.ICarvable;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.carving.CarvableVariation;
import com.cricketcraft.chisel.init.ModTabs;
import com.cricketcraft.chisel.init.ChiselTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -27,7 +27,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable {
super(Material.glass, false);
carverHelper = new CarvableHelper();
setCreativeTab(ModTabs.tabOtherChiselBlocks);
setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
}
public BlockCarvableGlass setStained(boolean a) {
@@ -13,7 +13,7 @@ import com.cricketcraft.chisel.api.ICarvable;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.carving.CarvableVariation;
import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer;
import com.cricketcraft.chisel.init.ModTabs;
import com.cricketcraft.chisel.init.ChiselTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -28,7 +28,7 @@ public class BlockCarvablePane extends BlockPane implements ICarvable {
carverHelper = new CarvableHelper();
setCreativeTab(ModTabs.tabOtherChiselBlocks);
setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
}
public BlockCarvablePane setStained(boolean a) {
@@ -14,7 +14,7 @@ import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.api.ICarvable;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.carving.CarvableVariation;
import com.cricketcraft.chisel.init.ModTabs;
import com.cricketcraft.chisel.init.ChiselTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -27,7 +27,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable {
public BlockCarvableSand() {
super();
carverHelper = new CarvableHelper();
setCreativeTab(ModTabs.tabOtherChiselBlocks);
setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
}
public BlockCarvableSand setStained(boolean a) {
@@ -9,7 +9,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.config.Configurations;
public class BlockCloud extends BlockCarvable {
@@ -4,8 +4,8 @@ import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.client.GeneralChiselClient;
import com.cricketcraft.chisel.config.Configurations;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
@@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ChiselBlocks;
public class BlockMarbleIceStairs extends BlockMarbleStairs {
@@ -20,12 +20,12 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs {
@Override
public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) {
ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
ChiselBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
}
@Override
public int quantityDropped(Random par1Random) {
return ModBlocks.ice.quantityDropped(par1Random);
return ChiselBlocks.ice.quantityDropped(par1Random);
}
@Override
@@ -35,7 +35,7 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs {
@Override
public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random);
ChiselBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random);
}
@Override
@@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import com.cricketcraft.chisel.carving.CarvableHelper;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ChiselBlocks;
public class BlockMarblePackedIceStairs extends BlockMarbleStairs {
@@ -20,12 +20,12 @@ public class BlockMarblePackedIceStairs extends BlockMarbleStairs {
@Override
public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) {
ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
ChiselBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
}
@Override
public int quantityDropped(Random par1Random) {
return ModBlocks.ice.quantityDropped(par1Random);
return ChiselBlocks.ice.quantityDropped(par1Random);
}
@Override
@@ -35,7 +35,7 @@ public class BlockMarblePackedIceStairs extends BlockMarbleStairs {
@Override
public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random);
ChiselBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random);
}
@Override
@@ -44,42 +44,7 @@ public class BlockPresent extends BlockChest implements ICarvable {
}
public String getKindOfChest(int type) {
switch (type) {
case 0:
return "textures/blocks/present/presentChest0";
case 1:
return "textures/blocks/present/presentChest1";
case 2:
return "textures/blocks/present/presentChest2";
case 3:
return "textures/blocks/present/presentChest3";
case 4:
return "textures/blocks/present/presentChest4";
case 5:
return "textures/blocks/present/presentChest5";
case 6:
return "textures/blocks/present/presentChest6";
case 7:
return "textures/blocks/present/presentChest7";
case 8:
return "textures/blocks/present/presentChest8";
case 9:
return "textures/blocks/present/presentChest9";
case 10:
return "textures/blocks/present/presentChest10";
case 11:
return "textures/blocks/present/presentChest11";
case 12:
return "textures/blocks/present/presentChest12";
case 13:
return "textures/blocks/present/presentChest13";
case 14:
return "textures/blocks/present/presentChest14";
case 15:
return "textures/blocks/present/presentChest15";
default:
return null;
}
return "textures/blocks/present/presentChest" + type;
}
private static boolean isCatSittingOnMe(World world, int x, int y, int z) {
@@ -248,7 +213,7 @@ public class BlockPresent extends BlockChest implements ICarvable {
}
@Override
public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int strength) {
public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int direction) {
if (!canProvidePower()) {
return 0;
} else {
@@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
import com.cricketcraft.chisel.carving.Carving;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.init.ChiselItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -26,7 +26,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
SPEED, AUTOMATION, STACK;
public String getUnlocalizedName() {
return ModItems.upgrade.getUnlocalizedName() + "_" + this.name().toLowerCase();
return ChiselItems.upgrade.getUnlocalizedName() + "_" + this.name().toLowerCase();
}
public String getLocalizedName() {
@@ -302,7 +302,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory
public boolean hasUpgrade(Upgrade upgrade) {
ItemStack stack = inventory[MIN_UPGRADE + upgrade.ordinal()];
if (stack != null) {
return stack.getItem() == ModItems.upgrade && stack.getItemDamage() == upgrade.ordinal();
return stack.getItem() == ChiselItems.upgrade && stack.getItemDamage() == upgrade.ordinal();
}
return false;
}
@@ -15,11 +15,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.block.BlockMarbleSlab;
import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM;
import com.cricketcraft.chisel.client.render.CTM;
import com.cricketcraft.chisel.client.render.TextureSubmap;
import com.cricketcraft.chisel.config.Configurations;
import com.cricketcraft.chisel.item.ItemCarvable;
import com.cricketcraft.chisel.utils.GeneralClient;
@@ -11,11 +11,11 @@ import net.minecraft.client.particle.EntityLavaFX;
import net.minecraft.entity.Entity;
import net.minecraft.world.World;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.block.BlockGrimstone;
import com.cricketcraft.chisel.block.BlockHolystone;
import com.cricketcraft.chisel.block.BlockLavastone;
import com.cricketcraft.chisel.block.BlockSnakestoneObsidian;
import com.cricketcraft.chisel.config.Configurations;
import com.cricketcraft.chisel.entity.fx.EntityBallOMossFX;
import com.cricketcraft.chisel.entity.fx.EntityGrimstoneFX;
import com.cricketcraft.chisel.entity.fx.EntityHolystoneFX;
@@ -5,7 +5,7 @@ import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.config.Configurations;
import cpw.mods.fml.client.config.GuiConfig;
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import com.cricketcraft.chisel.compat.ModIntegration.IModIntegration;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ChiselBlocks;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -17,73 +17,73 @@ public class FMPIntegration implements IModIntegration {
@Override
public void onInit() {
registerMaterial(ModBlocks.marble);
registerMaterial(ModBlocks.limestone);
registerMaterial(ModBlocks.cobblestone, 1, 15);
registerMaterial(ModBlocks.glass, 1, 15);
registerMaterial(ModBlocks.sandstone, 3, 15);
registerMaterial(ModBlocks.sandSnakestone, 1, 1);
registerMaterial(ModBlocks.sandSnakestone, 13, 13);
registerMaterial(ModBlocks.sandstoneScribbles);
registerMaterial(ModBlocks.concrete, 0, 10);
registerMaterial(ModBlocks.iron, 1, 15);
registerMaterial(ModBlocks.gold, 1, 14);
registerMaterial(ModBlocks.diamond, 1, 12);
registerMaterial(ModBlocks.lightstone, 1, 15); // This is glowstone
registerMaterial(ModBlocks.lapis, 1, 8);
registerMaterial(ModBlocks.emerald, 1, 11);
registerMaterial(ModBlocks.netherBrick, 1, 5);
registerMaterial(ModBlocks.netherrack, 1, 14);
registerMaterial(ModBlocks.cobblestoneMossy, 1, 15);
registerMaterial(ModBlocks.stoneBrick, 4, 15);
registerMaterial(ModBlocks.snakestone, 1, 1);
registerMaterial(ModBlocks.snakestone, 13, 13);
registerMaterial(ModBlocks.dirt, 0, 3);
registerMaterial(ModBlocks.dirt, 6, 7);
registerMaterial(ModBlocks.dirt, 11, 11);
registerMaterial(ModBlocks.ice, 1, 15);
registerMaterial(ModBlocks.icePillar);
registerMaterial(ChiselBlocks.marble);
registerMaterial(ChiselBlocks.limestone);
registerMaterial(ChiselBlocks.cobblestone, 1, 15);
registerMaterial(ChiselBlocks.glass, 1, 15);
registerMaterial(ChiselBlocks.sandstone, 3, 15);
registerMaterial(ChiselBlocks.sand_snakestone, 1, 1);
registerMaterial(ChiselBlocks.sand_snakestone, 13, 13);
registerMaterial(ChiselBlocks.sandstone_scribbles);
registerMaterial(ChiselBlocks.concrete, 0, 10);
registerMaterial(ChiselBlocks.iron_block, 1, 15);
registerMaterial(ChiselBlocks.gold_block, 1, 14);
registerMaterial(ChiselBlocks.diamond_block, 1, 12);
registerMaterial(ChiselBlocks.glowstone, 1, 15); // This is glowstone
registerMaterial(ChiselBlocks.lapis_block, 1, 8);
registerMaterial(ChiselBlocks.emerald_block, 1, 11);
registerMaterial(ChiselBlocks.nether_brick, 1, 5);
registerMaterial(ChiselBlocks.netherrack, 1, 14);
registerMaterial(ChiselBlocks.mossy_cobblestone, 1, 15);
registerMaterial(ChiselBlocks.stonebricksmooth, 4, 15);
registerMaterial(ChiselBlocks.stone_snakestone, 1, 1);
registerMaterial(ChiselBlocks.stone_snakestone, 13, 13);
registerMaterial(ChiselBlocks.dirt, 0, 3);
registerMaterial(ChiselBlocks.dirt, 6, 7);
registerMaterial(ChiselBlocks.dirt, 11, 11);
registerMaterial(ChiselBlocks.ice, 1, 15);
registerMaterial(ChiselBlocks.ice_pillar);
for (int x = 0; x < 4; x++) {
registerMaterial(ModBlocks.planks[x], 1, 15); // Oak, Spruce, Birch
registerMaterial(ChiselBlocks.planks[x], 1, 15); // Oak, Spruce, Birch
// and Jungle
}
// Accacia
registerMaterial(ModBlocks.planks[4], 1, 1);
registerMaterial(ModBlocks.planks[4], 2, 2);
registerMaterial(ModBlocks.planks[4], 6, 6);
registerMaterial(ModBlocks.planks[4], 8, 11);
registerMaterial(ModBlocks.planks[4], 13, 13);
registerMaterial(ChiselBlocks.planks[4], 1, 1);
registerMaterial(ChiselBlocks.planks[4], 2, 2);
registerMaterial(ChiselBlocks.planks[4], 6, 6);
registerMaterial(ChiselBlocks.planks[4], 8, 11);
registerMaterial(ChiselBlocks.planks[4], 13, 13);
// Dark Oak
registerMaterial(ModBlocks.planks[5], 1, 1);
registerMaterial(ModBlocks.planks[5], 2, 2);
registerMaterial(ModBlocks.planks[5], 6, 6);
registerMaterial(ModBlocks.planks[5], 8, 11);
registerMaterial(ModBlocks.planks[5], 13, 13);
registerMaterial(ChiselBlocks.planks[5], 1, 1);
registerMaterial(ChiselBlocks.planks[5], 2, 2);
registerMaterial(ChiselBlocks.planks[5], 6, 6);
registerMaterial(ChiselBlocks.planks[5], 8, 11);
registerMaterial(ChiselBlocks.planks[5], 13, 13);
registerMaterial(ModBlocks.obsidian, 1, 15);
registerMaterial(ModBlocks.obsidianSnakestone, 1, 1);
registerMaterial(ModBlocks.obsidianSnakestone, 13, 13);
registerMaterial(ModBlocks.redstone, 1, 15);
registerMaterial(ModBlocks.holystone, 0, 13);
registerMaterial(ModBlocks.carpet);
registerMaterial(ModBlocks.lavastone, 0, 6);
registerMaterial(ModBlocks.fantasy, 0, 1);
registerMaterial(ModBlocks.fantasy, 3, 14);
registerMaterial(ModBlocks.tyrian);
registerMaterial(ModBlocks.temple, 1, 2);
registerMaterial(ModBlocks.temple, 4, 15);
registerMaterial(ModBlocks.templeMossy, 1, 2);
registerMaterial(ModBlocks.templeMossy, 4, 15);
registerMaterial(ModBlocks.factory, 0, 12);
registerMaterial(ModBlocks.factory, 14, 14);
registerMaterial(ModBlocks.stainedGlass[0]); // White
registerMaterial(ModBlocks.woolenClay);
registerMaterial(ModBlocks.laboratory, 2, 3);
registerMaterial(ModBlocks.laboratory, 5, 12);
registerMaterial(ModBlocks.voidstone, 0, 3);
registerMaterial(ModBlocks.voidstone, 12, 15);
registerMaterial(ModBlocks.waterstone);
registerMaterial(ChiselBlocks.obsidian, 1, 15);
registerMaterial(ChiselBlocks.obsidian_snakestone, 1, 1);
registerMaterial(ChiselBlocks.obsidian_snakestone, 13, 13);
registerMaterial(ChiselBlocks.redstone_block, 1, 15);
registerMaterial(ChiselBlocks.holystone, 0, 13);
registerMaterial(ChiselBlocks.carpet_block);
registerMaterial(ChiselBlocks.lavastone, 0, 6);
registerMaterial(ChiselBlocks.fantasy, 0, 1);
registerMaterial(ChiselBlocks.fantasy, 3, 14);
registerMaterial(ChiselBlocks.tyrian);
registerMaterial(ChiselBlocks.templeblock, 1, 2);
registerMaterial(ChiselBlocks.templeblock, 4, 15);
registerMaterial(ChiselBlocks.mossy_templeblock, 1, 2);
registerMaterial(ChiselBlocks.mossy_templeblock, 4, 15);
registerMaterial(ChiselBlocks.factoryblock, 0, 12);
registerMaterial(ChiselBlocks.factoryblock, 14, 14);
registerMaterial(ChiselBlocks.stainedGlass[0]); // White
registerMaterial(ChiselBlocks.woolen_clay);
registerMaterial(ChiselBlocks.laboratoryblock, 2, 3);
registerMaterial(ChiselBlocks.laboratoryblock, 5, 12);
registerMaterial(ChiselBlocks.voidstone, 0, 3);
registerMaterial(ChiselBlocks.voidstone, 12, 15);
registerMaterial(ChiselBlocks.waterstone);
}
@Override
@@ -1,4 +1,10 @@
package com.cricketcraft.chisel;
package com.cricketcraft.chisel.config;
import java.util.Locale;
import org.apache.commons.lang3.StringUtils;
import com.cricketcraft.chisel.init.Features;
import net.minecraftforge.common.config.Configuration;
@@ -56,7 +62,24 @@ public class Configurations {
return true;
}
public static boolean featureEnabled(String feature) {
return config.get("features", feature, true).getBoolean(true) && refreshConfig();
public static boolean featureEnabled(Features feature) {
return config.get("features", featureName(feature), true).getBoolean(true) && refreshConfig();
}
// this makes the old camelCase names from the new CONSTANT_CASE names
private static String featureName (Features feature) {
String[] words = feature.name().toLowerCase(Locale.ENGLISH).split("_");
if (words.length == 1) {
return words[0];
}
String ret = words[0];
for (int i = 1; i < words.length; i++) {
ret += StringUtils.capitalize(words[i]);
}
return ret;
}
@Deprecated
public static boolean featureEnabled(String feature) {return false;}
}
@@ -9,7 +9,7 @@ import net.minecraft.world.World;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.client.GeneralChiselClient;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ChiselBlocks;
import com.cricketcraft.chisel.utils.General;
public class EntityBallOMoss extends EntityThrowable {
@@ -93,10 +93,10 @@ public class EntityBallOMoss extends EntityThrowable {
resBlock = Blocks.mossy_cobblestone;
} else if (block.equals(Blocks.cobblestone_wall) && meta == 0) {
resMeta = 1;
} else if (block.equals(ModBlocks.cobblestone)) {
resBlock = ModBlocks.cobblestoneMossy;
} else if (block.equals(ModBlocks.temple)) {
resBlock = ModBlocks.templeMossy;
} else if (block.equals(ChiselBlocks.cobblestone)) {
resBlock = ChiselBlocks.mossy_cobblestone;
} else if (block.equals(ChiselBlocks.templeblock)) {
resBlock = ChiselBlocks.mossy_templeblock;
} else if (block.equals(Blocks.stonebrick)) {
resMeta = 1;
}
@@ -7,7 +7,7 @@ import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ChiselBlocks;
public class EntityCloudInABottle extends EntityThrowable {
@@ -95,7 +95,7 @@ public class EntityCloudInABottle extends EntityThrowable {
for (int k2 = y; k2 < y + random.nextInt(1) + 2; k2++) {
for (int l2 = z; l2 < z + random.nextInt(4) + 1; l2++) {
if (world.getBlock(j2, k2, l2).isAir(world, j2, k2, l2) && Math.abs(j2 - x) + Math.abs(k2 - y) + Math.abs(l2 - z) < 4 * 1 + random.nextInt(2)) {
world.setBlock(j2, k2, l2, ModBlocks.cloud);
world.setBlock(j2, k2, l2, ChiselBlocks.cloud);
count++;
}
}
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import com.cricketcraft.chisel.block.BlockSnakestoneObsidian;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.init.ChiselItems;
import com.cricketcraft.chisel.utils.General;
import cpw.mods.fml.relauncher.Side;
@@ -97,7 +97,7 @@ public class EntityBallOMossFX extends EntityFX {
// setParticleIcon(block.particles[General.rand.nextInt(block.particles.length)]);
icon = ModItems.itemBallOMoss.getIconFromDamage(0);
icon = ChiselItems.itemBallOMoss.getIconFromDamage(0);
float width = 4.0f + General.rand.nextFloat() * 8.0f;
float uu = General.rand.nextFloat() * (16.0f - width);
float vv = General.rand.nextFloat() * (16.0f - width);
@@ -0,0 +1,129 @@
package com.cricketcraft.chisel.init;
import net.minecraft.block.Block;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.block.BlockCarvable;
import com.cricketcraft.chisel.block.BlockCarvableGlass;
import com.cricketcraft.chisel.block.BlockCarvablePane;
import com.cricketcraft.chisel.block.BlockCarvablePowered;
import com.cricketcraft.chisel.block.BlockCarvablePumpkin;
import com.cricketcraft.chisel.block.BlockCarvableSand;
import com.cricketcraft.chisel.block.BlockCloud;
import com.cricketcraft.chisel.block.BlockConcrete;
import com.cricketcraft.chisel.block.BlockGrimstone;
import com.cricketcraft.chisel.block.BlockHolystone;
import com.cricketcraft.chisel.block.BlockLavastone;
import com.cricketcraft.chisel.block.BlockLightstoneCarvable;
import com.cricketcraft.chisel.block.BlockMarbleCarpet;
import com.cricketcraft.chisel.block.BlockMarbleIce;
import com.cricketcraft.chisel.block.BlockMarbleIceStairs;
import com.cricketcraft.chisel.block.BlockMarblePackedIce;
import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs;
import com.cricketcraft.chisel.block.BlockMarbleSlab;
import com.cricketcraft.chisel.block.BlockMarbleStairs;
import com.cricketcraft.chisel.block.BlockMarbleTexturedOre;
import com.cricketcraft.chisel.block.BlockMarbleWall;
import com.cricketcraft.chisel.block.BlockPresent;
import com.cricketcraft.chisel.block.BlockRoadLine;
import com.cricketcraft.chisel.block.BlockSnakestone;
import com.cricketcraft.chisel.block.BlockSnakestoneObsidian;
import com.cricketcraft.chisel.block.BlockVoidstonePillar;
import com.cricketcraft.chisel.block.BlockVoidstonePillar2;
import com.cricketcraft.chisel.block.BlockWaterstone;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder(Chisel.MOD_ID)
public final class ChiselBlocks {
public static final Block autoChisel = null;
public static final BlockCarvable marble = null;
public static final BlockCarvable marble_pillar = null;
public static final BlockCarvable limestone = null;
public static final BlockMarbleSlab marble_slab = null;
public static final BlockMarbleSlab limestone_slab = null;
public static final BlockMarbleSlab marble_pillar_slab = null;
public static final BlockCarvable cobblestone = null;
public static final BlockMarbleWall cobblestoneWall = null;
public static final BlockCarvableGlass glass = null;
public static final BlockCarvablePane glass_pane = null;
public static final BlockCarvable sandstone = null;
public static final BlockCarvable sandstone_scribbles = null;
public static final BlockConcrete concrete = null;
public static final BlockRoadLine road_line = null;
public static final BlockCarvable iron_block = null;
public static final BlockCarvable gold_block = null;
public static final BlockCarvable diamond_block = null;
public static final BlockLightstoneCarvable glowstone = null;
public static final BlockCarvable lapis_block = null;
public static final BlockCarvable emerald_block = null;
public static final BlockCarvable nether_brick = null;
public static final BlockCarvable netherrack = null;
public static final BlockCarvable mossy_cobblestone = null;
public static final BlockCarvable stonebricksmooth = null;
public static final BlockMarbleStairs marbleStairs = null;
public static final BlockMarbleStairs limestoneStairs = null;
public static final BlockCarvablePane iron_bars = null;
public static final BlockMarbleIce ice = null;
public static final BlockMarbleIce ice_pillar = null;
public static final BlockMarblePackedIce packedice = null;
public static final BlockMarblePackedIce packedice_pillar = null;
public static final BlockMarbleIceStairs iceStairs = null;
public static final BlockMarblePackedIceStairs packediceStairs = null;
public static final BlockCarvable[] planks = new BlockCarvable[6];
public static final BlockCarvable obsidian = null;
public static final BlockCarvablePowered redstone_block = null;
public static final BlockHolystone holystone = null;
public static final BlockGrimstone grimstone = null;
public static final BlockLavastone lavastone = null;
public static final BlockWaterstone waterstone = null;
public static final BlockCarvable leaves = null;
public static final BlockCarvable fantasy = null;
public static final BlockCarvable fantasyblock2 = null;
public static final BlockCarvable carpet_block = null;
public static final BlockMarbleCarpet carpet = null;
public static final BlockCarvable bookshelf = null;
public static final BlockCarvable tyrian = null;
public static final BlockCarvable dirt = null;
public static final BlockCloud cloud = null;
public static final BlockCarvable templeblock = null;
public static final BlockCarvable mossy_templeblock = null;
public static final BlockCarvable factoryblock = null;
public static final BlockCarvablePane paperwall = null;
public static final BlockCarvable woolen_clay = null;
public static final BlockCarvable laboratoryblock = null;
public static final BlockCarvablePumpkin[] pumpkin = new BlockCarvablePumpkin[16];
public static final BlockCarvablePumpkin[] jackolantern = new BlockCarvablePumpkin[16];
public static final BlockCarvable voidstone = null;
public static final BlockMarbleTexturedOre voidstone2 = null;
public static final BlockVoidstonePillar voidstonePillar = null;
public static final BlockVoidstonePillar2 voidstonePillar2 = null;
public static final BlockPresent[] present = new BlockPresent[16];
public static final BlockSnakestone stone_snakestone = null;
public static final BlockSnakestone sand_snakestone = null;
public static final BlockSnakestoneObsidian obsidian_snakestone = null;
public static final BlockCarvable hexPlating = null;
public static final BlockCarvable technical = null;
public static final BlockCarvableGlass technical2 = null;
public static final BlockCarvable futura = null;
public static final BlockCarvable bone = null;
public static final BlockCarvable scorching = null;
public static final BlockCarvable brickCustom = null;
public static final BlockCarvable sign = null;
public static final BlockCarvable arcane = null;
public static final BlockCarvable bloodRune = null;
public static final BlockCarvableSand colored_sand = null;
// 1.7
public static final BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
public static final BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8];
// 1.8 or at least so you think :P
public static final BlockCarvable granite = null;
public static final BlockCarvable diorite = null;
public static final BlockCarvable andesite = null;
private ChiselBlocks() {
}
}
@@ -0,0 +1,23 @@
package com.cricketcraft.chisel.init;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.item.ItemBallOMoss;
import com.cricketcraft.chisel.item.ItemChisel;
import com.cricketcraft.chisel.item.ItemCloudInABottle;
import com.cricketcraft.chisel.item.ItemSmashingRock;
import com.cricketcraft.chisel.item.ItemUpgrade;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder(Chisel.MOD_ID)
public final class ChiselItems {
public static final ItemChisel chisel = null;
public static final ItemCloudInABottle itemCloudInABottle = null;
public static final ItemBallOMoss itemBallOMoss = null;
public static final ItemSmashingRock smashingRock = null;
public static final ItemUpgrade upgrade = null;
private ChiselItems() {
}
}
@@ -8,7 +8,7 @@ import com.cricketcraft.chisel.Chisel;
import cpw.mods.fml.common.Loader;
public class ModTabs {
public class ChiselTabs {
private static boolean atLeastOneModIsLoaded = false;
@@ -21,7 +21,7 @@ public class ModTabs {
@Override
public Item getTabIconItem() {
return ModItems.chisel;
return ChiselItems.chisel;
}
};
@@ -38,11 +38,11 @@ public class ModTabs {
public Item getTabIconItem() {
if (Loader.isModLoaded("Thaumcraft")) {
return Item.getItemFromBlock(ModBlocks.arcane);
return Item.getItemFromBlock(ChiselBlocks.arcane);
} else if (Loader.isModLoaded("AWWayOfTime")) {
return Item.getItemFromBlock(ModBlocks.bloodRune);
return Item.getItemFromBlock(ChiselBlocks.bloodRune);
} else {
return Item.getItemFromBlock(ModBlocks.voidstone);
return Item.getItemFromBlock(ChiselBlocks.voidstone);
}
}
};
@@ -52,7 +52,7 @@ public class ModTabs {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.holystone);
return Item.getItemFromBlock(ChiselBlocks.holystone);
}
};
@@ -68,7 +68,7 @@ public class ModTabs {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.technical);
return Item.getItemFromBlock(ChiselBlocks.technical);
}
};
@@ -76,7 +76,7 @@ public class ModTabs {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.jackolantern[0]);
return Item.getItemFromBlock(ChiselBlocks.jackolantern[0]);
}
};
}
File diff suppressed because it is too large. Load diff
@@ -1,52 +0,0 @@
package com.cricketcraft.chisel.init;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.entity.EntityBallOMoss;
import com.cricketcraft.chisel.entity.EntityCloudInABottle;
import com.cricketcraft.chisel.entity.EntitySmashingRock;
import com.cricketcraft.chisel.item.ItemBallOMoss;
import com.cricketcraft.chisel.item.ItemChisel;
import com.cricketcraft.chisel.item.ItemCloudInABottle;
import com.cricketcraft.chisel.item.ItemSmashingRock;
import com.cricketcraft.chisel.item.ItemUpgrade;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
public class ModItems {
public static ItemChisel chisel;
public static ItemCloudInABottle itemCloudInABottle;
public static ItemBallOMoss itemBallOMoss;
public static ItemSmashingRock smashingRock;
public static ItemUpgrade upgrade;
public static void load() {
chisel = (ItemChisel) new ItemChisel().setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(chisel, "chisel");
if (Configurations.featureEnabled("cloud")) {
itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
}
if (Configurations.featureEnabled("ballOfMoss")) {
itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemBallOMoss, "ballomoss");
}
if (Configurations.featureEnabled("smashingRock")) {
smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(smashingRock, "smashingrock");
}
if (Configurations.featureEnabled("autoChiselUpgrades")) {
upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName());
}
}
}
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel;
import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel.Upgrade;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.init.ChiselItems;
public class ContainerAutoChisel extends Container {
@@ -23,7 +23,7 @@ public class ContainerAutoChisel extends Container {
@Override
public boolean isItemValid(ItemStack stack) {
return stack.getItem() == ModItems.upgrade && stack.getItemDamage() == upgradeType.ordinal();
return stack.getItem() == ChiselItems.upgrade && stack.getItemDamage() == upgradeType.ordinal();
}
}
@@ -83,7 +83,7 @@ public class ContainerAutoChisel extends Container {
}
} else {
// if this is an upgrade, check the upgrade slots
if (itemStack1.getItem() == ModItems.upgrade) {
if (itemStack1.getItem() == ChiselItems.upgrade) {
if (!this.mergeItemStack(itemStack1, 3, 6, false)) {
return null;
}
@@ -9,9 +9,9 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.api.ICarvable;
import com.cricketcraft.chisel.carving.CarvableVariation;
import com.cricketcraft.chisel.config.Configurations;
import com.cricketcraft.chisel.utils.General;
public class ItemCarvable extends ItemBlock {
@@ -24,8 +24,8 @@ import com.cricketcraft.chisel.client.render.tile.RenderPresent;
import com.cricketcraft.chisel.entity.EntityBallOMoss;
import com.cricketcraft.chisel.entity.EntityCloudInABottle;
import com.cricketcraft.chisel.entity.EntitySmashingRock;
import com.cricketcraft.chisel.init.ModBlocks;
import com.cricketcraft.chisel.init.ModItems;
import com.cricketcraft.chisel.init.ChiselBlocks;
import com.cricketcraft.chisel.init.ChiselItems;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -55,19 +55,19 @@ public class ClientProxy extends CommonProxy {
RenderAutoChisel rac = new RenderAutoChisel();
Chisel.renderAutoChiselId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(rac);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.autoChisel), rac);
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac);
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac);
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, new RenderPresent());
for (int x = 0; x < 16; x++) {
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.present[x]), new ItemPresentRenderer(x));
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present[x]), new ItemPresentRenderer(x));
}
RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ModItems.itemCloudInABottle));
RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ModItems.itemBallOMoss));
RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ModItems.smashingRock));
RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.itemCloudInABottle));
RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.itemBallOMoss));
RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingRock));
MinecraftForgeClient.registerItemRenderer(ModItems.chisel, renderer);
MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer);
}
}
@@ -90,4 +90,5 @@ public class General {
return par1World.rayTraceBlocks(var13, var23, par3);
}
public static final String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" };
}