diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml
index cec0927..d733f7e 100644
--- a/thaumicbees_res/build.xml
+++ b/thaumicbees_res/build.xml
@@ -74,7 +74,7 @@
-
+
@@ -84,9 +84,6 @@
-
-
-
@@ -124,7 +121,7 @@
-
+
@@ -139,6 +136,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt
index b4022ef..99f0a2b 100644
--- a/thaumicbees_res/changelog.txt
+++ b/thaumicbees_res/changelog.txt
@@ -1,6 +1,8 @@
1.4.2
-Added Void Capsules - hold up to 8 buckets of liquid with one! It's a waterproof bag of holding!
+Added Void Capsules - hold up to 8 buckets of liquid with one! It's a waterproof bag of holding! Plus stacking.
Fix: Added Greatwood & Silverwood slabs to the ore dictionary so they should work as normal.
+Added Thaumium Scoop - 30 uses, can be enchanted with Repair.
+Added Thaumium Grafter - 15 uses, can be enchanted with Repair.
1.4.1
Added Greatwood and Silverwood planks. Since Greatwood and Silverwood are tougher than other trees, you'll need some extra machinery. To obtain these, jam a log of the appropriate tree into a Forestry carpenter and provide a half bucket of water.
@@ -15,6 +17,7 @@ Thaumaturge's Backpack now require Amber rather than Gold Nuggets.
Due to popular complaint, the Bees & Magic node now requires Unified Thaumic Field Theory to unlock.
Moving all kinds of string contstants out of code into Localization files.
Also fixed crazy aspects showing up on things that shouldn't have those aspects.
+ACTUALLY fixed issue with untyped node mutations failing.
1.3.0d
Fixed an issue with mutations requiring a non-specific type of node to fail.
diff --git a/thaumicbees_res/mcmod.info b/thaumicbees_res/mcmod.info
index c22ecf5..e3d6385 100644
--- a/thaumicbees_res/mcmod.info
+++ b/thaumicbees_res/mcmod.info
@@ -1,12 +1,12 @@
[
{
"modid": "ThaumicBees",
- "version": @MODVERSION@
+ "version": "@MODVERSION@",
"name": "ThaumicBees",
"url": "http://bit.ly/XFDvLY",
"description": "Crossover mod for Forestry and Thaumcraft. Magic bees & more.",
"authors": [ "MysteriousAges" ],
- "credits": "Thanks to Sengir and Azanor for awesome mods! Also thanks to Binnie and Florastar. (:",
+ "credits": "SirSengir, Azanor, Binnie & the Forestry Dev peeps",
"logoFile": "/gfx/thaumicbees/logo.png"
}
]
\ No newline at end of file
diff --git a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
index 5da5ebb..a3291bb 100644
--- a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
+++ b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java
@@ -21,7 +21,7 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
{
super(id);
this.setCreativeTab(forestry.api.core.Tabs.tabArboriculture);
- this.setMaxDamage(25);
+ this.setMaxDamage(15);
this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE);
this.setIconIndex(21);
this.setItemName("tb.thaumiumGrafter");
diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java
index 10e2332..0f879b5 100644
--- a/thaumicbees_src/thaumicbees/main/Config.java
+++ b/thaumicbees_src/thaumicbees/main/Config.java
@@ -56,6 +56,7 @@ public class Config
public boolean BeeInfusionsAdded;
public boolean ExtraBeesInstalled;
public boolean AddThaumcraftItemsToBackpacks;
+ public boolean SkipUpdateCheck;
public String ThaumaturgeExtraItems;
public int capsuleStackSizeMax;
@@ -264,6 +265,10 @@ public class Config
p.comment = "Allows you to edit the stack size of the capsules in ThaumicBees if using GregTech, \n" +
"or the reduced capsule size in Forestry & Railcraft. Default: 64";
this.capsuleStackSizeMax = p.getInt();
+
+ p = tbConfig.get("general", "disableVersionCheck", false);
+ p.comment = "Set to true to stop ThaumicBees from checking for updates.";
+ this.SkipUpdateCheck = p.getBoolean(false);
}
}
diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java
index 3201716..f0c0534 100644
--- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java
+++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java
@@ -91,6 +91,8 @@ public class ThaumicBees
MinecraftForge.EVENT_BUS.register(this);
CompatabilityManager.setupResearch();
+
+ VersionInfo.doVersionCheck();
}
public static Config getConfig()
diff --git a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java
index 1188f5d..0100583 100644
--- a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java
+++ b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java
@@ -24,6 +24,7 @@ import thaumicbees.item.types.WaxType;
import thaumicbees.main.CommonProxy;
import thaumicbees.main.Config;
import thaumicbees.main.ThaumicBees;
+import thaumicbees.main.utils.compat.ExtraBeesHelper;
import thaumicbees.main.utils.compat.ForestryHelper;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
import thaumicbees.main.utils.compat.ForestryHelper.CircuitBoard;
@@ -51,6 +52,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.Property;
import net.minecraftforge.common.Configuration;
+import net.minecraftforge.oredict.OreDictionary;
public class CompatabilityManager
{
@@ -158,17 +160,20 @@ public class CompatabilityManager
tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2);
ThaumcraftApi.registerObjectTag(Config.combs.itemID, -1, tags);
-
- itemStack = Config.combs.getStackForType(CombType.OCCULT);
- tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2).add(EnumTag.MAGIC, 2);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2);
ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OCCULT.ordinal(), tags);
ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OTHERWORLDLY.ordinal(), tags);
ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.STARK.ordinal(), tags);
- ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.AIRY.ordinal(), tags);
- ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.FIREY.ordinal(), tags);
- ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.WATERY.ordinal(), tags);
- ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.EARTHY.ordinal(), tags);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 4);
ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.INFUSED.ordinal(), tags);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.MOTION, 2);
+ ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.AIRY.ordinal(), tags);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.POWER, 2);
+ ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.FIREY.ordinal(), tags);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.COLD, 2);
+ ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.WATERY.ordinal(), tags);
+ tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.ROCK, 2);
+ ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.EARTHY.ordinal(), tags);
// Tagging capsules.
tags = new ObjectTags().add(EnumTag.VOID, 2).add(EnumTag.MAGIC, 2);
@@ -403,6 +408,31 @@ public class CompatabilityManager
{
ItemStack itemStack;
ObjectTags tags;
+
+ try // One try block suffices. If we can't get one item, it's probably safe to assume we can't get any others.
+ {
+ itemStack = getExtraBeeItem("comb");
+ tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
+ tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POWER, 2);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.OIL.ordinal(), tags);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.COAL.ordinal(), tags);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.FUEL.ordinal(), tags);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.ALCOHOL.ordinal(), tags);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.REDSTONE.ordinal(), tags);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.URANIUM.ordinal(), tags);
+ tags = new ObjectTags(itemStack.itemID, -1).add(EnumTag.POISON, 2);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, ExtraBeesHelper.CombType.VENOMOUS.ordinal(), tags);
+
+ itemStack = getExtraBeeItem("propolis");
+ tags = new ObjectTags().add(EnumTag.CONTROL, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
+
+ itemStack = getExtraBeeItem("honeyDrop");
+ tags = new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.LIFE, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
+ }
+ catch (NullPointerException e) { }
}
private static void setupItemAspectsOreDict()
diff --git a/thaumicbees_src/thaumicbees/main/utils/TickHandlerVersion.java b/thaumicbees_src/thaumicbees/main/utils/TickHandlerVersion.java
new file mode 100644
index 0000000..e47ed25
--- /dev/null
+++ b/thaumicbees_src/thaumicbees/main/utils/TickHandlerVersion.java
@@ -0,0 +1,102 @@
+package thaumicbees.main.utils;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+import net.minecraft.entity.player.EntityPlayer;
+import cpw.mods.fml.common.IScheduledTickHandler;
+import cpw.mods.fml.common.TickType;
+
+public class TickHandlerVersion implements IScheduledTickHandler
+{
+
+ public static TickHandlerVersion instance = new TickHandlerVersion();
+
+ private static ArrayList modVersionInfo = new ArrayList();
+ private static boolean initialized;
+ private static boolean sent;
+ private static int modIndex = 0;
+
+ public static boolean initialize()
+ {
+ if (initialized)
+ {
+ return false;
+ }
+ initialized = true;
+ return true;
+ }
+
+ public static boolean isInitialized()
+ {
+ return initialized;
+ }
+
+ public static boolean registerModVersionInfo(VersionInfo info)
+ {
+ if (modVersionInfo.contains(info))
+ {
+ return false;
+ }
+ modVersionInfo.add(info);
+ return true;
+ }
+
+ @Override
+ public void tickStart(EnumSet type, Object... tickData)
+ {
+ if (sent)
+ {
+ return;
+ }
+
+ if (modIndex < modVersionInfo.size())
+ {
+ VersionInfo anInfo = modVersionInfo.get(modIndex);
+
+ if (anInfo.isNewVersionAvailable())
+ {
+ EntityPlayer player = (EntityPlayer) tickData[0];
+ player.sendChatToPlayer("[" + anInfo.modName + "] A new version is available: " + anInfo.getLatestVersion());
+ player.sendChatToPlayer(anInfo.getVersionDescription());
+ }
+ modIndex += 1;
+ }
+ else
+ {
+ sent = true;
+ }
+ }
+
+ @Override
+ public void tickEnd(EnumSet type, Object... tickData)
+ {
+
+ }
+
+ @Override
+ public EnumSet ticks()
+ {
+ if (TickHandlerVersion.sent)
+ {
+ return EnumSet.noneOf(TickType.class);
+ }
+ return EnumSet.of(TickType.PLAYER);
+ }
+
+ @Override
+ public String getLabel()
+ {
+ return "thaumicbees.version";
+ }
+
+ @Override
+ public int nextTickSpacing()
+ {
+ if (!sent)
+ {
+ return 200;
+ }
+ return 72000;
+ }
+}
\ No newline at end of file
diff --git a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
index a62062b..f837207 100644
--- a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
+++ b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java
@@ -1,14 +1,246 @@
package thaumicbees.main.utils;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import thaumicbees.main.ThaumicBees;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.registry.TickRegistry;
+import cpw.mods.fml.relauncher.Side;
+
+/**
+ * Using some of the VersionInfo code from cofh. (Thanks, Lemming!)
+ * @author MysteriousAges
+ *
+ */
public class VersionInfo
{
- public static final String Version = "@MODVERSION@";
+ public static final String Version = "1.4.2a";//"@MODVERSION@";
public static final String MCVersion = "@MCVERSION@";
public static final String Build = "@BUILD_NUMBER@";
-
+ public static final String VersionURL = "http://bit.ly/thaumicbeeversion";
+
public static final String Logo = "/gfx/thaumicbees/logo.png";
-
+
public static final String Depends = "required-after:Forestry;required-after:Thaumcraft@[3.0.3,);after:ExtraBees";
+ boolean criticalUpdate;
+ boolean newVersion;
+ boolean newMinecraftVersion;
+ boolean versionCheckComplete;
+
+ String latestModVersion;
+ String latestMCVersion = MCVersion;
+ String description = "";
+
+ String modName;
+ String modVersion;
+ String releaseURL;
+ Logger modLogger = FMLLog.getLogger();
+
+ public static int[] parseVersion(String rawVersion)
+ {
+ ArrayList versionTokens = new ArrayList();
+ String[] tokens = rawVersion.trim().split("\\.");
+
+ for (int i = 0; i < tokens.length; ++i)
+ {
+ if (tokens[i].matches("[0-9]+[a-z]"))
+ {
+ String numberString = tokens[i].substring(0, tokens[i].length()-1);
+ versionTokens.add(Integer.valueOf(numberString));
+ versionTokens.add(Character.getNumericValue(tokens[i].charAt(tokens[i].length()-1)));
+ }
+ else
+ {
+ versionTokens.add(Integer.valueOf(tokens[i]));
+ }
+ }
+
+ int[] value = new int[versionTokens.size()];
+ for (int i = 0; i < value.length; ++i)
+ {
+ value[i] = versionTokens.get(i).intValue();
+ }
+ return value;
+ }
+
+ /* VERSION COMPARISON */
+ public static boolean beforeTargetVersion(String version, String target)
+ {
+ boolean result = false;
+ int[] versionTokens = parseVersion(version);
+ int[] targetTokens = parseVersion(target);
+
+ for (int i = 0; i < versionTokens.length; ++i)
+ {
+ if (versionTokens[i] < targetTokens[i])
+ {
+ result = true;
+ break;
+ }
+ else if (versionTokens[i] > targetTokens[i])
+ {
+ result = false;
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ public static boolean afterTargetVersion(String version, String target)
+ {
+ boolean result = false;
+ int[] versionTokens = parseVersion(version);
+ int[] targetTokens = parseVersion(target);
+
+ for (int i = 0; i < versionTokens.length; ++i)
+ {
+ if (versionTokens[i] > targetTokens[i])
+ {
+ result = true;
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ public VersionInfo(String name, String version, String url)
+ {
+ modName = name;
+ modVersion = latestModVersion = version;
+ releaseURL = url;
+ }
+
+ public VersionInfo(String name, String version, String url, Logger logger)
+ {
+ modName = name;
+ modVersion = latestModVersion = version;
+ releaseURL = url;
+ modLogger = logger;
+ }
+
+ public void checkForNewVersion()
+ {
+ Thread versionCheckThread = new VersionCheckThread();
+ versionCheckThread.start();
+ }
+
+ public String getCurrentVersion()
+ {
+ return modVersion;
+ }
+
+ public String getLatestVersion()
+ {
+ return latestModVersion;
+ }
+
+ public String getLatestMCVersion()
+ {
+ return latestMCVersion;
+ }
+
+ public String getVersionDescription()
+ {
+ return description;
+ }
+
+ public boolean isCriticalUpdate()
+ {
+ return criticalUpdate;
+ }
+
+ public boolean isNewVersionAvailable()
+ {
+ return newVersion;
+ }
+
+ public boolean isMinecraftOutdated()
+ {
+ return newMinecraftVersion;
+ }
+
+ public boolean isVersionCheckComplete()
+ {
+ return versionCheckComplete;
+ }
+
+ /* VERSION CHECK THREAD CLASS */
+ private class VersionCheckThread extends Thread
+ {
+ @Override
+ public void run()
+ {
+
+ try
+ {
+ String location = VersionURL;
+
+ HttpURLConnection connection = null;
+
+ // Used to "dereference" any location headers we may get.
+ while (location != null && !location.isEmpty())
+ {
+ URL url = new URL(location);
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestProperty("User-Agent",
+ "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.60 Safari/537.17");
+ connection.connect();
+ location = connection.getHeaderField("Location");
+ }
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ latestModVersion = reader.readLine();
+ criticalUpdate = Boolean.parseBoolean(reader.readLine());
+ latestMCVersion = reader.readLine();
+ description = reader.readLine();
+ reader.close();
+
+ if (beforeTargetVersion(modVersion, latestModVersion))
+ {
+ modLogger.log(Level.INFO, "An updated version of " + modName + " is available: " + latestModVersion + ".");
+ newVersion = true;
+ if (criticalUpdate)
+ {
+ modLogger.log(Level.INFO, "This update has been marked as CRITICAL and will ignore notification suppression.");
+ }
+ if (beforeTargetVersion(MCVersion, latestMCVersion))
+ {
+ newMinecraftVersion = true;
+ modLogger.log(Level.INFO, "This update is for Minecraft " + latestMCVersion + ".");
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ modLogger.log(Level.WARNING, "Version Check Failed: " + e.getMessage());
+ }
+ versionCheckComplete = true;
+ }
+ }
+
+ public static void doVersionCheck()
+ {
+ if (!ThaumicBees.getConfig().SkipUpdateCheck)
+ {
+ VersionInfo main = new VersionInfo("ThaumicBees", Version, VersionURL);
+ TickHandlerVersion.registerModVersionInfo(main);
+ TickHandlerVersion.initialize();
+ TickRegistry.registerScheduledTickHandler(TickHandlerVersion.instance, Side.CLIENT);
+
+ VersionCheckThread thread = main.new VersionCheckThread();
+ thread.start();
+ }
+ }
}
diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java
new file mode 100644
index 0000000..3f7d220
--- /dev/null
+++ b/thaumicbees_src/thaumicbees/main/utils/compat/ExtraBeesHelper.java
@@ -0,0 +1,91 @@
+package thaumicbees.main.utils.compat;
+
+public class ExtraBeesHelper
+{
+
+ public enum CombType
+ {
+ BARREN,
+ ROTTEN,
+ BONE,
+ OIL,
+ COAL,
+ FUEL,
+ WATER,
+ MILK,
+ FRUIT,
+ SEED,
+ ALCOHOL,
+ STONE,
+ REDSTONE,
+ RESIN,
+ IC2,
+ IRON,
+ GOLD,
+ COPPER,
+ TIN,
+ SILVER,
+ BRONZE,
+ URANIUM,
+ CLAY,
+ OLD,
+ FUNGAL,
+ CREOSOTE,
+ LATEX,
+ ACIDIC,
+ VENOMOUS,
+ SLIME,
+ BLAZE,
+ COFFEE,
+ GLACIAL,
+ MINT,
+ CITRUS,
+ PEAT,
+ SHADOW,
+ LEAD,
+ BRASS,
+ ELECTRUM,
+ ZINC,
+ TITANIUM,
+ TUNGSTEN,
+ STEEL,
+ IRIDIUM,
+ PLATINUM,
+ LAPIS,
+ SODALITE,
+ PYRITE,
+ BAUXITE,
+ CINNABAR,
+ SPHALERITE,
+ EMERALD,
+ RUBY,
+ SAPPHIRE,
+ OLIVINE,
+ DIAMOND,
+ RED,
+ YELLOW,
+ BLUE,
+ GREEN,
+ BLACK,
+ WHITE,
+ BROWN,
+ ORANGE,
+ CYAN,
+ PURPLE,
+ GRAY,
+ LIGHTBLUE,
+ PINK,
+ LIMEGREEN,
+ MAGENTA,
+ LIGHTGRAY,
+ NICKEL,
+ INVAR,
+ GLOWSTONE,
+ SALTPETER,
+ PULP,
+ MULCH,
+ COMPOST,
+ SAWDUST,
+ ;
+ }
+}