etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Thaumcraft aspects, huzzah!

This commit is contained in:
Adubbz 2013-04-28 13:09:58 +10:00
parent 93a77bca15
commit 9d8e5cbca5
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/minecraft/biomesoplenty/BiomesOPlenty.java
View File

@ -24,7 +24,9 @@ import biomesoplenty.helpers.CreativeTabsBOP;
import biomesoplenty.helpers.WorldProviderPromised;
import biomesoplenty.helpers.WorldTypeSize;
import biomesoplenty.integration.BOPCrossIntegration;
import biomesoplenty.integration.ThaumcraftIntegration;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
@ -125,10 +127,12 @@ public class BiomesOPlenty
DimensionManager.registerProviderType(BOPConfiguration.promisedLandDimID, WorldProviderPromised.class, false);
DimensionManager.registerDimension(BOPConfiguration.promisedLandDimID, BOPConfiguration.promisedLandDimID);
BOPCrossIntegration.init();
}
public void postInit(FMLPostInitializationEvent event)
{
BOPCrossIntegration.init();
BOPCrossIntegration.postInit();
}
}

4
src/minecraft/biomesoplenty/api/BlockReferences.java
View File

@ -18,9 +18,9 @@ public class BlockReferences {
magicLog (Blocks.logs2, 1),
mangroveLog (Blocks.logs2, 2),
palmLog (Blocks.logs2, 3),
redwoodLog (Blocks.logs3, 0),
redwoodLog (Blocks.logs3, 0),
willowLog (Blocks.logs3, 1),
deadLog (Blocks.logs3, 2),
deadLog (Blocks.logs3, 2),
bigFlowerStem (Blocks.logs3, 3),
acaciaPlank (Blocks.planks, 0),

25
src/minecraft/biomesoplenty/integration/BOPCrossIntegration.java
View File

@ -5,6 +5,20 @@ import cpw.mods.fml.common.Loader;
public class BOPCrossIntegration {
public static void init()
{
if (Loader.isModLoaded("Thaumcraft"))
{
try {
ThaumcraftIntegration.init();
}
catch (Exception e) {
System.out.println("[BiomesOPlenty] There was an error while integrating Thaumcraft with Biomes O' Plenty!");
e.printStackTrace(System.err);
}
}
}
public static void postInit()
{
if (Loader.isModLoaded("Forestry"))
{
@ -38,16 +52,5 @@ public class BOPCrossIntegration {
e.printStackTrace(System.err);
}
}
if (Loader.isModLoaded("Thaumcraft"))
{
try {
ThaumcraftIntegration.init();
}
catch (Exception e) {
System.out.println("[BiomesOPlenty] There was an error while integrating Thaumcraft with Biomes O' Plenty!");
e.printStackTrace(System.err);
}
}
}
}

9
src/minecraft/biomesoplenty/integration/ThaumcraftIntegration.java
View File

@ -12,7 +12,7 @@ import thaumcraft.api.ThaumcraftApi;
public class ThaumcraftIntegration {
protected static void init()
public static void init()
{
addAspects();
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Blocks.leavesFruit.get(), 1, 3));
@ -27,7 +27,8 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("acaciaLog"), getBMeta("acaciaLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("cherryLog"), getBMeta("cherryLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("darkLog"), getBMeta("darkLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.DARK, 2));
ThaumcraftApi.registerObjectTag(getBID("darkLog"), getBMeta("darkLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.DARK, 2));
ThaumcraftApi.registerObjectTag(getBID("firLog"), getBMeta("firLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("holyLog"), getBMeta("holyLog"), (new ObjectTags()).add(EnumTag.WOOD, 8).add(EnumTag.LIGHT, 2));
@ -37,7 +38,7 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("redwoodLog"), getBMeta("redwoodLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("willowLog"), getBMeta("willowLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("deadLog"), getBMeta("deadLog"), (new ObjectTags()).add(EnumTag.WOOD, 8));
ThaumcraftApi.registerObjectTag(getBID("deadLog"), getBMeta("deadLog"), (new ObjectTags()).add(EnumTag.WOOD, 8)); ///Working
ThaumcraftApi.registerObjectTag(getBID("bigFlowerStem"), getBMeta("bigFlowerStem"), (new ObjectTags()).add(EnumTag.FLOWER, 4).add(EnumTag.MAGIC, 1));
//Planks
@ -49,7 +50,7 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("magicPlank"), getBMeta("magicPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2)/*.add(EnumTag.MAGIC, 1)*/);
ThaumcraftApi.registerObjectTag(getBID("mangrovePlank"), getBMeta("mangrovePlank"), (new ObjectTags()).add(EnumTag.WOOD, 2));
ThaumcraftApi.registerObjectTag(getBID("palmPlank"), getBMeta("palmPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2));
ThaumcraftApi.registerObjectTag(getBID("redwoodPlanl"), getBMeta("redwoodPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2));
ThaumcraftApi.registerObjectTag(getBID("redwoodPlank"), getBMeta("redwoodPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2));
ThaumcraftApi.registerObjectTag(getBID("willowPlank"), getBMeta("willowPlank"), (new ObjectTags()).add(EnumTag.WOOD, 2));
ThaumcraftApi.registerObjectTag(getBID("bambooThatching"), getBMeta("bambooThatching"), (new ObjectTags()).add(EnumTag.WATER, 14).add(EnumTag.PLANT, 14));