upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some mistakes so the game loads

Browse Source
This commit is contained in:
tterrag1098 committed 2015-01-08 06:22:19 -05:00
1 parent bbeb991027
commit 511b30eb19
3 files changed
+16 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/Crafting.java
+2 -2
View File
@@ -72,8 +72,8 @@ public class Crafting {
if (Configurations.featureEnabled("waterstone"))
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(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" }));
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.fantasyblock, 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.fantasyblock, 1), 'X', "dyeWhite" }));
}
if (Configurations.featureEnabled("futuristicArmorPlating"))
GameRegistry.addRecipe(new ItemStack(ChiselBlocks.tyrian, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) });
src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java
+2 -2
View File
@@ -68,8 +68,8 @@ public class FMPIntegration implements IModIntegration {
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.fantasyblock, 0, 1);
registerMaterial(ChiselBlocks.fantasyblock, 3, 14);
registerMaterial(ChiselBlocks.tyrian);
registerMaterial(ChiselBlocks.templeblock, 1, 2);
registerMaterial(ChiselBlocks.templeblock, 4, 15);
src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java
+12 -7
View File
@@ -71,7 +71,6 @@ public final class ChiselBlocks {
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;
@@ -79,7 +78,7 @@ public final class ChiselBlocks {
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 fantasyblock = null;
public static final BlockCarvable fantasyblock2 = null;
public static final BlockCarvable carpet_block = null;
public static final BlockMarbleCarpet carpet = null;
@@ -93,13 +92,11 @@ public final class ChiselBlocks {
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;
@@ -115,9 +112,17 @@ public final class ChiselBlocks {
public static final BlockCarvable bloodRune = null;
public static final BlockCarvableSand colored_sand = null;
// Arrays can't be final because of how @ObjectHolder works
public static BlockCarvable[] planks = new BlockCarvable[6];
public static BlockPresent[] present = new BlockPresent[16];
public static BlockCarvablePumpkin[] pumpkin = new BlockCarvablePumpkin[16];
public static BlockCarvablePumpkin[] jackolantern = new BlockCarvablePumpkin[16];
// 1.7
public static final BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
public static final BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8];
public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8];
// 1.8 or at least so you think :P
public static final BlockCarvable granite = null;