From 9e28c51d23f5627658e48c8abb75bd55be368b20 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Fri, 2 Dec 2011 02:26:15 +0000 Subject: [PATCH] Fixed missing CraftingManager patches for the repair disable hook. Fixed smp mlprop. --- .../minecraft/src/CraftingManager.java.patch | 11 ++++++ .../minecraft/src/CraftingManager.java.patch | 11 ++++++ .../net/minecraft/src/MLProp.java.patch | 34 +++++++++++++++++++ setup.sh | 1 + 4 files changed, 57 insertions(+) create mode 100644 patches/minecraft/net/minecraft/src/CraftingManager.java.patch create mode 100644 patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch create mode 100644 patches/minecraft_server/net/minecraft/src/MLProp.java.patch diff --git a/patches/minecraft/net/minecraft/src/CraftingManager.java.patch b/patches/minecraft/net/minecraft/src/CraftingManager.java.patch new file mode 100644 index 0000000000..23b8ec0646 --- /dev/null +++ b/patches/minecraft/net/minecraft/src/CraftingManager.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 +@@ -363,7 +363,7 @@ + i++; + } + +- if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable()) ++ if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isRepairable()) + { + Item item = Item.itemsList[itemstack.itemID]; + int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); diff --git a/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch b/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch new file mode 100644 index 0000000000..fff409902e --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/CraftingManager.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/CraftingManager.java 0000-00-00 00:00:00.000000000 -0000 +@@ -363,7 +363,7 @@ + i++; + } + +- if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable()) ++ if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isRepairable()) + { + Item item = Item.itemsList[itemstack.itemID]; + int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); diff --git a/patches/minecraft_server/net/minecraft/src/MLProp.java.patch b/patches/minecraft_server/net/minecraft/src/MLProp.java.patch new file mode 100644 index 0000000000..ac54e306ce --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/MLProp.java.patch @@ -0,0 +1,34 @@ +--- ../src_base/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java 0000-00-00 00:00:00.000000000 -0000 +@@ -1,22 +1,13 @@ +-// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. +-// Jad home page: http://www.kpdus.com/jad.html +-// Decompiler options: packimports(3) braces deadcode fieldsfirst +- + package net.minecraft.src; ++import java.lang.annotation.*; + +-import java.lang.annotation.Annotation; +- +-public interface MLProp +- extends Annotation +-{ +- +- public abstract String name(); +- +- public abstract String info(); +- +- public abstract double min(); +- +- public abstract double max(); ++@Retention(RetentionPolicy.RUNTIME) ++@Target(ElementType.FIELD) ++public @interface MLProp { ++ String name() default ""; ++ String info() default ""; ++ double min() default Double.NEGATIVE_INFINITY; ++ double max() default Double.POSITIVE_INFINITY; + +- public abstract int reobf(); ++ public int reobf() default 0; + } diff --git a/setup.sh b/setup.sh index 64750ecf80..dfba813ec4 100755 --- a/setup.sh +++ b/setup.sh @@ -25,6 +25,7 @@ if [ ! -d src_base ] ; then find . -name *.java -exec sed -i 's/\r//g' \{\} \; patch -p2 -i ../forge/modLoaderMP.patch + cp -f ../forge/MLProp.java minecraft/net/minecraft/src popd > /dev/null