mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-22 05:02:37 +00:00
Exdending length of come bee effects
Adding hunger-inducing to grafter Adding Greatwood & Silverwood log planks Fixing more Version Info shit.
This commit is contained in:
1 parent
3798f1f771
commit
76f541bc3f
8 files changed
+26
-7
No files matched your search
@@ -17,7 +17,7 @@
|
||||
|
||||
<property name="mc.version" value="1.4.7"/>
|
||||
<property name="forge.version" value="6.6.0.507"/>
|
||||
<property name="thaumicbees.version" value="1.4.3"/>
|
||||
<property name="thaumicbees.version" value="1.4.3b"/>
|
||||
|
||||
<!-- for local deployment only, not used by main -->
|
||||
<property name="deploy.type" value="previews" />
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
1.4.3b
|
||||
Greatwood & Silverwood planks support BuildCraft facades.
|
||||
Tweaking Aura cost for Repair on Thaumium Grafters and other balance.
|
||||
Turns out I can't get the version crap to work properly. More fixes.
|
||||
|
||||
1.4.3a
|
||||
Changed Version info embedded in mod to match format supported by Version checking. Will need to make this more robust in the future.
|
||||
Fixed bug with Thaumium Grafter not being enchantable.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[
|
||||
{
|
||||
"modid": "ThaumicBees",
|
||||
"version": "@VERSION@ - @BUILD_NUMBER",
|
||||
"version": "@MODVERSION@",
|
||||
"name": "ThaumicBees",
|
||||
"url": "http://bit.ly/XFDvLY",
|
||||
"description": "Crossover mod for Forestry and Thaumcraft. Magic bees & more.",
|
||||
|
||||
@@ -37,8 +37,8 @@ public class Allele implements IAllele
|
||||
Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNodeFlux(), false);
|
||||
|
||||
Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false);
|
||||
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 7, false);
|
||||
Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 5, false);
|
||||
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 15, false);
|
||||
Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 10, false);
|
||||
Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false);
|
||||
|
||||
Allele.nodeGen = new AlleleEffectAuraNodeGrow("effectNodeGeneration", false, 400);
|
||||
|
||||
@@ -9,6 +9,7 @@ import forestry.api.arboriculture.IToolGrafter;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
@@ -80,8 +81,13 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
|
||||
{
|
||||
if (stack.getItemDamage() > 0)
|
||||
{
|
||||
if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 1, true))
|
||||
if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 2, true))
|
||||
{
|
||||
if (e instanceof EntityPlayer)
|
||||
{
|
||||
EntityPlayer p = (EntityPlayer)e;
|
||||
p.addExhaustion(0.12f);
|
||||
}
|
||||
stack.damageItem(-1, (EntityLiving)e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,6 +73,7 @@ public class ThaumicBees
|
||||
this.modConfig.registerTileEntities();
|
||||
this.modConfig.setupItems();
|
||||
|
||||
CompatabilityManager.setupBuildCraftFacades();
|
||||
CompatabilityManager.setupBackpacks();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ import thaumicbees.item.ItemMiscResources;
|
||||
import thaumicbees.item.types.CombType;
|
||||
import thaumicbees.item.types.DropType;
|
||||
import thaumicbees.item.types.LiquidType;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.item.types.PollenType;
|
||||
import thaumicbees.item.types.PropolisType;
|
||||
import thaumicbees.item.types.ResourceType;
|
||||
@@ -440,6 +441,12 @@ public class CompatabilityManager
|
||||
|
||||
}
|
||||
|
||||
public static void setupBuildCraftFacades()
|
||||
{
|
||||
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal());
|
||||
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal());
|
||||
}
|
||||
|
||||
public static void setupResearch()
|
||||
{
|
||||
ObjectTags tags;
|
||||
|
||||
@@ -81,7 +81,7 @@ public class VersionInfo
|
||||
int[] versionTokens = parseVersion(version);
|
||||
int[] targetTokens = parseVersion(target);
|
||||
|
||||
for (int i = 0; i < versionTokens.length; ++i)
|
||||
for (int i = 0; i < versionTokens.length && i < targetTokens.length; ++i)
|
||||
{
|
||||
if (versionTokens[i] < targetTokens[i])
|
||||
{
|
||||
@@ -111,7 +111,7 @@ public class VersionInfo
|
||||
int[] versionTokens = parseVersion(version);
|
||||
int[] targetTokens = parseVersion(target);
|
||||
|
||||
for (int i = 0; i < versionTokens.length; ++i)
|
||||
for (int i = 0; i < versionTokens.length && i < targetTokens.length; ++i)
|
||||
{
|
||||
if (versionTokens[i] > targetTokens[i])
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user