Moved UVLModelLoader to appeng
Moved UVLModelLoader to appeng. It's working and does not belong to test anymore. Also updated obf reflection names.
This commit is contained in:
elix-x
parent
d98f1e8dc3
commit
a2cad01c01
|
|
@ -49,19 +49,21 @@ import net.minecraftforge.client.event.ModelBakeEvent;
|
|||
import net.minecraftforge.client.event.MouseEvent;
|
||||
import net.minecraftforge.client.event.RenderLivingEvent;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import appeng.api.parts.CableRenderMode;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.block.AEBaseBlock;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
import appeng.client.render.effects.AssemblerFX;
|
||||
import appeng.client.render.effects.CraftingFx;
|
||||
import appeng.client.render.effects.EnergyFx;
|
||||
import appeng.client.render.effects.LightningArcFX;
|
||||
import appeng.client.render.effects.LightningFX;
|
||||
import appeng.client.render.effects.VibrantFX;
|
||||
import appeng.client.render.model.UVLModelLoader;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.AELog;
|
||||
import appeng.core.Api;
|
||||
|
|
@ -90,6 +92,7 @@ public class ClientHelper extends ServerHelper
|
|||
public void preinit()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register( this );
|
||||
ModelLoaderRegistry.registerLoader( UVLModelLoader.INSTANCE );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -284,6 +287,12 @@ public class ClientHelper extends ServerHelper
|
|||
throw new MissingCoreMod();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void modelsBake( ModelBakeEvent event )
|
||||
{
|
||||
UVLModelLoader.INSTANCE.setLoader( event.getModelLoader() );
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void postPlayerRender( final RenderLivingEvent.Pre p )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,324 @@
|
|||
|
||||
package appeng.client.render.model;
|
||||
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.lwjgl.util.vector.Vector3f;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.BlockFaceUV;
|
||||
import net.minecraft.client.renderer.block.model.BlockPart;
|
||||
import net.minecraft.client.renderer.block.model.BlockPartFace;
|
||||
import net.minecraft.client.renderer.block.model.BlockPartRotation;
|
||||
import net.minecraft.client.renderer.block.model.FaceBakery;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverride;
|
||||
import net.minecraft.client.renderer.block.model.ItemTransformVec3f;
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelBlock;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.JsonUtils;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.ICustomModelLoader;
|
||||
import net.minecraftforge.client.model.IModel;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.animation.ModelBlockAnimation;
|
||||
import net.minecraftforge.client.model.pipeline.LightUtil;
|
||||
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
|
||||
import net.minecraftforge.client.model.pipeline.VertexLighterFlat;
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.model.ITransformation;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
|
||||
|
||||
public enum UVLModelLoader implements ICustomModelLoader
|
||||
{
|
||||
INSTANCE;
|
||||
|
||||
private static final Constructor<? extends IModel> vanillaModelWrapper;
|
||||
private static final Field faceBakery;
|
||||
|
||||
static
|
||||
{
|
||||
try
|
||||
{
|
||||
Field modifiers = Field.class.getDeclaredField( "modifiers" );
|
||||
modifiers.setAccessible( true );
|
||||
|
||||
faceBakery = ReflectionHelper.findField( ModelBakery.class, "faceBakery", "field_177607_l" );
|
||||
modifiers.set( faceBakery, faceBakery.getModifiers() & ( ~Modifier.FINAL ) );
|
||||
|
||||
Class clas = Class.forName( ModelLoader.class.getName() + "$VanillaModelWrapper" );
|
||||
vanillaModelWrapper = clas.getDeclaredConstructor( ModelLoader.class, ResourceLocation.class, ModelBlock.class, boolean.class, ModelBlockAnimation.class );
|
||||
vanillaModelWrapper.setAccessible( true );
|
||||
}
|
||||
catch( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static Object deserializer( Class clas )
|
||||
{
|
||||
try
|
||||
{
|
||||
clas = Class.forName( clas.getName() + "$Deserializer" );
|
||||
Constructor constr = clas.getDeclaredConstructor();
|
||||
constr.setAccessible( true );
|
||||
return constr.newInstance();
|
||||
}
|
||||
catch( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static <M extends IModel> M vanillaModelWrapper( ModelLoader loader, ResourceLocation location, ModelBlock model, boolean uvlock, ModelBlockAnimation animation )
|
||||
{
|
||||
try
|
||||
{
|
||||
return (M) vanillaModelWrapper.newInstance( loader, location, model, uvlock, animation );
|
||||
}
|
||||
catch( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static void setFaceBakery( ModelBakery modelBakery, FaceBakery faceBakery )
|
||||
{
|
||||
try
|
||||
{
|
||||
UVLModelLoader.faceBakery.set( modelBakery, faceBakery );
|
||||
}
|
||||
catch( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private IResourceManager resourceManager;
|
||||
private ModelLoader loader;
|
||||
|
||||
public ModelLoader getLoader()
|
||||
{
|
||||
return loader;
|
||||
}
|
||||
|
||||
public void setLoader( ModelLoader loader )
|
||||
{
|
||||
this.loader = loader;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResourceManagerReload( IResourceManager resourceManager )
|
||||
{
|
||||
this.resourceManager = resourceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean accepts( ResourceLocation modelLocation )
|
||||
{
|
||||
return modelLocation.getResourcePath().endsWith( ".uvl" );
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModel loadModel( ResourceLocation modelLocation ) throws Exception
|
||||
{
|
||||
return new UVLModelWrapper( modelLocation );
|
||||
}
|
||||
|
||||
public class UVLModelWrapper implements IModel
|
||||
{
|
||||
final Gson UVLSERIALIZER = ( new GsonBuilder() ).registerTypeAdapter( ModelBlock.class, deserializer( ModelBlock.class ) ).registerTypeAdapter( BlockPart.class, deserializer( BlockPart.class ) ).registerTypeAdapter( BlockPartFace.class, new BlockPartFaceOverrideSerializer() ).registerTypeAdapter( BlockFaceUV.class, deserializer( BlockFaceUV.class ) ).registerTypeAdapter( ItemTransformVec3f.class, deserializer( ItemTransformVec3f.class ) ).registerTypeAdapter( ItemCameraTransforms.class, deserializer( ItemCameraTransforms.class ) ).registerTypeAdapter( ItemOverride.class, deserializer( ItemOverride.class ) ).create();
|
||||
|
||||
private Map<BlockPartFace, Pair<Float, Float>> uvlightmap = new HashMap<>();
|
||||
|
||||
private final IModel parent;
|
||||
|
||||
public UVLModelWrapper( ResourceLocation modelLocation )
|
||||
{
|
||||
String modelPath = modelLocation.getResourcePath();
|
||||
if( modelLocation.getResourcePath().startsWith( "models/" ) )
|
||||
{
|
||||
modelPath = modelPath.substring( "models/".length() );
|
||||
}
|
||||
ResourceLocation armatureLocation = new ResourceLocation( modelLocation.getResourceDomain(), "armatures/" + modelPath + ".json" );
|
||||
ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation( resourceManager, armatureLocation );
|
||||
ModelBlock model;
|
||||
{
|
||||
Reader reader = null;
|
||||
IResource iresource = null;
|
||||
ModelBlock lvt_5_1_ = null;
|
||||
|
||||
try
|
||||
{
|
||||
String s = modelLocation.getResourcePath();
|
||||
|
||||
iresource = Minecraft.getMinecraft().getResourceManager().getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) );
|
||||
reader = new InputStreamReader( iresource.getInputStream(), Charsets.UTF_8 );
|
||||
|
||||
lvt_5_1_ = JsonUtils.gsonDeserialize( UVLSERIALIZER, reader, ModelBlock.class, false );
|
||||
lvt_5_1_.name = modelLocation.toString();
|
||||
}
|
||||
catch( IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
finally
|
||||
{
|
||||
IOUtils.closeQuietly( reader );
|
||||
IOUtils.closeQuietly( (Closeable) iresource );
|
||||
}
|
||||
|
||||
model = lvt_5_1_;
|
||||
}
|
||||
|
||||
this.parent = vanillaModelWrapper( getLoader(), modelLocation, model, false, animation );
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ResourceLocation> getDependencies()
|
||||
{
|
||||
return parent.getDependencies();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ResourceLocation> getTextures()
|
||||
{
|
||||
return parent.getTextures();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
|
||||
{
|
||||
setFaceBakery( getLoader(), new FaceBakeryOverride() );
|
||||
IBakedModel model = parent.bake( state, format, bakedTextureGetter );
|
||||
setFaceBakery( getLoader(), new FaceBakery() );
|
||||
return model;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModelState getDefaultState()
|
||||
{
|
||||
return parent.getDefaultState();
|
||||
}
|
||||
|
||||
public class BlockPartFaceOverrideSerializer implements JsonDeserializer<BlockPartFace>
|
||||
{
|
||||
public BlockPartFace deserialize( JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_ ) throws JsonParseException
|
||||
{
|
||||
JsonObject jsonobject = p_deserialize_1_.getAsJsonObject();
|
||||
EnumFacing enumfacing = this.parseCullFace( jsonobject );
|
||||
int i = this.parseTintIndex( jsonobject );
|
||||
String s = this.parseTexture( jsonobject );
|
||||
BlockFaceUV blockfaceuv = (BlockFaceUV) p_deserialize_3_.deserialize( jsonobject, BlockFaceUV.class );
|
||||
BlockPartFace blockFace = new BlockPartFace( enumfacing, i, s, blockfaceuv );
|
||||
uvlightmap.put( blockFace, parseUVL( jsonobject ) );
|
||||
return blockFace;
|
||||
}
|
||||
|
||||
protected int parseTintIndex( JsonObject object )
|
||||
{
|
||||
return JsonUtils.getInt( object, "tintindex", -1 );
|
||||
}
|
||||
|
||||
private String parseTexture( JsonObject object )
|
||||
{
|
||||
return JsonUtils.getString( object, "texture" );
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private EnumFacing parseCullFace( JsonObject object )
|
||||
{
|
||||
String s = JsonUtils.getString( object, "cullface", "" );
|
||||
return EnumFacing.byName( s );
|
||||
}
|
||||
|
||||
protected Pair<Float, Float> parseUVL( JsonObject object )
|
||||
{
|
||||
if( !object.has( "uvlightmap" ) )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
object = object.get( "uvlightmap" ).getAsJsonObject();
|
||||
return new ImmutablePair<Float, Float>( JsonUtils.getFloat( object, "sky", 0 ), JsonUtils.getFloat( object, "block", 0 ) );
|
||||
}
|
||||
}
|
||||
|
||||
public class FaceBakeryOverride extends FaceBakery
|
||||
{
|
||||
|
||||
@Override
|
||||
public BakedQuad makeBakedQuad( Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ITransformation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade )
|
||||
{
|
||||
BakedQuad quad = super.makeBakedQuad( posFrom, posTo, face, sprite, facing, modelRotationIn, partRotation, uvLocked, shade );
|
||||
|
||||
Pair<Float, Float> brightness = uvlightmap.get( face );
|
||||
if( brightness != null )
|
||||
{
|
||||
VertexFormat format = new VertexFormat( quad.getFormat() );
|
||||
if( !format.getElements().contains( DefaultVertexFormats.TEX_2S ) )
|
||||
{
|
||||
format.addElement( DefaultVertexFormats.TEX_2S );
|
||||
}
|
||||
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( format );
|
||||
VertexLighterFlat trans = new VertexLighterFlat( Minecraft.getMinecraft().getBlockColors() ){
|
||||
|
||||
@Override
|
||||
protected void updateLightmap( float[] normal, float[] lightmap, float x, float y, float z )
|
||||
{
|
||||
lightmap[0] = brightness.getRight();
|
||||
lightmap[1] = brightness.getLeft();
|
||||
}
|
||||
|
||||
};
|
||||
trans.setParent( builder );
|
||||
LightUtil.putBakedQuad( trans, quad );
|
||||
return builder.build();
|
||||
}
|
||||
else
|
||||
{
|
||||
return quad;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,86 +1,28 @@
|
|||
package appeng.client.render;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.lwjgl.util.vector.Vector3f;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.BlockFaceUV;
|
||||
import net.minecraft.client.renderer.block.model.BlockPart;
|
||||
import net.minecraft.client.renderer.block.model.BlockPartFace;
|
||||
import net.minecraft.client.renderer.block.model.BlockPartRotation;
|
||||
import net.minecraft.client.renderer.block.model.FaceBakery;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverride;
|
||||
import net.minecraft.client.renderer.block.model.ItemTransformVec3f;
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelBlock;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.JsonUtils;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.ICustomModelLoader;
|
||||
import net.minecraftforge.client.model.IModel;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.animation.ModelBlockAnimation;
|
||||
import net.minecraftforge.client.model.pipeline.LightUtil;
|
||||
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
|
||||
import net.minecraftforge.client.model.pipeline.VertexLighterFlat;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.model.ITransformation;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
|
||||
import appeng.client.render.model.UVLModelLoader;
|
||||
|
||||
@Mod(modid = "UVLightmapJsonTest", name = "UVLightmapJsonTest", version ="0.0.0")
|
||||
public class UVLightmapJsonTest
|
||||
|
|
@ -94,9 +36,6 @@ public class UVLightmapJsonTest
|
|||
@EventHandler
|
||||
public void preInit( FMLPreInitializationEvent event )
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register( this );
|
||||
ModelLoaderRegistry.registerLoader( UVLModelLoader.INSTANCE );
|
||||
|
||||
GameRegistry.register( uvlblock = new Block( Material.IRON ){
|
||||
|
||||
final AxisAlignedBB box = new AxisAlignedBB( 0.25, 0, 7 / 16d, 0.75, 1, 9 / 16d );
|
||||
|
|
@ -134,259 +73,4 @@ public class UVLightmapJsonTest
|
|||
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(uvlblockItem, 0, uvlblockModel);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void modelsBake( ModelBakeEvent event )
|
||||
{
|
||||
UVLModelLoader.INSTANCE.loader = event.getModelLoader();
|
||||
}
|
||||
|
||||
public enum UVLModelLoader implements ICustomModelLoader
|
||||
{
|
||||
INSTANCE;
|
||||
|
||||
static final Constructor<? extends IModel> vanillaModelWrapper;
|
||||
static final Field faceBakery;
|
||||
|
||||
static
|
||||
{
|
||||
try
|
||||
{
|
||||
Field modifiers = Field.class.getDeclaredField( "modifiers" );
|
||||
modifiers.setAccessible( true );
|
||||
|
||||
faceBakery = ReflectionHelper.findField( ModelBakery.class, "faceBakery" );
|
||||
modifiers.set( faceBakery, faceBakery.getModifiers() & ( ~Modifier.FINAL ) );
|
||||
|
||||
Class clas = Class.forName( ModelLoader.class.getName() + "$VanillaModelWrapper" );
|
||||
vanillaModelWrapper = clas.getDeclaredConstructor( ModelLoader.class, ResourceLocation.class, ModelBlock.class, boolean.class, ModelBlockAnimation.class);
|
||||
vanillaModelWrapper.setAccessible( true );
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static Object deserializer(Class clas)
|
||||
{
|
||||
try
|
||||
{
|
||||
clas = Class.forName( clas.getName() + "$Deserializer" );
|
||||
Constructor constr = clas.getDeclaredConstructor();
|
||||
constr.setAccessible( true );
|
||||
return constr.newInstance();
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static <M extends IModel> M vanillaModelWrapper(ModelLoader loader, ResourceLocation location, ModelBlock model, boolean uvlock, ModelBlockAnimation animation)
|
||||
{
|
||||
try
|
||||
{
|
||||
return (M) vanillaModelWrapper.newInstance( loader, location, model, uvlock, animation );
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private static void setFaceBakery(ModelBakery modelBakery, FaceBakery faceBakery)
|
||||
{
|
||||
try
|
||||
{
|
||||
UVLModelLoader.faceBakery.set( modelBakery, faceBakery );
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
throw Throwables.propagate( e );
|
||||
}
|
||||
}
|
||||
|
||||
private IResourceManager resourceManager;
|
||||
private ModelLoader loader;
|
||||
|
||||
@Override
|
||||
public void onResourceManagerReload( IResourceManager resourceManager )
|
||||
{
|
||||
this.resourceManager = resourceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean accepts( ResourceLocation modelLocation )
|
||||
{
|
||||
return modelLocation.getResourcePath().endsWith( ".uvl" );
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModel loadModel( ResourceLocation modelLocation ) throws Exception
|
||||
{
|
||||
return new UVLModelWrapper( modelLocation );
|
||||
}
|
||||
|
||||
public class UVLModelWrapper implements IModel
|
||||
{
|
||||
final Gson UVLSERIALIZER = (new GsonBuilder()).registerTypeAdapter(ModelBlock.class, deserializer(ModelBlock.class)).registerTypeAdapter(BlockPart.class, deserializer(BlockPart.class)).registerTypeAdapter(BlockPartFace.class, new BlockPartFaceOverrideSerializer()).registerTypeAdapter(BlockFaceUV.class, deserializer(BlockFaceUV.class)).registerTypeAdapter(ItemTransformVec3f.class, deserializer(ItemTransformVec3f.class)).registerTypeAdapter(ItemCameraTransforms.class, deserializer(ItemCameraTransforms.class)).registerTypeAdapter(ItemOverride.class, deserializer(ItemOverride.class)).create();
|
||||
|
||||
private Map<BlockPartFace, Pair<Float, Float>> uvlightmap = new HashMap<>();
|
||||
|
||||
private final IModel parent;
|
||||
|
||||
public UVLModelWrapper( ResourceLocation modelLocation )
|
||||
{
|
||||
String modelPath = modelLocation.getResourcePath();
|
||||
if(modelLocation.getResourcePath().startsWith("models/"))
|
||||
{
|
||||
modelPath = modelPath.substring("models/".length());
|
||||
}
|
||||
ResourceLocation armatureLocation = new ResourceLocation(modelLocation.getResourceDomain(), "armatures/" + modelPath + ".json");
|
||||
ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation(resourceManager, armatureLocation);
|
||||
ModelBlock model;
|
||||
{
|
||||
Reader reader = null;
|
||||
IResource iresource = null;
|
||||
ModelBlock lvt_5_1_ = null;
|
||||
|
||||
try
|
||||
{
|
||||
String s = modelLocation.getResourcePath();
|
||||
|
||||
iresource = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(modelLocation.getResourceDomain(), "models/" + modelPath + ".json"));
|
||||
reader = new InputStreamReader(iresource.getInputStream(), Charsets.UTF_8);
|
||||
|
||||
lvt_5_1_ = JsonUtils.gsonDeserialize(UVLSERIALIZER, reader, ModelBlock.class, false);
|
||||
lvt_5_1_.name = modelLocation.toString();
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
finally
|
||||
{
|
||||
IOUtils.closeQuietly(reader);
|
||||
IOUtils.closeQuietly((Closeable)iresource);
|
||||
}
|
||||
|
||||
model = lvt_5_1_;
|
||||
}
|
||||
|
||||
this.parent = vanillaModelWrapper(loader, modelLocation, model, false, animation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ResourceLocation> getDependencies()
|
||||
{
|
||||
return parent.getDependencies();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ResourceLocation> getTextures()
|
||||
{
|
||||
return parent.getTextures();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
|
||||
{
|
||||
setFaceBakery( loader, new FaceBakeryOverride() );
|
||||
IBakedModel model = parent.bake( state, format, bakedTextureGetter );
|
||||
setFaceBakery( loader, new FaceBakery() );
|
||||
return model;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModelState getDefaultState()
|
||||
{
|
||||
return parent.getDefaultState();
|
||||
}
|
||||
|
||||
public class BlockPartFaceOverrideSerializer implements JsonDeserializer<BlockPartFace>
|
||||
{
|
||||
public BlockPartFace deserialize( JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_ ) throws JsonParseException
|
||||
{
|
||||
JsonObject jsonobject = p_deserialize_1_.getAsJsonObject();
|
||||
EnumFacing enumfacing = this.parseCullFace(jsonobject);
|
||||
int i = this.parseTintIndex(jsonobject);
|
||||
String s = this.parseTexture(jsonobject);
|
||||
BlockFaceUV blockfaceuv = (BlockFaceUV)p_deserialize_3_.deserialize(jsonobject, BlockFaceUV.class);
|
||||
BlockPartFace blockFace = new BlockPartFace(enumfacing, i, s, blockfaceuv);
|
||||
uvlightmap.put( blockFace, parseUVL( jsonobject ) );
|
||||
return blockFace;
|
||||
}
|
||||
|
||||
protected int parseTintIndex(JsonObject object)
|
||||
{
|
||||
return JsonUtils.getInt(object, "tintindex", -1);
|
||||
}
|
||||
|
||||
private String parseTexture(JsonObject object)
|
||||
{
|
||||
return JsonUtils.getString(object, "texture");
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private EnumFacing parseCullFace(JsonObject object)
|
||||
{
|
||||
String s = JsonUtils.getString(object, "cullface", "");
|
||||
return EnumFacing.byName(s);
|
||||
}
|
||||
|
||||
protected Pair<Float, Float> parseUVL(JsonObject object)
|
||||
{
|
||||
if( !object.has( "uvlightmap" ))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
object = object.get( "uvlightmap" ).getAsJsonObject();
|
||||
return new ImmutablePair<Float, Float>( JsonUtils.getFloat(object, "sky", 0), JsonUtils.getFloat(object, "block", 0) );
|
||||
}
|
||||
}
|
||||
|
||||
public class FaceBakeryOverride extends FaceBakery
|
||||
{
|
||||
|
||||
@Override
|
||||
public BakedQuad makeBakedQuad( Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ITransformation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade )
|
||||
{
|
||||
BakedQuad quad = super.makeBakedQuad( posFrom, posTo, face, sprite, facing, modelRotationIn, partRotation, uvLocked, shade );
|
||||
|
||||
Pair<Float, Float> brightness = uvlightmap.get( face );
|
||||
if( brightness != null)
|
||||
{
|
||||
VertexFormat format = new VertexFormat(quad.getFormat());
|
||||
if( !format.getElements().contains( DefaultVertexFormats.TEX_2S ))
|
||||
{
|
||||
format.addElement( DefaultVertexFormats.TEX_2S );
|
||||
}
|
||||
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( format );
|
||||
VertexLighterFlat trans = new VertexLighterFlat( Minecraft.getMinecraft().getBlockColors() )
|
||||
{
|
||||
|
||||
@Override
|
||||
protected void updateLightmap(float[] normal, float[] lightmap, float x, float y, float z)
|
||||
{
|
||||
lightmap[0] = brightness.getRight();
|
||||
lightmap[1] = brightness.getLeft();
|
||||
}
|
||||
|
||||
};
|
||||
trans.setParent( builder );
|
||||
LightUtil.putBakedQuad( trans, quad );
|
||||
return builder.build();
|
||||
}
|
||||
else
|
||||
{
|
||||
return quad;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue