From b9b1f576225aa45f5638304a76b5764f5c4c85f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java index d4f41274..d55e180d 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -89,7 +89,7 @@ public class BaseBlockPosition implements Comparable { return MoreObjects.toStringHelper(this).add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString(); } - public int compareTo(Object object) { + public int compareTo(BaseBlockPosition object) { // Paper - decompile fix return this.l((BaseBlockPosition) object); } } diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java index 62a9c92f..1b759976 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -46,7 +46,7 @@ public abstract class BiomeBase { protected List w; public static int a(BiomeBase biomebase) { - return BiomeBase.REGISTRY_ID.a((Object) biomebase); + return BiomeBase.REGISTRY_ID.a(biomebase); // Paper - decompile fix } @Nullable diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java index 71524f2c..288c52c5 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -29,7 +29,7 @@ public class BlockStateEnum & INamable> extends BlockState throw new IllegalArgumentException("Multiple values have the same name \'" + s1 + "\'"); } - this.b.put(s1, oenum); + this.b.put(s1, (T) oenum); } } diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java index 76bf04f5..a99d0f87 100644 --- a/src/main/java/net/minecraft/server/CommandAbstract.java +++ b/src/main/java/net/minecraft/server/CommandAbstract.java @@ -231,7 +231,7 @@ public abstract class CommandAbstract implements ICommand { } if (object != null && oclass.isAssignableFrom(object.getClass())) { - return (Entity) object; + return (T) object; // Paper - fix decompile error } else { throw new ExceptionEntityNotFound(s); } @@ -448,7 +448,7 @@ public abstract class CommandAbstract implements ICommand { } private static > IBlockData a(IBlockData iblockdata, IBlockState iblockstate, Comparable comparable) { - return iblockdata.set(iblockstate, comparable); + return iblockdata.set(iblockstate, (T) comparable); // Paper - fix decompiler error } public static Predicate b(final Block block, String s) throws ExceptionInvalidBlockState { @@ -541,7 +541,7 @@ public abstract class CommandAbstract implements ICommand { @Nullable private static > T a(IBlockState iblockstate, String s) { - return (Comparable) iblockstate.b(s).orNull(); + return iblockstate.b(s).orNull(); // Paper - fix decompiler error } public static String a(Object[] aobject) { @@ -693,7 +693,7 @@ public abstract class CommandAbstract implements ICommand { return this.getCommand().compareTo(icommand.getCommand()); } - public int compareTo(Object object) { + public int compareTo(ICommand object) { // Paper - fix decompile error return this.a((ICommand) object); } diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java index 77b81a57..ba461ad4 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -34,7 +34,7 @@ public class EntityTypes { @Nullable public static String b(Entity entity) { - int i = EntityTypes.b.a((Object) entity.getClass()); + int i = EntityTypes.b.a(entity.getClass()); // Paper - Decompile fix return i == -1 ? null : (String) EntityTypes.g.get(i); } @@ -254,7 +254,7 @@ public class EntityTypes { EntityTypes.d.add(minecraftkey); while (EntityTypes.g.size() <= i) { - EntityTypes.g.add((Object) null); + EntityTypes.g.add(null); // Paper - Decompile fix } EntityTypes.g.set(i, s1); diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java index 58f47d0d..8860a012 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.List; import javax.annotation.Nullable; -public class RegistryBlockID implements Registry { +public class RegistryBlockID implements Registry { // Paper - Fix decompile error private final IdentityHashMap a; private final List b; @@ -26,7 +26,7 @@ public class RegistryBlockID implements Registry { this.a.put(t0, Integer.valueOf(i)); while (this.b.size() <= i) { - this.b.add((Object) null); + this.b.add(null); // Paper - Fix decompile error } this.b.set(i, t0); diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java index f5bcbdbe..3190cadf 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java @@ -20,7 +20,7 @@ public class ItemFactoryTest extends AbstractTestingBase { @Test public void testKnownAttributes() throws Throwable { - final ZipInputStream nmsZipStream = new ZipInputStream(CommandAbstract.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream()); + final ZipInputStream nmsZipStream = new ZipInputStream(net.minecraft.server.HttpUtilities.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream()); // Paper final Collection names = new HashSet(); for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) { final String entryName = clazzEntry.getName(); -- 2.14.2.windows.2