Version control logic, improved the destroy handling hook.

This commit is contained in:
Eloraam committed 2011-08-20 08:59:05 +00:00
1 parent 8fcc2a1f9f
commit 6cfbc34940
4 files changed
+80 -17

No files matched your search

@@ -26,9 +26,9 @@ public class ForgeHooks {
static LinkedList<ICraftingHandler> craftingHandlers = new LinkedList<ICraftingHandler>();
public static void onDestroyCurrentItem(EntityPlayer player) {
public static void onDestroyCurrentItem(EntityPlayer player, ItemStack orig) {
for (IDestroyToolHandler handler : destroyToolHandlers) {
handler.onDestroyCurrentItem(player);
handler.onDestroyCurrentItem(player,orig);
}
}
@@ -138,6 +138,13 @@ public class ForgeHooks {
// TODO: add other tool tables.
}
public static final int majorVersion=1;
public static final int minorVersion=1;
public static final int revisionVersion=5;
static {
System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion);
}
static boolean toolInit=false;
static HashMap toolClasses=new HashMap();
static HashMap toolHarvestLevels=new HashMap();
@@ -4,12 +4,13 @@
*/
package net.minecraft.src.forge;
import net.minecraft.src.ItemStack;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumStatus;
public interface IDestroyToolHandler {
/** Called when the user's currently equipped item is destroyed.
*/
public void onDestroyCurrentItem(EntityPlayer player);
public void onDestroyCurrentItem(EntityPlayer player, ItemStack orig);
}
@@ -166,4 +166,55 @@ public class MinecraftForge {
public static void addPickaxeBlockEffectiveAgainst (Block block) {
setBlockHarvestLevel(block,"pickaxe",0);
}
/**
* Kill minecraft with an error message.
*/
public static void killMinecraft(String modname, String msg) {
throw new RuntimeException(modname+": "+msg);
}
/**
* Version checking. Ensures that a sufficiently recent version of Forge
* is installed. Will result in a fatal error if the major versions
* mismatch or if the version is too old. Will print a warning message if
* the minor versions don't match.
*/
public static void versionDetect(String modname,
int major, int minor, int revision) {
if(major!=ForgeHooks.majorVersion) {
killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
} else if(minor!=ForgeHooks.minorVersion) {
if(minor>ForgeHooks.minorVersion) {
killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
} else {
System.out.println(modname + ": MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x, may lead to unexpected behavior");
}
} else if(revision>ForgeHooks.revisionVersion) {
killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
}
}
/**
* Strict version checking. Ensures that a sufficiently recent version of
* Forge is installed. Will result in a fatal error if the major or minor
* versions mismatch or if the version is too old. Use this function for
* mods that use recent, new, or unstable APIs to prevent
* incompatibilities.
*/
public static void versionDetectStrict(String modname,
int major, int minor, int revision) {
if(major!=ForgeHooks.majorVersion) {
killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
} else if(minor!=ForgeHooks.minorVersion) {
if(minor>ForgeHooks.minorVersion) {
killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
} else {
killMinecraft(modname,"MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x");
}
} else if(revision>ForgeHooks.revisionVersion) {
killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
}
}
}