mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Merge branch 'master' into weaponry
Conflicts: src/main/java/tconstruct/tools/ToolProxyClient.java
This commit is contained in:
commit
947da8f9df
21 files changed
+2127
-38
No files matched your search
@@ -39,7 +39,7 @@ import tconstruct.world.itemblocks.CraftedSoilItemBlock;
|
||||
import static net.minecraft.util.EnumChatFormatting.*;
|
||||
|
||||
@ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers' Tools", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.")
|
||||
@Pulse(id = "Tinkers' Tools", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", forced = true)
|
||||
public class TinkerTools
|
||||
{
|
||||
/* Proxies for sides, used for graphics processing */
|
||||
@@ -127,11 +127,17 @@ public class TinkerTools
|
||||
|
||||
// recipe stuff
|
||||
public static boolean thaumcraftAvailable;
|
||||
|
||||
//Dev/Null Stuff
|
||||
public static Item openBlocksDevNull;
|
||||
|
||||
@Handler
|
||||
public void preInit (FMLPreInitializationEvent event)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(new TinkerToolEvents());
|
||||
TinkerToolEvents toolEvents = new TinkerToolEvents();
|
||||
MinecraftForge.EVENT_BUS.register(toolEvents);
|
||||
FMLCommonHandler.instance().bus().register(toolEvents);
|
||||
|
||||
|
||||
//Blocks
|
||||
TinkerTools.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation");
|
||||
@@ -714,6 +720,9 @@ public class TinkerTools
|
||||
{
|
||||
} // No need to handle
|
||||
}
|
||||
|
||||
//OpenBlocks
|
||||
openBlocksDevNull = GameRegistry.findItem("OpenBlocks", "devnull");
|
||||
}
|
||||
|
||||
void registerMaterials ()
|
||||
|
||||
Reference in new issue
Block a user