RainWarrior

<blockstate> == {
  "forge_marker": 1,
  "defaults": <variant>, // optional, added to all variants
  "variants": {
    "<property>": {
    "<value>": <variant> // variant definition for the specified value of this property; variants for multiple values can be specified.
  },
    "<variant name>": <variant>, // variant definition for the full variant string
    "<variant name>": [<variant1>, ...], // array of definitions for the full variant - result will be the random variant
  }

RainWarrior

{
    "forge_marker": 1,
    "defaults": {
        "textures": { "all": "yourmod:blocks/yourtexture" },
        "model": "cube_all",
        "transform": "forge:default-block"
     },
    "variants": {
        "normal": [{}],
        "inventory": [{}]

RainWarrior

--- a/src/main/java/cpw/mods/fml/common/LoadController.java
+++ b/src/main/java/cpw/mods/fml/common/LoadController.java
@@ -37,6 +37,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 
 import cpw.mods.fml.common.LoaderState.ModState;
+import cpw.mods.fml.common.ProgressManager.ProgressBar;
 import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.event.FMLModDisabledEvent;

RainWarrior

diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
index 3f51eae..7fa28da 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -1,7 +1,9 @@
 package net.minecraftforge.client.model;
 
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;

RainWarrior

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1

mQENBFEv6JUBCADU7idZryNFzoE2giUw8sVbyiSs9n7Ke6jAy5lP/G3L11ygSn2K
oJqrmC+WpSoIKQrW0zkzV3WRbYlaXg9lmlBJfjnpMj8U1WNrhyiMACpcro9HKHos
OEVq2hquCi/kHheZhgFYu8CDZf/aVRVdq7gSJNWirOj+AVlI/qxYGxlzT+BDjg92
9RYHv8I+rCKZ6nyvNPZH7veXF7kK8lpEDUUf6ilmrXqwtAxeHtWMM4clLRbtd0A4
4Jgvx97BVV8Ck3lzdQY4VNlt8QSVnTvj69nb4S6OWUI2e6WXcj9BnS4UhuNazNxO
JmMgxb5aGbtr2BqBiS3tojQhXTda6fyrk37RABEBAAG0IFJhaW5XYXJyaW9yIDxy
YWlud2FycmlvckBmcnkuc3U+iQE4BBMBAgAiBQJRL+iVAhsDBgsJCAcDAgYVCAIJ

RainWarrior

--- ../src-base/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
...
@@ -38,13 +42,13 @@
         return new BakedQuad(aint, p_178414_3_.field_178245_c, enumfacing1);
     }
 
-    private int[] func_178405_a(BlockPartFace p_178405_1_, TextureAtlasSprite p_178405_2_, EnumFacing p_178405_3_, float[] p_178405_4_, ModelRotation p_178405_5_, BlockPartRotation p_178405_6_, boolean p_178405_7_, boolean p_178405_8_)
+    private int[] makeQuadVertexData(BlockPartFace p_178405_1_, TextureAtlasSprite p_178405_2_, EnumFacing p_178405_3_, float[] p_178405_4_, net.minecraftforge.client.model.ITransformation p_178405_5_, BlockPartRotation p_178405_6_, boolean p_178405_7_, boolean p_178405_8_)
     {

RainWarrior

import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;

class Test {
    void checkBlock(World world, int x, int y, int z) {
        int[] xOffsets = {-8, -8, 8, 8};
        int[] zOffsets = {-8, 8, -8, 8};
        int[] yOffsets = {-8, 8};
        ExtendedBlockStorage[][][] esbs = new ExtendedBlockStorage[2][2][2];

RainWarrior

Implementation source: https://github.com/RainWarrior/AsmStuff/commit/8c8290bcb200ff069361b52a570b2172a78fe77c

Implementation binary (implemented with -m key to my old obfuscator): https://dl.dropboxusercontent.com/u/7533713/tree_obfuscator_2.10-0.2-one-jar.jar

Example usage, will convert in.jar to out.jar:

java -jar tree_obfuscator.jar -s empty.srg -m -cf in.jar -c:in.jar=out.jar

RainWarrior

interface I {
    public int x();
}

class IImpl {
    public int y() {
        return 3;
    }
}

RainWarrior

package rainwarrior.fluidmod

import net.minecraft.{ block, creativetab, init, item },
  block.{ Block, material },
  creativetab.CreativeTabs,
  init.Blocks,
  item.{ Item, ItemBlock, ItemStack },
  material.Material
import org.apache.logging.log4j.LogManager
import cpw.mods.fml.{ common, relauncher },