Updated to SDK's 1.2.3 MLMP, Mush cleaner, no longer supporting Flan's.
This commit is contained in:
parent
74a33759fd
commit
7cfd984093
|
@ -0,0 +1,14 @@
|
|||
--- ../src_base/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src_work/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -90,10 +90,7 @@
|
||||
|
||||
byte[] var8 = new byte[var7];
|
||||
|
||||
- for (int var9 = 0; var9 < var7; var9 += var1.read(var8, var9, var7 - var9))
|
||||
- {
|
||||
- ;
|
||||
- }
|
||||
+ var1.readFully(var8);
|
||||
|
||||
this.dataString[var6] = new String(var8);
|
||||
}
|
|
@ -1,82 +0,0 @@
|
|||
--- ../src_base/minecraft_server/net/minecraft/src/BaseMod.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src_work/minecraft_server/net/minecraft/src/BaseMod.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -5,18 +5,33 @@
|
||||
|
||||
public abstract class BaseMod
|
||||
{
|
||||
- public int AddFuel(int var1)
|
||||
+ public int addFuel(int var1, int var2)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ public boolean dispenseEntity(World var1, double var2, double var4, double var6, int var8, int var9, ItemStack var10)
|
||||
+ {
|
||||
+ return DispenseEntity(var1, var2, var4, var6, var8, var9, var10); //Lazy Flan
|
||||
+ }
|
||||
+
|
||||
public boolean DispenseEntity(World var1, double var2, double var4, double var6, int var8, int var9, ItemStack var10)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
+ public void generateNether(World var1, Random var2, int var3, int var4)
|
||||
+ {
|
||||
+ GenerateNether(var1, var2, var3, var4); //Lazy Flan
|
||||
+ }
|
||||
+
|
||||
public void GenerateNether(World var1, Random var2, int var3, int var4) {}
|
||||
|
||||
+ public void generateSurface(World var1, Random var2, int var3, int var4)
|
||||
+ {
|
||||
+ GenerateSurface(var1, var2, var3, var4); //Lazy Flan
|
||||
+ }
|
||||
+
|
||||
public void GenerateSurface(World var1, Random var2, int var3, int var4) {}
|
||||
|
||||
public String getName()
|
||||
@@ -32,17 +47,39 @@
|
||||
public abstract String getVersion();
|
||||
|
||||
public abstract void load();
|
||||
+
|
||||
+ public void modsLoaded()
|
||||
+ {
|
||||
+ ModsLoaded(); //Lazy Flan
|
||||
+ }
|
||||
+
|
||||
+ public void ModsLoaded(){}
|
||||
|
||||
- public void OnTickInGame(MinecraftServer var1) {}
|
||||
+ public void onItemPickup(EntityPlayer var1, ItemStack var2)
|
||||
+ {
|
||||
+ OnItemPickup(var1, var2); //Lazy Flan
|
||||
+ }
|
||||
+ public void OnItemPickup(EntityPlayer var1, ItemStack var2) {}
|
||||
|
||||
- public void ModsLoaded() {}
|
||||
+ public boolean onTickInGame(MinecraftServer var1)
|
||||
+ {
|
||||
+ onTickInGame(var1); //Lazy Flan
|
||||
+ return true;
|
||||
+ }
|
||||
+ public void OnTickInGame(MinecraftServer var1) {}
|
||||
|
||||
+ public void takenFromCrafting(EntityPlayer var1, ItemStack var2, IInventory var3)
|
||||
+ {
|
||||
+ TakenFromCrafting(var1, var2); //Lazy Flan
|
||||
+ }
|
||||
public void TakenFromCrafting(EntityPlayer var1, ItemStack var2) {}
|
||||
|
||||
+ public void takenFromFurnace(EntityPlayer var1, ItemStack var2)
|
||||
+ {
|
||||
+ TakenFromFurnace(var1, var2);
|
||||
+ }
|
||||
public void TakenFromFurnace(EntityPlayer var1, ItemStack var2) {}
|
||||
-
|
||||
- public void OnItemPickup(EntityPlayer var1, ItemStack var2) {}
|
||||
-
|
||||
+
|
||||
public String toString()
|
||||
{
|
||||
return this.getName() + ' ' + this.getVersion();
|
|
@ -19,14 +19,5 @@
|
|||
+ return pkt;
|
||||
+ }
|
||||
|
||||
EntityTrackerEntry2 var1 = ModLoaderMp.HandleEntityTrackerEntries(this.trackedEntity);
|
||||
EntityTrackerEntry2 var1 = ModLoaderMp.handleEntityTrackerEntries(this.trackedEntity);
|
||||
|
||||
@@ -332,7 +339,7 @@
|
||||
catch (Exception var4)
|
||||
{
|
||||
ModLoader.getLogger().throwing("EntityTrackerEntry", "getSpawnPacket", var4);
|
||||
- ModLoader.ThrowException(String.format("Error sending spawn packet for entity of type %s.", new Object[] {this.trackedEntity.getClass()}), var4);
|
||||
+ ModLoader.throwException(String.format("Error sending spawn packet for entity of type %s.", new Object[] {this.trackedEntity.getClass()}), var4);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -8,27 +8,9 @@
|
|||
|
||||
public class ModLoaderMp
|
||||
{
|
||||
@@ -182,7 +183,7 @@
|
||||
{
|
||||
IllegalArgumentException var2 = new IllegalArgumentException("baseModMp cannot be null.");
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "SendPacketToAll", var2);
|
||||
- ModLoader.ThrowException("baseModMp cannot be null.", var2);
|
||||
+ ModLoader.throwException("baseModMp cannot be null.", var2);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -213,7 +214,7 @@
|
||||
{
|
||||
IllegalArgumentException var3 = new IllegalArgumentException("baseModMp cannot be null.");
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "SendPacketTo", var3);
|
||||
- ModLoader.ThrowException("baseModMp cannot be null.", var3);
|
||||
+ ModLoader.throwException("baseModMp cannot be null.", var3);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -231,13 +232,11 @@
|
||||
|
||||
public static World GetPlayerWorld(EntityPlayer var0)
|
||||
public static World getPlayerWorld(EntityPlayer var0)
|
||||
{
|
||||
- WorldServer[] var1 = ModLoader.getMinecraftServerInstance().worldMngr;
|
||||
-
|
||||
|
@ -43,56 +25,15 @@
|
|||
}
|
||||
}
|
||||
|
||||
@@ -267,31 +266,31 @@
|
||||
catch (IllegalAccessException var4)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "AddCustomPacketMapping", var4);
|
||||
- ModLoader.ThrowException("ModLoaderMP", var4);
|
||||
+ ModLoader.throwException("ModLoaderMP", var4);
|
||||
return;
|
||||
}
|
||||
catch (IllegalArgumentException var5)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "init", var5);
|
||||
- ModLoader.ThrowException("ModLoaderMP", var5);
|
||||
+ ModLoader.throwException("ModLoaderMP", var5);
|
||||
return;
|
||||
}
|
||||
catch (InvocationTargetException var6)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "init", var6);
|
||||
- ModLoader.ThrowException("ModLoaderMP", var6);
|
||||
+ ModLoader.throwException("ModLoaderMP", var6);
|
||||
return;
|
||||
}
|
||||
catch (NoSuchMethodException var7)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "init", var7);
|
||||
- ModLoader.ThrowException("ModLoaderMP", var7);
|
||||
+ ModLoader.throwException("ModLoaderMP", var7);
|
||||
return;
|
||||
}
|
||||
catch (SecurityException var8)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoaderMP", "init", var8);
|
||||
- ModLoader.ThrowException("ModLoaderMP", var8);
|
||||
+ ModLoader.throwException("ModLoaderMP", var8);
|
||||
return;
|
||||
}
|
||||
@@ -384,6 +383,11 @@
|
||||
|
||||
@@ -315,13 +314,13 @@
|
||||
catch (FileNotFoundException var9)
|
||||
for (var5 = 0; var5 < ModLoader.getLoadedMods().size(); ++var5)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoader", "init", var9);
|
||||
- ModLoader.ThrowException("ModLoaderMultiplayer", var9);
|
||||
+ ModLoader.throwException("ModLoaderMultiplayer", var9);
|
||||
return;
|
||||
}
|
||||
catch (IOException var10)
|
||||
{
|
||||
ModLoader.getLogger().throwing("ModLoader", "init", var10);
|
||||
- ModLoader.ThrowException("ModLoaderMultiplayer", var10);
|
||||
+ ModLoader.throwException("ModLoaderMultiplayer", var10);
|
||||
return;
|
||||
}
|
||||
+ if (!(ModLoader.getLoadedMods().get(var5) instanceof BaseModMp))
|
||||
+ {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
BaseModMp var6 = (BaseModMp)ModLoader.getLoadedMods().get(var5);
|
||||
|
||||
if (var6.hasClientSide() && var6.toString().lastIndexOf("mod_") != -1)
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
}
|
||||
|
||||
var2.func_20057_k();
|
||||
- ModLoaderMp.HandleAllLogins(var2);
|
||||
- ModLoaderMp.handleAllLogins(var2);
|
||||
+ if (par1Packet1Login.serverMode == ForgePacket.FORGE_ID)
|
||||
+ {
|
||||
+ //Pretty hackish place to put it, but it needs to go somewhere
|
||||
|
@ -48,7 +48,7 @@
|
|||
+ pkt.length = pkt.data.length;
|
||||
+ var5.sendPacket(pkt);
|
||||
+ ForgeHooksServer.sendModListRequest(netManager);
|
||||
+ ModLoaderMp.HandleAllLogins(var2);
|
||||
+ ModLoaderMp.handleAllLogins(var2);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
--- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -76,10 +76,7 @@
|
||||
|
||||
byte[] var7 = new byte[var6];
|
||||
|
||||
- for (int var8 = 0; var8 < var6; var8 += var1.read(var7, var8, var6 - var8))
|
||||
- {
|
||||
- ;
|
||||
- }
|
||||
+ var1.readFully(var7);
|
||||
|
||||
this.dataString[var5] = new String(var7);
|
||||
}
|
|
@ -8,12 +8,10 @@
|
|||
public class SlotCrafting extends Slot
|
||||
{
|
||||
/** The craft matrix inventory linked to this result slot. */
|
||||
@@ -88,7 +90,8 @@
|
||||
this.thePlayer.addStat(AchievementList.bookcase, 1);
|
||||
@@ -89,6 +91,7 @@
|
||||
}
|
||||
|
||||
- ModLoader.TakenFromCrafting(this.thePlayer, par1ItemStack);
|
||||
+ ModLoader.takenFromCrafting(this.thePlayer, par1ItemStack, craftMatrix);
|
||||
ModLoader.takenFromCrafting(this.thePlayer, par1ItemStack, this.craftMatrix);
|
||||
+ ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix);
|
||||
}
|
||||
|
||||
|
|
|
@ -50,15 +50,6 @@
|
|||
{
|
||||
if (par1ItemStack == null)
|
||||
{
|
||||
@@ -287,7 +293,7 @@
|
||||
else
|
||||
{
|
||||
int var2 = par1ItemStack.getItem().shiftedIndex;
|
||||
- return var2 < 256 && Block.blocksList[var2].blockMaterial == Material.wood ? 300 : (var2 == Item.stick.shiftedIndex ? 100 : (var2 == Item.coal.shiftedIndex ? 1600 : (var2 == Item.bucketLava.shiftedIndex ? 20000 : (var2 == Block.sapling.blockID ? 100 : (var2 == Item.blazeRod.shiftedIndex ? 2400 : ModLoader.AddAllFuel(var2))))));
|
||||
+ return var2 < 256 && Block.blocksList[var2].blockMaterial == Material.wood ? 300 : (var2 == Item.stick.shiftedIndex ? 100 : (var2 == Item.coal.shiftedIndex ? 1600 : (var2 == Item.bucketLava.shiftedIndex ? 20000 : (var2 == Block.sapling.blockID ? 100 : (var2 == Item.blazeRod.shiftedIndex ? 2400 : ModLoader.addAllFuel(par1ItemStack.itemID, par1ItemStack.getItemDamage()))))));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -302,4 +308,18 @@
|
||||
public void openChest() {}
|
||||
|
||||
|
|
Loading…
Reference in New Issue