diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt
index c1fae5b..3f9f916 100644
--- a/thaumicbees_res/changelog.txt
+++ b/thaumicbees_res/changelog.txt
@@ -1,3 +1,6 @@
+Ars Magica integration! X new bee species to help you research & cast spells.
+Changing mutations around, because I'm still not happy with them. (Again.)
+
1.4.5a
Repaired Thaumcraft 3 integration for 3.0.4a.
Fixed Biofuel capsules being shown as "Empty x Capsule"
diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml
index 88b2598..c79a7cf 100644
--- a/thaumicbees_res/lang/thaumicbees/en_US.xml
+++ b/thaumicbees_res/lang/thaumicbees/en_US.xml
@@ -178,21 +178,21 @@
It is said these bees are able to contact the dead.|Apinomicon
Soul
"The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts
- Iron
+ Ferrous
Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon
- Gold
+ Auric
Not all that glitters is gold.|Ancient Aphorism
- Copper
+ Cuprum
A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon
- Tin
+ Stannum
While metalic, these bees are suprisingly fragile.|Apinomicon
- Silver
+ Argentum
While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon
- Lead
+ Plumbum
A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon
- Diamond
+ Diamandi
Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon
- Emerald
+ Esmeraldi
It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon
Poultry
"Cluck. Cluck cluck! ... You heard me."|Confused bee
@@ -214,7 +214,8 @@
Wispy
Ghastly
Books
- Magic Flowers
+ Thaumic Flowers
+ Exotic Flowers
Node
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png
new file mode 100644
index 0000000..098df81
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png
new file mode 100644
index 0000000..3faa0d5
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png
new file mode 100644
index 0000000..ad6b4a8
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png
new file mode 100644
index 0000000..d5a5436
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png
new file mode 100644
index 0000000..ad6b4a8
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png
new file mode 100644
index 0000000..4a12753
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png
new file mode 100644
index 0000000..ad6b4a8
Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png differ
diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt
new file mode 100644
index 0000000..1ec9414
--- /dev/null
+++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt
@@ -0,0 +1,8 @@
+0*64
+1*2
+2*2
+1*2
+0*96
+3*4
+0*128
+4*2
diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java
index 4902085..fa7c3f7 100644
--- a/thaumicbees_src/thaumicbees/bees/Allele.java
+++ b/thaumicbees_src/thaumicbees/bees/Allele.java
@@ -1,6 +1,7 @@
package thaumicbees.bees;
import net.minecraft.potion.Potion;
+import thaumicbees.main.utils.compat.ArsMagicaHelper;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IAlleleFlowers;
@@ -13,6 +14,7 @@ public class Allele implements IAllele
public static IAlleleFlowers flowerBookshelf;
public static IAlleleFlowers flowerThaumcraft;
+ public static IAlleleFlowers flowerArsMagica;
public static IAlleleFlowers flowerAuraNode;
@Deprecated
public static IAlleleFlowers flowerNodePurify;
@@ -52,6 +54,15 @@ public class Allele implements IAllele
Allele.flowerNodePurify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla");
Allele.flowerNodeFluxify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla");
}
+
+ if (ArsMagicaHelper.isActive())
+ {
+ Allele.flowerArsMagica = new AlleleFlower("flowerArsMagicaPlant", new FlowerProviderArsMagicaFlower(), false);
+ }
+ else
+ {
+ Allele.flowerArsMagica = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla");
+ }
Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("effectNodeGeneration", false, 400);
Allele.effectNodePurify = new AlleleEffectAuraNodePurify("effectNodePurify", false, 600, 150);
diff --git a/thaumicbees_src/thaumicbees/bees/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java
index 42b0e7c..95ca063 100644
--- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java
+++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java
@@ -75,7 +75,7 @@ public class BeeMutation implements IBeeMutation
BeeMutation.Esoteric = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 10);
BeeMutation.Esoteric1 = new BeeMutation(Allele.getBaseSpecies("Heroic"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 25);
- BeeMutation.Mysterious = new BeeMutation(Allele.getBaseSpecies("Ended"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 15);
+ BeeMutation.Mysterious = new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 10);
BeeMutation.Mysterious1 = new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 4);
BeeMutation.Arcane = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, BeeSpecies.ARCANE, 8)
.setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 1.5f);
diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java
index e109b76..3ebd283 100644
--- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java
+++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java
@@ -16,6 +16,7 @@ import thaumicbees.item.types.PollenType;
import thaumicbees.item.types.ResourceType;
import thaumicbees.main.Config;
import thaumicbees.main.utils.LocalizationManager;
+import thaumicbees.main.utils.VersionInfo;
import thaumicbees.main.utils.compat.EquivalentExchangeHelper;
import thaumicbees.main.utils.compat.ForestryHelper;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
@@ -364,7 +365,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
@SideOnly(Side.CLIENT)
private Icon[][] icons;
- private final static boolean defaultSecretSetting = true;
+ private final static boolean defaultSecretSetting = false;
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
{
@@ -567,16 +568,22 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
public void registerItemIcons(IconRegister itemMap)
{
this.icons = new Icon[EnumBeeType.values().length][3];
- Icon outline = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline");
- Icon body1 = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline");
+
+ String root = ForestryHelper.Name.toLowerCase() + ":bees/default/";
+ if (this.branch instanceof BeeClassification && (BeeClassification)(this.branch) == BeeClassification.SKULKING)
+ {
+ root = VersionInfo.ModName.toLowerCase() + ":bees/skulking/";
+ }
+ Icon body1 = itemMap.registerIcon(root + "body1");
- for (int i = 0; i < EnumBeeType.values().length; i++) {
+ for (int i = 0; i < EnumBeeType.values().length; i++)
+ {
if(EnumBeeType.values()[i] == EnumBeeType.NONE)
continue;
- icons[i][0] = outline;
+ icons[i][0] = itemMap.registerIcon(root + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline");
icons[i][1] = body1;
- icons[i][2] = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2");
+ icons[i][2] = itemMap.registerIcon(root + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2");
}
}
diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java
new file mode 100644
index 0000000..529b460
--- /dev/null
+++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java
@@ -0,0 +1,74 @@
+package thaumicbees.bees;
+
+import thaumicbees.main.Config;
+import thaumicbees.main.utils.LocalizationManager;
+import thaumicbees.main.utils.compat.ThaumcraftHelper;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IFlowerProvider;
+import forestry.api.genetics.IPollinatable;
+
+public class FlowerProviderArsMagicaFlower implements IFlowerProvider
+{
+ private ItemStack[] flowers = {new ItemStack(Config.amBlackOrchid), new ItemStack(Config.amDesertNova) };
+
+ @Override
+ public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z)
+ {
+ boolean flag = false;
+ int id = world.getBlockId(x, y, z);
+ if (id == Config.amBlackOrchid.blockID || id == Config.amDesertNova.blockID)
+ {
+ flag = true;
+ }
+ return flag;
+ }
+
+ @Override
+ public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z)
+ {
+ boolean flag = false;
+ int blockDown = world.getBlockId(x, y - 1, z);
+ if (world.isAirBlock(x, y, z))
+ {
+ if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID)
+ {
+ world.setBlock(x, y, z, Config.amBlackOrchid.blockID);
+ flag = true;
+ }
+ else if (blockDown == Block.sand.blockID)
+ {
+ world.setBlock(x, y, z, Config.amDesertNova.blockID);
+ flag = true;
+ }
+ }
+ return flag;
+ }
+
+ @Override
+ public String getDescription()
+ {
+ return LocalizationManager.getLocalizedString("tb.bees.flower.arsmagica");
+ }
+
+ @Override
+ public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products)
+ {
+ return products;
+ }
+
+ @Override
+ public ItemStack[] getItemStacks()
+ {
+ return this.flowers;
+ }
+
+ @Override
+ public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable)
+ {
+ return pollinatable.getPlantType().size() > 1;
+ }
+
+}
diff --git a/thaumicbees_src/thaumicbees/block/BlockPlanks.java b/thaumicbees_src/thaumicbees/block/BlockPlanks.java
index 0c158a0..c17ec8f 100644
--- a/thaumicbees_src/thaumicbees/block/BlockPlanks.java
+++ b/thaumicbees_src/thaumicbees/block/BlockPlanks.java
@@ -60,7 +60,7 @@ public class BlockPlanks extends Block
this.icons = new Icon[PlankType.values().length];
for (PlankType t : PlankType.values())
{
- this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name);
+ this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":" + t.name);
}
}
}
diff --git a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
index dd2fc0d..228e790 100644
--- a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
+++ b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
@@ -75,7 +75,7 @@ public class BlockWoodSlab extends BlockHalfSlab
this.icons = new Icon[PlankType.values().length];
for (PlankType t : PlankType.values())
{
- this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name);
+ this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":" + t.name);
}
}
}
diff --git a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
index d360484..2260711 100644
--- a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
+++ b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
@@ -27,7 +27,7 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
}
@Override
- public float getSaplingModifier(ItemStack stack, World world, int x, int y, int z)
+ public float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z)
{
return 100f;
}
diff --git a/thaumicbees_src/thaumicbees/main/ClientProxy.java b/thaumicbees_src/thaumicbees/main/ClientProxy.java
index d1247bb..2bc0c34 100644
--- a/thaumicbees_src/thaumicbees/main/ClientProxy.java
+++ b/thaumicbees_src/thaumicbees/main/ClientProxy.java
@@ -14,24 +14,6 @@ public class ClientProxy extends CommonProxy
public ClientProxy() { }
- @Override
- public void preloadTextures()
- {
- Field f;
- try
- {
- f = Class.forName("forestry.core.config.Config").getField("enableParticleFX");
- ThaumicBees.getConfig().DrawParticleEffects = f.getBoolean(null);
-
- f = Class.forName("forestry.core.config.Defaults").getField("TEXTURE_PARTICLES_BEE");
- thaumicbees.main.CommonProxy.FORESTRY_GFX_BEEEFFECTS = (String)f.get(null);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
@Override
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
{
diff --git a/thaumicbees_src/thaumicbees/main/CommonProxy.java b/thaumicbees_src/thaumicbees/main/CommonProxy.java
index 2fda5c2..eab6186 100644
--- a/thaumicbees_src/thaumicbees/main/CommonProxy.java
+++ b/thaumicbees_src/thaumicbees/main/CommonProxy.java
@@ -17,11 +17,6 @@ public class CommonProxy
public CommonProxy() { }
- public void preloadTextures()
- {
- // Does nothing here.
- }
-
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
{
// Does nothing in common.
diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java
index 1b6fce5..09fd783 100644
--- a/thaumicbees_src/thaumicbees/main/Config.java
+++ b/thaumicbees_src/thaumicbees/main/Config.java
@@ -36,6 +36,7 @@ import thaumicbees.item.types.NuggetType;
import thaumicbees.item.types.PlankType;
import thaumicbees.item.types.ResourceType;
import thaumicbees.main.utils.LocalizationManager;
+import thaumicbees.main.utils.compat.ArsMagicaHelper;
import thaumicbees.main.utils.compat.EquivalentExchangeHelper;
import thaumicbees.main.utils.compat.ForestryHelper;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
@@ -66,7 +67,6 @@ public class Config
public static BlockPlanks planksWood;
public static BlockWoodSlab slabWoodHalf;
public static BlockWoodSlab slabWoodFull;
- //public static BlockEffectJar effectJar;
public static ItemComb combs;
public static ItemWax wax;
@@ -124,8 +124,24 @@ public class Config
public static Item tcNuggetChicken;
public static Item tcNuggetBeef;
public static Item tcNuggetPork;
+ //----- Equivalent Exchange Blocks -------------------------
//----- Equivalent Exchange Items --------------------------
public static Item eeMinuimShard;
+ //----- Ars Magica Blocks ----------------------------------
+ public static Block amBlackOrchid;
+ public static Block amDesertNova;
+ //----- Ars Magica Items -----------------------------------
+ public static Item amVinteumDust;
+ public static Item amArcaneCompound;
+ public static Item amEssenceArcane;
+ public static Item amEssenceEarth;
+ public static Item amEssenceWater;
+ public static Item amEssenceFire;
+ public static Item amEssenceAir;
+ public static Item amEssenceMagma;
+ public static Item amEssencePlant;
+ public static Item amEssenceIce;
+ public static Item amEssenceLightning;
//----- Config State info ----------------------------------
@@ -149,6 +165,7 @@ public class Config
ThaumcraftHelper.getBlocks();
ForestryHelper.getBlocks();
EquivalentExchangeHelper.getBlocks();
+ ArsMagicaHelper.getBlocks();
int blockIdBase = 1750;
@@ -183,15 +200,10 @@ public class Config
OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1));
}
}
-
-/* effectJar = new BlockEffectJar(tbConfig.getBlock("effectJar", blockIdBase++).getInt());
-
- GameRegistry.registerBlock(effectJar, "tb.effectJar");*/
}
public void registerTileEntities()
{
- //GameRegistry.registerTileEntity(TileEntityEffectJar.class, "tb.entity.effectJar");
}
public void setupItems()
@@ -199,6 +211,7 @@ public class Config
ThaumcraftHelper.getItems();
ForestryHelper.getItems();
EquivalentExchangeHelper.getItems();
+ ArsMagicaHelper.getItems();
int itemIDBase = 26090;
diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java
index 37b11c2..67d3172 100644
--- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java
+++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java
@@ -4,6 +4,7 @@ import thaumicbees.main.utils.CompatabilityManager;
import thaumicbees.main.utils.CraftingManager;
import thaumicbees.main.utils.LocalizationManager;
import thaumicbees.main.utils.VersionInfo;
+import thaumicbees.main.utils.compat.ArsMagicaHelper;
import thaumicbees.main.utils.compat.EquivalentExchangeHelper;
import thaumicbees.main.utils.compat.ExtraBeesHelper;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
@@ -32,7 +33,6 @@ public class ThaumicBees
@SidedProxy(serverSide="thaumicbees.main.CommonProxy", clientSide="thaumicbees.main.ClientProxy")
public static CommonProxy proxy;
- //public GUIHandler guiHandler;
private String configsPath;
private Config modConfig;
@@ -48,13 +48,12 @@ public class ThaumicBees
ThaumcraftHelper.init();
ExtraBeesHelper.init();
EquivalentExchangeHelper.init();
+ ArsMagicaHelper.init();
}
@Mod.Init
public void init(FMLInitializationEvent event)
{
-
- this.proxy.preloadTextures();
try
{
FMLLog.info("[ThaumicBees] Attempting to get Forestry's item graphics file...");
@@ -75,8 +74,6 @@ public class ThaumicBees
@Mod.PostInit
public void postInit(FMLPostInitializationEvent event)
{
- /*this.guiHandler = new GUIHandler();
- NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);*/
thaumicbees.bees.Allele.setupAdditionalAlleles();
thaumicbees.bees.BeeSpecies.setupBeeSpecies();
diff --git a/thaumicbees_src/thaumicbees/main/render/BeeRenderEffect.java b/thaumicbees_src/thaumicbees/main/render/BeeRenderEffect.java
index effb00e..af48a7c 100644
--- a/thaumicbees_src/thaumicbees/main/render/BeeRenderEffect.java
+++ b/thaumicbees_src/thaumicbees/main/render/BeeRenderEffect.java
@@ -18,7 +18,7 @@ import net.minecraftforge.client.ForgeHooksClient;
public class BeeRenderEffect extends EntityFX
{
public int blendmode = 1;
- private String texture = CommonProxy.FORESTRY_GFX_BEEEFFECTS;
+ private static final String texture = "forestry:particles/swarm_bee";
public BeeRenderEffect(World world, double x, double y, double z, float motionScaleX, float motionScaleY, float motionScaleZ, int color)
{
diff --git a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
index a95c3f4..02da6b5 100644
--- a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
+++ b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
@@ -29,7 +29,7 @@ public class VersionInfo
public static final String Logo = "/gfx/thaumicbees/logo.png";
- public static final String Depends = "required-after:Forestry;after:Thaumcraft@[3.0.3,);after:ExtraBees";
+ public static final String Depends = "required-after:Forestry;after:Thaumcraft@[3.0.3,);after:ExtraBees;after:EE3;after:ArsMagica";
boolean criticalUpdate;
boolean newVersion;
diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java
new file mode 100644
index 0000000..377ef6f
--- /dev/null
+++ b/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java
@@ -0,0 +1,67 @@
+package thaumicbees.main.utils.compat;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import thaumicbees.main.Config;
+import cpw.mods.fml.common.Loader;
+
+public class ArsMagicaHelper
+{
+ private static boolean isArsMagicaPresent = false;
+
+ public static boolean isActive()
+ {
+ return isArsMagicaPresent;
+ }
+
+ public static void init()
+ {
+ if (Loader.isModLoaded("ArsMagica"))
+ {
+ isArsMagicaPresent = true;
+ }
+ }
+
+ public static void getBlocks()
+ {
+ if (isActive())
+ {
+ try
+ {
+ Class clazz = Class.forName("mithion.arsmagica.blocks.ArsMagicaBlocksCommonProxy");
+ Config.amBlackOrchid = (Block)(clazz.getField("blueOrchid").get(null));
+ Config.amDesertNova = (Block)(clazz.getField("desertNova").get(null));
+ }
+ catch (Exception e)
+ {
+
+ }
+ }
+ }
+
+ public static void getItems()
+ {
+ if (isActive())
+ {
+ try
+ {
+ Class clazz = Class.forName("mithion.arsmagica.items.ArsMagicaItemsCommonProxy");
+ Config.amVinteumDust = (Item)(clazz.getField("vinteumDust").get(null));
+ Config.amArcaneCompound = (Item)(clazz.getField("arcaneCompound").get(null));
+ Config.amEssenceAir = (Item)(clazz.getField("airEssence").get(null));
+ Config.amEssenceArcane = (Item)(clazz.getField("arcaneEssence").get(null));
+ Config.amEssenceEarth = (Item)(clazz.getField("earthEssence").get(null));
+ Config.amEssenceFire = (Item)(clazz.getField("fireEssence").get(null));
+ Config.amEssenceIce = (Item)(clazz.getField("iceEssence").get(null));
+ Config.amEssenceLightning = (Item)(clazz.getField("lightningEssence").get(null));
+ Config.amEssenceMagma = (Item)(clazz.getField("magmaEssence").get(null));
+ Config.amEssencePlant = (Item)(clazz.getField("PlantEssence").get(null));
+ Config.amEssenceWater = (Item)(clazz.getField("WaterEssence").get(null));
+ }
+ catch (Exception e)
+ {
+
+ }
+ }
+ }
+}
diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java
index bef8d37..e3c988d 100644
--- a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java
+++ b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java
@@ -219,7 +219,7 @@ public class ThaumcraftHelper
ObjectTags tags;
ItemStack itemStack;
- tags = new ObjectTags().add(EnumTag.WOOD, 2);
+ tags = new ObjectTags().add(EnumTag.WOOD, 1);
ThaumcraftApi.registerObjectTag(Config.planksWood.blockID, -1, tags);
tags = new ObjectTags().add(EnumTag.MAGIC, 2);
@@ -328,7 +328,7 @@ public class ThaumcraftHelper
tags = new ObjectTags().add(EnumTag.COLD, 1);
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.ICE_SHARD.ordinal(), tags);
tags = new ObjectTags().add(EnumTag.VALUABLE, 1).add(EnumTag.PLANT, 1).add(EnumTag.INSECT, 2)
- .add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 5);
+ .add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 2);
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SCENTED_PANELING.ordinal(), tags);
itemStack = ItemInterface.getItem("beealyzer");
@@ -346,11 +346,11 @@ public class ThaumcraftHelper
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("impregnatedCasing");
- tags = new ObjectTags().add(EnumTag.WOOD, 56).add(EnumTag.EXCHANGE, 8);
+ tags = new ObjectTags().add(EnumTag.WOOD, 28).add(EnumTag.EXCHANGE, 8);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("stickImpregnated");
- tags = new ObjectTags().add(EnumTag.WOOD, 6).add(EnumTag.EXCHANGE, 2);
+ tags = new ObjectTags().add(EnumTag.WOOD, 3).add(EnumTag.EXCHANGE, 2);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("peat");
@@ -433,7 +433,7 @@ public class ThaumcraftHelper
// Forestry's wood
itemStack = BlockInterface.getBlock("log1");
- tags = new ObjectTags().add(EnumTag.WOOD, 8);
+ tags = new ObjectTags().add(EnumTag.WOOD, 4);
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
itemStack = BlockInterface.getBlock("log2"); // Same tags
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
@@ -443,7 +443,7 @@ public class ThaumcraftHelper
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
itemStack = ItemInterface.getItem("sapling");
- tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 2);
+ tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 1);
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
// BEES!