Fixing some texture misses, eliminating dead/useless code that throws errors and dead/useless code that does not throw errors
Starting Ars Magica integration. New Skulking family sprite. Enjoy nightmares.
No files matched your search
@@ -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"
|
||||
|
||||
@@ -178,21 +178,21 @@
|
||||
<entry key="thaumicbees.speciesSpirit.description">It is said these bees are able to contact the dead.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesSoul">Soul</entry>
|
||||
<entry key="thaumicbees.speciesSoul.description">"The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts</entry>
|
||||
<entry key="thaumicbees.speciesIron">Iron</entry>
|
||||
<entry key="thaumicbees.speciesIron">Ferrous</entry>
|
||||
<entry key="thaumicbees.speciesIron.description">Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesGold">Gold</entry>
|
||||
<entry key="thaumicbees.speciesGold">Auric</entry>
|
||||
<entry key="thaumicbees.speciesGold.description">Not all that glitters is gold.|Ancient Aphorism</entry>
|
||||
<entry key="thaumicbees.speciesCopper">Copper</entry>
|
||||
<entry key="thaumicbees.speciesCopper">Cuprum</entry>
|
||||
<entry key="thaumicbees.speciesCopper.description">A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesTin">Tin</entry>
|
||||
<entry key="thaumicbees.speciesTin">Stannum</entry>
|
||||
<entry key="thaumicbees.speciesTin.description">While metalic, these bees are suprisingly fragile.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesSilver">Silver</entry>
|
||||
<entry key="thaumicbees.speciesSilver">Argentum</entry>
|
||||
<entry key="thaumicbees.speciesSilver.description">While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesLead">Lead</entry>
|
||||
<entry key="thaumicbees.speciesLead">Plumbum</entry>
|
||||
<entry key="thaumicbees.speciesLead.description">A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesDiamond">Diamond</entry>
|
||||
<entry key="thaumicbees.speciesDiamond">Diamandi</entry>
|
||||
<entry key="thaumicbees.speciesDiamond.description">Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesEmerald">Emerald</entry>
|
||||
<entry key="thaumicbees.speciesEmerald">Esmeraldi</entry>
|
||||
<entry key="thaumicbees.speciesEmerald.description">It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesChicken">Poultry</entry>
|
||||
<entry key="thaumicbees.speciesChicken.description">"Cluck. Cluck cluck! ... You heard me."|Confused bee</entry>
|
||||
@@ -214,7 +214,8 @@
|
||||
<entry key="thaumicbees.effectWispy">Wispy</entry>
|
||||
<entry key="thaumicbees.Ghast">Ghastly</entry>
|
||||
<entry key="tb.bees.flower.book">Books</entry>
|
||||
<entry key="tb.bees.flower.magic">Magic Flowers</entry>
|
||||
<entry key="tb.bees.flower.magic">Thaumic Flowers</entry>
|
||||
<entry key="tb.bees.flower.arsmagica">Exotic Flowers</entry>
|
||||
<entry key="tb.bees.flower.node">Node</entry>
|
||||
|
||||
<!-- Classifications -->
|
||||
|
||||
|
After Width: | Height: | Size: 46 KiB |
|
After Width: | Height: | Size: 47 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
|
After Width: | Height: | Size: 48 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
|
After Width: | Height: | Size: 48 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
|
After Width: | Height: | Size: 48 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
|
After Width: | Height: | Size: 48 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
|
After Width: | Height: | Size: 48 KiB |
@@ -0,0 +1,8 @@
|
||||
0*64
|
||||
1*2
|
||||
2*2
|
||||
1*2
|
||||
0*96
|
||||
3*4
|
||||
0*128
|
||||
4*2
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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!
|
||||
|
||||