thvortex

--- commands1.py	2012-03-04 01:56:04.000000000 -0600
+++ commands.py	2012-03-08 17:27:00.040003100 -0600
@@ -1524,6 +1524,7 @@
         regexps = {
             'field': re.compile(r'^ {4}(?:[\w$.[\]]+ )*(?P<name>field_[0-9]+_[a-zA-Z_]+) *(?:=|;)'),
             'method': re.compile(r'^ {4}(?:[\w$.[\]]+ )*(?P<name>func_[0-9]+_[a-zA-Z_]+)\('),
+            'javadoctag': re.compile(r'\s*(?<!{)@'),
         }
         wrapper = TextWrapper(width=120)
 

thvortex

package net.minecraft.src;

public class mod_MetaBlocks extends BaseMod
{
    public mod_MetaBlocks()
    {
        ModLoader.AddLocalization("tile.itemmeta.name", "Mallorn Leaves");

        Block.blocksList[20] = null; // Avoid exception throw in Block() constructor
        Block glass = new BlockGlassMeta(20, 49, Material.glass // ... the rest is the same as the "glass" static initializer in Blocks.java

thvortex

diff --git a/src/minecraft/net/minecraft/src/FontRenderer.java b/src/minecraft/net/minecraft/src/FontRenderer.java
index a10060d..966f08b 100644
--- a/src/minecraft/net/minecraft/src/FontRenderer.java
+++ b/src/minecraft/net/minecraft/src/FontRenderer.java
@@ -154,7 +154,7 @@ public class FontRenderer
     /**
      * Render a single character with the default.png font at current (posX,posY) location.
      */
-    private void renderDefaultChar(int par1)
+    private void renderDefaultChar(int par1, int color)

thvortex

diff --git a/src/minecraft/net/minecraft/src/FontRenderer.java b/src/minecraft/net/minecraft/src/FontRenderer.java
index a10060d..ac492a6 100644
--- a/src/minecraft/net/minecraft/src/FontRenderer.java
+++ b/src/minecraft/net/minecraft/src/FontRenderer.java
@@ -154,7 +154,7 @@ public class FontRenderer
     /**
      * Render a single character with the default.png font at current (posX,posY) location.
      */
-    private void renderDefaultChar(int par1)
+    private void renderDefaultChar(int par1, int color)

thvortex

// HOW TO DRAW A TEXTURED RECTANGLE IN A MINECRAFT GUI WITH THE TEXTURE SCALED TO FIT
//
//
// 1. You need an instance of RenderEngine. Using ModLoader you can obtain it with:
//
RenderEngine renderEngine = ModLoader.getMinecraftInstance().renderEngine;
 
// 2a. When your mod first starts, you need to load your texture into OpenGL. If your image
//     file is on the classpath (i.e. inside minecraft.jar or inside your own mod's jar) then
//     you can load it easily. Your image file should contain an alpha layer with only 0 or 255

thvortex

diff --git a/src/minecraft/net/minecraft/src/CommandServerBan.java b/src/minecraft/net/minecraft/src/CommandServerBan.java
index d151938..f36d545 100644
--- a/src/minecraft/net/minecraft/src/CommandServerBan.java
+++ b/src/minecraft/net/minecraft/src/CommandServerBan.java
@@ -31,6 +31,12 @@ public class CommandServerBan extends CommandBase
             BanEntry var4 = new BanEntry(par2ArrayOfStr[0]);
             var4.setBannedBy(par1ICommandSender.getCommandSenderName());
 
+            MinecraftServer server = MinecraftServer.getServer();
+            if (server.isSinglePlayer() && server.getServerOwner().equalsIgnoreCase(par2ArrayOfStr[0]))

thvortex

diff --git a/runtime/commands.py b/runtime/commands.py
index cd7f615..6d81854 100644
--- a/runtime/commands.py
+++ b/runtime/commands.py
@@ -1490,6 +1490,7 @@ class Commands(object):
         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
         outpathlk = {CLIENT: self.dirreobfclt, SERVER: self.dirreobfsrv}
         srglk = {CLIENT: self.srgsclient, SERVER: self.srgsserver}
+        zipoutlk = {CLIENT: 'client_mod.zip', SERVER: 'server_mod.zip'}
 

thvortex

diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- minecraft\net\minecraft\src\FontRenderer.java	Thu Nov 15 17:48:11 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Thu Nov 15 17:50:26 2012
@@ -611,8 +611,6 @@
          case 10:
             --var5;
             break;
-         case 32:
-            var6 = var5;
          case 167: