From 35bc74811e0767b9f97b367b998050880235fed2 Mon Sep 17 00:00:00 2001 From: Cricket Date: Wed, 24 Dec 2014 12:16:19 -0500 Subject: [PATCH 1/5] 200th Commit and made it better for loading --- .../java/com/cricketcraft/chisel/Chisel.java | 5 ++-- .../cricketcraft/chisel/init/ModBlocks.java | 30 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 67f12692..151d68ea 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -47,7 +47,7 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft") public class Chisel { public static final String MOD_ID = "chisel"; @@ -119,7 +119,7 @@ public class Chisel Configurations.refreshConfig(); ModTabs.load(); - ModBlocks.preInit(); + ModBlocks.load(); ModItems.load(); proxy.preInit(); } @@ -127,7 +127,6 @@ public class Chisel @EventHandler public void init(FMLInitializationEvent event) { - ModBlocks.init(); Crafting.init(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() { diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 52bcd287..2e7a955b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -8,7 +8,6 @@ import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.item.ItemMarbleSlab; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; @@ -96,7 +95,7 @@ public class ModBlocks { public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; - public static void preInit() + public static void load() { if(Configurations.featureEnabled("autoChisel")){ autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(ModTabs.tabChisel).setBlockName("autoChisel").setBlockTextureName(Chisel.MOD_ID + ":factory/circuit"); @@ -1555,20 +1554,17 @@ public class ModBlocks { sign.carverHelper.register(sign, "warningSign"); Carving.chisel.registerOre("warningSign", "warningSign"); } - } - public static void init() - { - //Load AFTER Thaumcraft Blocks have loaded :P - if(Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft")) - { - arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 0, "arcane/largetile"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 1, "arcane/moon"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 2, "arcane/moon-thaumium"); - arcane.carverHelper.register(arcane, "arcane"); - Carving.chisel.registerOre("arcane", "arcane"); - } + + if(Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft")) + { + arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 0, "arcane/largetile"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 1, "arcane/moon"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 2, "arcane/moon-thaumium"); + arcane.carverHelper.register(arcane, "arcane"); + Carving.chisel.registerOre("arcane", "arcane"); + } } } From 679095a711f8d0de965d3f2e972d705c4dc9244e Mon Sep 17 00:00:00 2001 From: Cricket Date: Wed, 24 Dec 2014 12:27:16 -0500 Subject: [PATCH 2/5] Forgot a crafting recipe --- src/main/java/com/cricketcraft/chisel/Crafting.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index 1b54de76..a52bccde 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -135,6 +135,10 @@ public class Crafting { } } + if(Configurations.featureEnabled("technical")){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[]{"xyx", "yxy", "xyx", 'x', "stone", 'y', Items.iron_ingot})); + } + 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)}); From 474fd7b966141179ab2e36bea33dda128abd840e Mon Sep 17 00:00:00 2001 From: Cricket Date: Wed, 24 Dec 2014 12:31:21 -0500 Subject: [PATCH 3/5] Fixed Hardness and recipe bugs --- .../com/cricketcraft/chisel/Crafting.java | 4 ++++ .../chisel/block/BlockCarvable.java | 20 +++++++++---------- .../cricketcraft/chisel/init/ModBlocks.java | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index a52bccde..d0e058d2 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -144,5 +144,9 @@ public class Crafting { GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.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})); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 38e6b4cd..29869a91 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -1,7 +1,12 @@ package com.cricketcraft.chisel.block; -import java.util.List; - +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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,14 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; public class BlockCarvable extends Block implements ICarvable { public CarvableHelper carverHelper; @@ -30,6 +28,8 @@ public class BlockCarvable extends Block implements ICarvable { public BlockCarvable(Material m) { super(m); carverHelper = new CarvableHelper(); + setResistance(10.0F); + setHardness(2.0F); setCreativeTab(ModTabs.tabChiselBlocks); } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 2e7a955b..a3f96941 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1545,7 +1545,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("warningSign")) { - sign = (BlockCarvable) new BlockCarvable(Material.iron); + sign = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(2.0F).setResistance(10.0F); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.0.desc"), 0, "warning/rad"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.1.desc"), 1, "warning/bio"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.2.desc"), 2, "warning/fire"); From ff69bbd23c2b202d1468346af8e9a85f98ebfe9b Mon Sep 17 00:00:00 2001 From: CptSpaceToaster Date: Wed, 24 Dec 2014 13:48:45 -0500 Subject: [PATCH 4/5] Pumpkins have a hardness value now --- src/main/java/com/cricketcraft/chisel/init/ModBlocks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index d244797e..3d9fec81 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1284,7 +1284,7 @@ public class ModBlocks { if(Configurations.featureEnabled("pumpkin")) { for(int metadata = 0; metadata < 16; metadata++){ - pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setBlockName("pumpkin").setCreativeTab(ModTabs.tabChiselBlocks); + pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setHardness(1.0F).setBlockName("pumpkin").setCreativeTab(ModTabs.tabChiselBlocks); pumpkin[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_off"); GameRegistry.registerBlock(pumpkin[metadata], "pumpkin" + (metadata + 1)); Carving.chisel.addVariation("pumpkin", pumpkin[metadata], 0, (metadata + 1)); @@ -1296,7 +1296,7 @@ public class ModBlocks { if(Configurations.featureEnabled("jackolantern")) { for(int metadata = 0; metadata < 16; metadata++){ - jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setBlockName("litpumpkin").setCreativeTab(ModTabs.tabChiselBlocks); + jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setHardness(1.0F).setBlockName("litpumpkin").setCreativeTab(ModTabs.tabChiselBlocks); jackolantern[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_on"); GameRegistry.registerBlock(jackolantern[metadata], ("jackolantern" + (metadata + 1))); Carving.chisel.addVariation("jackolantern", jackolantern[metadata], 0, (metadata + 1)); From dabaeb879ae41b6a89e10d92587057a88d5f7b49 Mon Sep 17 00:00:00 2001 From: CptSpaceToaster Date: Wed, 24 Dec 2014 14:09:19 -0500 Subject: [PATCH 5/5] chiseled torches were missing their light values --- src/main/java/com/cricketcraft/chisel/init/ModBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 0d13685d..3285b38b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1536,7 +1536,7 @@ public class ModBlocks { { Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); for(int metadata = 0; metadata < 6; metadata++){ - torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setBlockName("torch").setCreativeTab(ModTabs.tabChiselBlocks); + torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setLightLevel(0.9375F).setBlockName("torch").setCreativeTab(ModTabs.tabChiselBlocks); torch[metadata].setInformation("torch" + (metadata + 1)); GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1)); Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1));