mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-16 01:54:46 +00:00
200th Commit and made it better for loading
This commit is contained in:
1 parent
07f2aecb48
commit
35bc74811e
2 files changed
+15
-20
No files matched your search
@@ -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() {
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user