diff --git a/fml/client/com/pclewis/mcpatcher/mod/TileSize.java b/fml/client/com/pclewis/mcpatcher/mod/TileSize.java new file mode 100644 index 0000000000..9bf00970c3 --- /dev/null +++ b/fml/client/com/pclewis/mcpatcher/mod/TileSize.java @@ -0,0 +1,30 @@ +/* + * The FML Forge Mod Loader suite. + * Copyright (C) 2012 cpw + * + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package com.pclewis.mcpatcher.mod; + +/** + * @author cpw + * + */ +@Deprecated +public class TileSize +{ + @Deprecated + public static int int_numPixels; + @Deprecated + public static int int_size; + @Deprecated + public static int int_sizeMinus1; +} diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 7cc16d5557..906aa62755 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -19,12 +19,14 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Random; +import java.util.logging.Level; import java.util.logging.Logger; import javax.imageio.ImageIO; @@ -779,8 +781,32 @@ public class FMLClientHandler implements IFMLSidedHandler { JsonNode root=new JdomParser().func_27366_a(new InputStreamReader(input)); ModMetadata meta=new ModMetadata(mod); - meta.name=root.func_27213_a("name"); - meta.description=root.func_27213_a("description"); + try { + meta.name=root.func_27213_a("name"); + meta.description=root.func_27213_a("description"); + meta.version=root.func_27213_a("version"); + meta.credits=root.func_27213_a("credits"); + List authors=root.func_27217_b("authors"); + StringBuilder sb=new StringBuilder(); + for (int i=0; i>4; + var3.textureGridSize = tileSize * tileSize; + var3.textureLength = tileSize; ++ TileSize.int_numPixels=var3.textureGridSize; ++ TileSize.int_size=tileSize; ++ TileSize.int_sizeMinus1=tileSize-1; + if (var3.field_1127_a==null || var3.field_1127_a.length!= var3.textureGridSize << 2) { + var3.field_1127_a = new byte[var3.textureGridSize << 2]; + } @@ -70,7 +83,7 @@ } } } -@@ -635,4 +659,8 @@ +@@ -635,4 +665,8 @@ GL11.glBindTexture(GL11.GL_TEXTURE_2D, p_1076_1_); } }