1.8.9 update

This commit is contained in:
RainWarrior committed 2015-12-30 07:15:03 +03:00
1 parent 6644e8c9ed
commit 56eba05237
42 files changed
+858 -160

No files matched your search

@@ -387,7 +387,7 @@ public class ForgeHooksClient
}
else
{
model.getItemCameraTransforms().func_181689_a(cameraTransformType);
model.getItemCameraTransforms().applyTransform(cameraTransformType);
}
return model;
}
@@ -153,7 +153,7 @@ public class GuiIngameForge extends GuiIngame
Scoreboard scoreboard = this.mc.theWorld.getScoreboard();
ScoreObjective objective = null;
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.thePlayer.getCommandSenderName());
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.thePlayer.getName());
if (scoreplayerteam != null)
{
int slot = scoreplayerteam.getChatFormat().getColorIndex();
@@ -276,7 +276,7 @@ public class GuiIngameForge extends GuiIngame
if (f1 > 0.0F)
{
func_180474_b(f1, res);
renderPortal(f1, res);
}
post(PORTAL);
@@ -17,10 +17,10 @@ public class Attributes
static
{
DEFAULT_BAKED_FORMAT = new VertexFormat();
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.POSITION, 3));
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.UBYTE, EnumUsage.COLOR, 4));
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.UV, 2));
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.BYTE, EnumUsage.PADDING, 4));
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.POSITION, 3));
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.UBYTE, EnumUsage.COLOR, 4));
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.UV, 2));
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.BYTE, EnumUsage.PADDING, 4));
}
/*
@@ -59,9 +59,9 @@ public interface IFlexibleBakedModel extends IBakedModel
return parent.isBuiltInRenderer();
}
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
return parent.getTexture();
return parent.getParticleTexture();
}
@Deprecated
@@ -63,7 +63,7 @@ public interface IPerspectiveAwareModel extends IFlexibleBakedModel
ImmutableMap.Builder<TransformType, TRSRTransformation> builder = ImmutableMap.builder();
for(TransformType type : TransformType.values())
{
builder.put(type, new TRSRTransformation(transforms.func_181688_b(type)));
builder.put(type, new TRSRTransformation(transforms.getTransform(type)));
}
return builder.build();
}
@@ -89,7 +89,7 @@ public interface IPerspectiveAwareModel extends IFlexibleBakedModel
public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
public boolean isGui3d() { return parent.isGui3d(); }
public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
public TextureAtlasSprite getTexture() { return parent.getTexture(); }
public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
public List<BakedQuad> getFaceQuads(EnumFacing side) { return parent.getFaceQuads(side); }
public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); }
@@ -53,9 +53,9 @@ public interface ISmartBlockModel extends IBakedModel
return parent.isBuiltInRenderer();
}
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
return parent.getTexture();
return parent.getParticleTexture();
}
public ItemCameraTransforms getItemCameraTransforms()
@@ -113,7 +113,7 @@ public class ItemLayerModel implements IRetexturableModel
public boolean isAmbientOcclusion() { return true; }
public boolean isGui3d() { return false; }
public boolean isBuiltInRenderer() { return false; }
public TextureAtlasSprite getTexture() { return particle; }
public TextureAtlasSprite getParticleTexture() { return particle; }
public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
public List<BakedQuad> getFaceQuads(EnumFacing side) { return ImmutableList.of(); }
public List<BakedQuad> getGeneralQuads() { return quads; }
@@ -293,7 +293,7 @@ public class ModelFluid implements IModelCustomData
return false;
}
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
return still;
}
@@ -5,8 +5,6 @@ import java.util.List;
import javax.vecmath.Matrix4f;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -22,9 +20,10 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.ItemLayerModel.BakedModel;
import net.minecraftforge.fml.common.FMLLog;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -209,10 +208,10 @@ public class MultiLayerModel implements IModelCustomData
}
@Override
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
compute();
return base.getTexture();
return base.getParticleTexture();
}
@Override
@@ -100,9 +100,9 @@ public class MultiModel implements IModel
}
@Override
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
return internalBase.getTexture();
return internalBase.getParticleTexture();
}
@Override
@@ -936,7 +936,7 @@ public class B3DLoader implements ICustomModelLoader
return false;
}
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
// FIXME somehow specify particle texture in the model
return textures.values().asList().get(0);
@@ -1469,7 +1469,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
}
@Override
public TextureAtlasSprite getTexture()
public TextureAtlasSprite getParticleTexture()
{
return this.sprite;
}
@@ -69,7 +69,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
VertexFormat format = parent.getVertexFormat();
if(format.hasNormal()) return format;
format = new VertexFormat(format);
format.func_181721_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4));
format.addElement(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4));
return format;
}