catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix shit (140 errors)

This commit is contained in:
catfoolyou 2025-01-30 16:35:48 -05:00
parent 49504c5a7b
commit a1e1372798
109 changed files with 433 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/8.0/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/8.0/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/8.0/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/8.0/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/8.0/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

2
.idea/misc.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
</project>

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

11
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -20,7 +20,6 @@ import net.minecraft.src.ChunkCoordinates;
import net.minecraft.src.CommandBase;
import net.minecraft.src.ConvertingProgressUpdate;
import net.minecraft.src.CrashReport;
import net.minecraft.src.DemoWorldServer;
import net.minecraft.src.DispenserBehaviors;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumGameType;
@ -250,14 +249,8 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
if (var10 == 0)
{
if (this.isDemo())
{
this.worldServers[var10] = new DemoWorldServer(this, var7, par2Str, var11, this.theProfiler, this.getLogAgent());
}
else
{
this.worldServers[var10] = new WorldServer(this, var7, par2Str, var11, var8, this.theProfiler, this.getLogAgent());
}
this.worldServers[var10] = new WorldServer(this, var7, par2Str, var11, var8, this.theProfiler, this.getLogAgent());
}
else
{

12
src/main/java/net/minecraft/src/AbstractResourcePack.java
View File

@ -21,9 +21,9 @@ public abstract class AbstractResourcePack implements ResourcePack
this.resourcePackFile = par1File;
}
private static String locationToName(ResourceLocation par0ResourceLocation)
private static String locationToName(TextureLocation par0TextureLocation)
{
return String.format("%s/%s/%s", new Object[] {"assets", par0ResourceLocation.getResourceDomain(), par0ResourceLocation.getResourcePath()});
return String.format("%s/%s/%s", new Object[] {"assets", par0TextureLocation.getResourceDomain(), par0TextureLocation.getResourcePath()});
}
protected static String getRelativeName(File par0File, File par1File)
@ -31,14 +31,14 @@ public abstract class AbstractResourcePack implements ResourcePack
return par0File.toURI().relativize(par1File.toURI()).getPath();
}
public InputStream getInputStream(ResourceLocation par1ResourceLocation) throws IOException
public InputStream getInputStream(TextureLocation par1TextureLocation) throws IOException
{
return this.getInputStreamByName(locationToName(par1ResourceLocation));
return this.getInputStreamByName(locationToName(par1TextureLocation));
}
public boolean resourceExists(ResourceLocation par1ResourceLocation)
public boolean resourceExists(TextureLocation par1TextureLocation)
{
return this.hasResourceName(locationToName(par1ResourceLocation));
return this.hasResourceName(locationToName(par1TextureLocation));
}
protected abstract InputStream getInputStreamByName(String var1) throws IOException;

24
src/main/java/net/minecraft/src/DefaultResourcePack.java
View File

@ -2,6 +2,8 @@ package net.minecraft.src;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import net.lax1dude.eaglercraft.TextureLocation;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
@ -24,9 +26,9 @@ public class DefaultResourcePack implements ResourcePack
this.readAssetsDir(this.fileAssets);
}
public InputStream getInputStream(ResourceLocation par1ResourceLocation) throws IOException
public InputStream getInputStream(TextureLocation par1TextureLocation) throws IOException
{
InputStream var2 = this.getResourceStream(par1ResourceLocation);
InputStream var2 = this.getResourceStream(par1TextureLocation);
if (var2 != null)
{
@ -34,7 +36,7 @@ public class DefaultResourcePack implements ResourcePack
}
else
{
File var3 = (File)this.mapResourceFiles.get(par1ResourceLocation.toString());
File var3 = (File)this.mapResourceFiles.get(par1TextureLocation.toString());
if (var3 != null)
{
@ -42,24 +44,24 @@ public class DefaultResourcePack implements ResourcePack
}
else
{
throw new FileNotFoundException(par1ResourceLocation.getResourcePath());
throw new FileNotFoundException(par1TextureLocation.getResourcePath());
}
}
}
private InputStream getResourceStream(ResourceLocation par1ResourceLocation)
private InputStream getResourceStream(TextureLocation par1TextureLocation)
{
return DefaultResourcePack.class.getResourceAsStream("/assets/minecraft/" + par1ResourceLocation.getResourcePath());
return DefaultResourcePack.class.getResourceAsStream("/assets/minecraft/" + par1TextureLocation.getResourcePath());
}
public void addResourceFile(String par1Str, File par2File)
{
this.mapResourceFiles.put((new ResourceLocation(par1Str)).toString(), par2File);
this.mapResourceFiles.put((new TextureLocation(par1Str)).toString(), par2File);
}
public boolean resourceExists(ResourceLocation par1ResourceLocation)
public boolean resourceExists(TextureLocation par1TextureLocation)
{
return this.getResourceStream(par1ResourceLocation) != null || this.mapResourceFiles.containsKey(par1ResourceLocation.toString());
return this.getResourceStream(par1TextureLocation) != null || this.mapResourceFiles.containsKey(par1TextureLocation.toString());
}
public Set getResourceDomains()
@ -88,12 +90,12 @@ public class DefaultResourcePack implements ResourcePack
public MetadataSection getPackMetadata(MetadataSerializer par1MetadataSerializer, String par2Str) throws IOException
{
return AbstractResourcePack.readMetadata(par1MetadataSerializer, DefaultResourcePack.class.getResourceAsStream("/" + (new ResourceLocation("pack.mcmeta")).getResourcePath()), par2Str);
return AbstractResourcePack.readMetadata(par1MetadataSerializer, DefaultResourcePack.class.getResourceAsStream("/" + (new TextureLocation("pack.mcmeta")).getResourcePath()), par2Str);
}
public BufferedImage getPackImage() throws IOException
{
return ImageIO.read(DefaultResourcePack.class.getResourceAsStream("/" + (new ResourceLocation("pack.png")).getResourcePath()));
return ImageIO.read(DefaultResourcePack.class.getResourceAsStream("/" + (new TextureLocation("pack.png")).getResourcePath()));
}
public String getPackName()

2
src/main/java/net/minecraft/src/EntityOtherPlayerMP.java
View File

@ -1,6 +1,6 @@
package net.minecraft.src;
public class EntityOtherPlayerMP extends AbstractClientPlayer
public class EntityOtherPlayerMP extends EntityPlayer
{
private boolean isItemInUse;
private int otherPlayerMPPosRotationIncrements;

2
src/main/java/net/minecraft/src/EntityPlayerSP.java
View File

@ -1,6 +1,6 @@
package net.minecraft.src;
public class EntityPlayerSP extends AbstractClientPlayer
public class EntityPlayerSP extends EntityPlayer
{
public MovementInput movementInput;
protected Minecraft mc;

11
src/main/java/net/minecraft/src/EntityRenderer.java
View File

@ -6,6 +6,7 @@ import java.util.Random;
import net.lax1dude.eaglercraft.EaglerImage;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
@ -717,7 +718,7 @@ public class EntityRenderer
GL11.glScalef(var3, var3, var3);
GL11.glTranslatef(8.0F, 8.0F, 8.0F);
GL11.glMatrixMode(GL11.GL_MODELVIEW);
this.mc.getTextureManager().bindTexture(this.locationLightMap);
this.locationLightMap.bindTexture();
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
@ -1150,7 +1151,7 @@ public class EntityRenderer
this.setupFog(0, par1);
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_CULL_FACE);
this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
TextureMap.locationBlocksTexture.bindTexture();
if (this.mc.gameSettings.fancyGraphics)
{
@ -1382,7 +1383,7 @@ public class EntityRenderer
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.01F);
this.mc.getTextureManager().bindTexture(locationSnowPng);
locationSnowPng.bindTexture();
double var9 = var41.lastTickPosX + (var41.posX - var41.lastTickPosX) * (double)par1;
double var11 = var41.lastTickPosY + (var41.posY - var41.lastTickPosY) * (double)par1;
double var13 = var41.lastTickPosZ + (var41.posZ - var41.lastTickPosZ) * (double)par1;
@ -1456,7 +1457,7 @@ public class EntityRenderer
}
var18 = 0;
this.mc.getTextureManager().bindTexture(locationRainPng);
locationRainPng.bindTexture();
var8.startDrawingQuads();
}
@ -1484,7 +1485,7 @@ public class EntityRenderer
}
var18 = 1;
this.mc.getTextureManager().bindTexture(new ResourceLocation("textures/environment/snow.png"));
new TextureLocation("textures/environment/snow.png").bindTexture();
var8.startDrawingQuads();
}

26
src/main/java/net/minecraft/src/FallbackResourceManager.java
View File

@ -1,6 +1,8 @@
package net.minecraft.src;
import com.google.common.collect.Lists;
import net.lax1dude.eaglercraft.TextureLocation;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@ -29,10 +31,10 @@ public class FallbackResourceManager implements ResourceManager
return null;
}
public Resource getResource(ResourceLocation par1ResourceLocation) throws IOException
public Resource getResource(TextureLocation par1TextureLocation) throws IOException
{
ResourcePack var2 = null;
ResourceLocation var3 = getLocationMcmeta(par1ResourceLocation);
TextureLocation var3 = getLocationMcmeta(par1TextureLocation);
for (int var4 = this.resourcePacks.size() - 1; var4 >= 0; --var4)
{
@ -43,7 +45,7 @@ public class FallbackResourceManager implements ResourceManager
var2 = var5;
}
if (var5.resourceExists(par1ResourceLocation))
if (var5.resourceExists(par1TextureLocation))
{
InputStream var6 = null;
@ -52,33 +54,33 @@ public class FallbackResourceManager implements ResourceManager
var6 = var2.getInputStream(var3);
}
return new SimpleResource(par1ResourceLocation, var5.getInputStream(par1ResourceLocation), var6, this.frmMetadataSerializer);
return new SimpleResource(par1TextureLocation, var5.getInputStream(par1TextureLocation), var6, this.frmMetadataSerializer);
}
}
throw new FileNotFoundException(par1ResourceLocation.toString());
throw new FileNotFoundException(par1TextureLocation.toString());
}
public List getAllResources(ResourceLocation par1ResourceLocation) throws IOException
public List getAllResources(TextureLocation par1TextureLocation) throws IOException
{
ArrayList var2 = Lists.newArrayList();
ResourceLocation var3 = getLocationMcmeta(par1ResourceLocation);
TextureLocation var3 = getLocationMcmeta(par1TextureLocation);
Iterator var4 = this.resourcePacks.iterator();
while (var4.hasNext())
{
ResourcePack var5 = (ResourcePack)var4.next();
if (var5.resourceExists(par1ResourceLocation))
if (var5.resourceExists(par1TextureLocation))
{
InputStream var6 = var5.resourceExists(var3) ? var5.getInputStream(var3) : null;
var2.add(new SimpleResource(par1ResourceLocation, var5.getInputStream(par1ResourceLocation), var6, this.frmMetadataSerializer));
var2.add(new SimpleResource(par1TextureLocation, var5.getInputStream(par1TextureLocation), var6, this.frmMetadataSerializer));
}
}
if (var2.isEmpty())
{
throw new FileNotFoundException(par1ResourceLocation.toString());
throw new FileNotFoundException(par1TextureLocation.toString());
}
else
{
@ -86,8 +88,8 @@ public class FallbackResourceManager implements ResourceManager
}
}
static ResourceLocation getLocationMcmeta(ResourceLocation par0ResourceLocation)
static TextureLocation getLocationMcmeta(TextureLocation par0TextureLocation)
{
return new ResourceLocation(par0ResourceLocation.getResourceDomain(), par0ResourceLocation.getResourcePath() + ".mcmeta");
return new TextureLocation(par0TextureLocation.getResourceDomain(), par0TextureLocation.getResourcePath() + ".mcmeta");
}
}

4
src/main/java/net/minecraft/src/FoliageColorReloadListener.java
View File

@ -1,10 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import java.io.IOException;
public class FoliageColorReloadListener implements ResourceManagerReloadListener
{
private static final ResourceLocation field_130079_a = new ResourceLocation("textures/colormap/foliage.png");
private static final TextureLocation field_130079_a = new TextureLocation("textures/colormap/foliage.png");
public void onResourceManagerReload(ResourceManager par1ResourceManager)
{

4
src/main/java/net/minecraft/src/GrassColorReloadListener.java
View File

@ -1,10 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import java.io.IOException;
public class GrassColorReloadListener implements ResourceManagerReloadListener
{
private static final ResourceLocation field_130078_a = new ResourceLocation("textures/colormap/grass.png");
private static final TextureLocation field_130078_a = new TextureLocation("textures/colormap/grass.png");
public void onResourceManagerReload(ResourceManager par1ResourceManager)
{

4
src/main/java/net/minecraft/src/GuiBeaconButton.java
View File

@ -11,10 +11,10 @@ class GuiBeaconButton extends GuiButton
private final int field_82258_m;
private boolean field_82256_n;
protected GuiBeaconButton(int par1, int par2, int par3, TextureLocation par4ResourceLocation, int par5, int par6)
protected GuiBeaconButton(int par1, int par2, int par3, TextureLocation par4TextureLocation, int par5, int par6)
{
super(par1, par2, par3, 22, 22, "");
this.buttonTexture = par4ResourceLocation;
this.buttonTexture = par4TextureLocation;
this.field_82257_l = par5;
this.field_82258_m = par6;
}

2
src/main/java/net/minecraft/src/GuiButton.java
View File

@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11;
public class GuiButton extends Gui
{
protected static final ResourceLocation buttonTextures = new ResourceLocation("textures/gui/widgets.png");
protected static final TextureLocation buttonTextures = new TextureLocation("textures/gui/widgets.png");
/** Button width in pixels */
protected int width;

1
src/main/java/net/minecraft/src/GuiIngame.java
View File

@ -7,6 +7,7 @@ import java.util.List;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;

2
src/main/java/net/minecraft/src/GuiOptions.java
View File

@ -107,7 +107,7 @@ public class GuiOptions extends GuiScreen
if (par1GuiButton.id == 104)
{
this.mc.gameSettings.saveOptions();
this.mc.displayGuiScreen(new GuiSnooper(this, this.options));
//this.mc.displayGuiScreen(new GuiSnooper(this, this.options));
}
if (par1GuiButton.id == 200)

1
src/main/java/net/minecraft/src/GuiScreenSelectLocation.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;

4
src/main/java/net/minecraft/src/GuiSlot.java
View File

@ -327,7 +327,7 @@ public abstract class GuiSlot
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_FOG);
Tessellator var18 = Tessellator.instance;
this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
Gui.optionsBackground.bindTexture();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
float var17 = 32.0F;
var18.startDrawingQuads();
@ -468,7 +468,7 @@ public abstract class GuiSlot
private void overlayBackground(int par1, int par2, int par3, int par4)
{
Tessellator var5 = Tessellator.instance;
this.mc.getTextureManager().bindTexture(Gui.optionsBackground);
Gui.optionsBackground.bindTexture();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
float var6 = 32.0F;
var5.startDrawingQuads();

3
src/main/java/net/minecraft/src/GuiStats.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -136,7 +137,7 @@ public class GuiStats extends GuiScreen
private void drawSprite(int par1, int par2, int par3, int par4)
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(statIcons);
statIcons.bindTexture();
float var5 = 0.0078125F;
float var6 = 0.0078125F;
boolean var7 = true;

1
src/main/java/net/minecraft/src/GuiTextField.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class GuiTextField extends Gui

5
src/main/java/net/minecraft/src/GuiWinGame.java
View File

@ -7,6 +7,7 @@ import java.util.List;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.apache.commons.io.Charsets;
import org.lwjgl.opengl.GL11;
@ -79,7 +80,7 @@ public class GuiWinGame extends GuiScreen
String var1 = "";
String var2 = "" + EnumChatFormatting.WHITE + EnumChatFormatting.OBFUSCATED + EnumChatFormatting.GREEN + EnumChatFormatting.AQUA;
short var3 = 274;
BufferedReader var4 = new BufferedReader(new InputStreamReader(this.mc.getResourceManager().getResource(new ResourceLocation("texts/end.txt")).getInputStream(), Charsets.UTF_8));
BufferedReader var4 = new BufferedReader(new InputStreamReader(this.mc.getResourceManager().getResource(new TextureLocation("texts/end.txt")).getInputStream(), Charsets.UTF_8));
Random var5 = new Random(8124371L);
int var6;
@ -104,7 +105,7 @@ public class GuiWinGame extends GuiScreen
this.lines.add("");
}
var4 = new BufferedReader(new InputStreamReader(this.mc.getResourceManager().getResource(new ResourceLocation("texts/credits.txt")).getInputStream(), Charsets.UTF_8));
var4 = new BufferedReader(new InputStreamReader(this.mc.getResourceManager().getResource(new TextureLocation("texts/credits.txt")).getInputStream(), Charsets.UTF_8));
while ((var1 = var4.readLine()) != null)
{

10
src/main/java/net/minecraft/src/IntegratedServer.java
View File

@ -64,14 +64,8 @@ public class IntegratedServer extends MinecraftServer
if (var8 == 0)
{
if (this.isDemo())
{
this.worldServers[var8] = new DemoWorldServer(this, var7, par2Str, var9, this.theProfiler, this.getLogAgent());
}
else
{
this.worldServers[var8] = new WorldServer(this, var7, par2Str, var9, this.theWorldSettings, this.theProfiler, this.getLogAgent());
}
this.worldServers[var8] = new WorldServer(this, var7, par2Str, var9, this.theWorldSettings, this.theProfiler, this.getLogAgent());
}
else
{

5
src/main/java/net/minecraft/src/ItemRenderer.java
View File

@ -1,6 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -43,7 +44,7 @@ public class ItemRenderer
if (par2ItemStack.getItemSpriteNumber() == 0 && par2ItemStack.itemID < Block.blocksList.length && Block.blocksList[par2ItemStack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType()))
{
var4.getResourceLocation(0).bindTexture();
var4.getTextureLocation(0).bindTexture();
this.renderBlocksInstance.renderBlockAsItem(Block.blocksList[par2ItemStack.itemID], par2ItemStack.getItemDamage(), 1.0F);
}
else
@ -56,7 +57,7 @@ public class ItemRenderer
return;
}
var4.getResourceLocation(par2ItemStack.getItemSpriteNumber()).bindTexture();
var4.getTextureLocation(par2ItemStack.getItemSpriteNumber()).bindTexture();
Tessellator var6 = Tessellator.instance;
float var7 = var5.getMinU();
float var8 = var5.getMaxU();

4
src/main/java/net/minecraft/src/LayeredTexture.java
View File

@ -1,6 +1,8 @@
package net.minecraft.src;
import com.google.common.collect.Lists;
import net.lax1dude.eaglercraft.TextureLocation;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.io.IOException;
@ -32,7 +34,7 @@ public class LayeredTexture extends AbstractTexture
if (var4 != null)
{
InputStream var5 = par1ResourceManager.getResource(new ResourceLocation(var4)).getInputStream();
InputStream var5 = par1ResourceManager.getResource(new TextureLocation(var4)).getInputStream();
BufferedImage var6 = ImageIO.read(var5);
if (var2 == null)

4
src/main/java/net/minecraft/src/Locale.java
View File

@ -10,6 +10,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import net.lax1dude.eaglercraft.TextureLocation;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
@ -41,7 +43,7 @@ public class Locale
try
{
this.loadLocaleData(par1ResourceManager.getAllResources(new ResourceLocation(var7, var5)));
this.loadLocaleData(par1ResourceManager.getAllResources(new TextureLocation(var7, var5)));
}
catch (IOException var9)
{

1
src/main/java/net/minecraft/src/MapItemRenderer.java
View File

@ -3,6 +3,7 @@ package net.minecraft.src;
import java.util.Iterator;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class MapItemRenderer

6
src/main/java/net/minecraft/src/Minecraft.java
View File

@ -44,7 +44,7 @@ import org.lwjgl.util.glu.GLU;
public class Minecraft implements IPlayerUsage
{
private static final ResourceLocation locationMojangPng = new ResourceLocation("textures/gui/title/mojang.png");
private static final TextureLocation locationMojangPng = new TextureLocation("textures/gui/title/mojang.png");
public static final boolean isRunningOnMac = Util.getOSType() == EnumOS.MACOS;
/** A 10MiB preallocation to ensure the heap is reasonably sized. */
@ -332,7 +332,7 @@ public class Minecraft implements IPlayerUsage
this.sndManager = new SoundManager(this.mcResourceManager, this.gameSettings, this.fileAssets);
this.mcResourceManager.registerReloadListener(this.sndManager);
this.loadScreen();
this.fontRenderer = new FontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
this.fontRenderer = new FontRenderer(this.gameSettings, new TextureLocation("textures/font/ascii.png"), this.renderEngine, false);
if (this.gameSettings.language != null)
{
@ -340,7 +340,7 @@ public class Minecraft implements IPlayerUsage
this.fontRenderer.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
}
this.standardGalacticFontRenderer = new FontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
this.standardGalacticFontRenderer = new FontRenderer(this.gameSettings, new TextureLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
this.mcResourceManager.registerReloadListener(this.fontRenderer);
this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
this.mcResourceManager.registerReloadListener(new GrassColorReloadListener());

2
src/main/java/net/minecraft/src/ModelBox.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
public class ModelBox
{
/**

2
src/main/java/net/minecraft/src/ModelRenderer.java
View File

@ -2,6 +2,8 @@ package net.minecraft.src;
import java.util.ArrayList;
import java.util.List;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class ModelRenderer

1
src/main/java/net/minecraft/src/NetClientHandler.java
View File

@ -1264,7 +1264,6 @@ public class NetClientHandler extends NetHandler
if (var4 == 0)
{
this.mc.displayGuiScreen(new GuiScreenDemo());
}
else if (var4 == 101)
{

12
src/main/java/net/minecraft/src/Render.java
View File

@ -1,10 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public abstract class Render
{
private static final ResourceLocation shadowTextures = new ResourceLocation("textures/misc/shadow.png");
private static final TextureLocation shadowTextures = new TextureLocation("textures/misc/shadow.png");
protected RenderManager renderManager;
protected RenderBlocks renderBlocks = new RenderBlocks();
protected float shadowSize;
@ -25,16 +27,16 @@ public abstract class Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected abstract ResourceLocation getEntityTexture(Entity var1);
protected abstract TextureLocation getEntityTexture(Entity var1);
protected void bindEntityTexture(Entity par1Entity)
{
this.bindTexture(this.getEntityTexture(par1Entity));
}
protected void bindTexture(ResourceLocation par1ResourceLocation)
protected void bindTexture(TextureLocation par1TextureLocation)
{
this.renderManager.renderEngine.bindTexture(par1ResourceLocation);
par1TextureLocation.bindTexture();
}
/**
@ -101,7 +103,7 @@ public abstract class Render
{
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
this.renderManager.renderEngine.bindTexture(shadowTextures);
shadowTextures.bindTexture();
World var10 = this.getWorldFromRenderManager();
GL11.glDepthMask(false);
float var11 = this.shadowSize;

8
src/main/java/net/minecraft/src/RenderArrow.java
View File

@ -1,11 +1,13 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderArrow extends Render
{
private static final ResourceLocation arrowTextures = new ResourceLocation("textures/entity/arrow.png");
private static final TextureLocation arrowTextures = new TextureLocation("textures/entity/arrow.png");
public void renderArrow(EntityArrow par1EntityArrow, double par2, double par4, double par6, float par8, float par9)
{
@ -68,7 +70,7 @@ public class RenderArrow extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getArrowTextures(EntityArrow par1EntityArrow)
protected TextureLocation getArrowTextures(EntityArrow par1EntityArrow)
{
return arrowTextures;
}
@ -76,7 +78,7 @@ public class RenderArrow extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getArrowTextures((EntityArrow)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderBat.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderBat extends RenderLiving
{
private static final ResourceLocation batTextures = new ResourceLocation("textures/entity/bat.png");
private static final TextureLocation batTextures = new TextureLocation("textures/entity/bat.png");
/**
* not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and
@ -31,7 +32,7 @@ public class RenderBat extends RenderLiving
super.doRenderLiving(par1EntityBat, par2, par4, par6, par8, par9);
}
protected ResourceLocation getBatTextures(EntityBat par1EntityBat)
protected TextureLocation getBatTextures(EntityBat par1EntityBat)
{
return batTextures;
}
@ -95,7 +96,7 @@ public class RenderBat extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getBatTextures((EntityBat)par1Entity);
}

14
src/main/java/net/minecraft/src/RenderBiped.java
View File

@ -2,6 +2,8 @@ package net.minecraft.src;
import com.google.common.collect.Maps;
import java.util.Map;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderBiped extends RenderLiving
@ -34,19 +36,19 @@ public class RenderBiped extends RenderLiving
this.field_82425_h = new ModelBiped(0.5F);
}
public static ResourceLocation func_110857_a(ItemArmor par0ItemArmor, int par1)
public static TextureLocation func_110857_a(ItemArmor par0ItemArmor, int par1)
{
return func_110858_a(par0ItemArmor, par1, (String)null);
}
public static ResourceLocation func_110858_a(ItemArmor par0ItemArmor, int par1, String par2Str)
public static TextureLocation func_110858_a(ItemArmor par0ItemArmor, int par1, String par2Str)
{
String var3 = String.format("textures/models/armor/%s_layer_%d%s.png", new Object[] {bipedArmorFilenamePrefix[par0ItemArmor.renderIndex], Integer.valueOf(par1 == 2 ? 2 : 1), par2Str == null ? "" : String.format("_%s", new Object[]{par2Str})});
ResourceLocation var4 = (ResourceLocation)field_110859_k.get(var3);
TextureLocation var4 = (TextureLocation)field_110859_k.get(var3);
if (var4 == null)
{
var4 = new ResourceLocation(var3);
var4 = new TextureLocation(var3);
field_110859_k.put(var3, var4);
}
@ -145,7 +147,7 @@ public class RenderBiped extends RenderLiving
this.field_82423_g.heldItemRight = this.field_82425_h.heldItemRight = this.modelBipedMain.heldItemRight = 0;
}
protected ResourceLocation func_110856_a(EntityLiving par1EntityLiving)
protected TextureLocation func_110856_a(EntityLiving par1EntityLiving)
{
return null;
}
@ -299,7 +301,7 @@ public class RenderBiped extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110856_a((EntityLiving)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderBlaze.java
View File

@ -1,8 +1,10 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderBlaze extends RenderLiving
{
private static final ResourceLocation blazeTextures = new ResourceLocation("textures/entity/blaze.png");
private static final TextureLocation blazeTextures = new TextureLocation("textures/entity/blaze.png");
private int field_77068_a;
public RenderBlaze()
@ -24,7 +26,7 @@ public class RenderBlaze extends RenderLiving
super.doRenderLiving(par1EntityBlaze, par2, par4, par6, par8, par9);
}
protected ResourceLocation getBlazeTextures(EntityBlaze par1EntityBlaze)
protected TextureLocation getBlazeTextures(EntityBlaze par1EntityBlaze)
{
return blazeTextures;
}
@ -42,7 +44,7 @@ public class RenderBlaze extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getBlazeTextures((EntityBlaze)par1Entity);
}

1
src/main/java/net/minecraft/src/RenderBlocks.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;

7
src/main/java/net/minecraft/src/RenderBoat.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderBoat extends Render
{
private static final ResourceLocation boatTextures = new ResourceLocation("textures/entity/boat.png");
private static final TextureLocation boatTextures = new TextureLocation("textures/entity/boat.png");
/** instance of ModelBoat for rendering */
protected ModelBase modelBoat;
@ -45,7 +46,7 @@ public class RenderBoat extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getBoatTextures(EntityBoat par1EntityBoat)
protected TextureLocation getBoatTextures(EntityBoat par1EntityBoat)
{
return boatTextures;
}
@ -53,7 +54,7 @@ public class RenderBoat extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getBoatTextures((EntityBoat)par1Entity);
}

9
src/main/java/net/minecraft/src/RenderCaveSpider.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderCaveSpider extends RenderSpider
{
private static final ResourceLocation caveSpiderTextures = new ResourceLocation("textures/entity/spider/cave_spider.png");
private static final TextureLocation caveSpiderTextures = new TextureLocation("textures/entity/spider/cave_spider.png");
public RenderCaveSpider()
{
@ -16,12 +17,12 @@ public class RenderCaveSpider extends RenderSpider
GL11.glScalef(0.7F, 0.7F, 0.7F);
}
protected ResourceLocation getCaveSpiderTextures(EntityCaveSpider par1EntityCaveSpider)
protected TextureLocation getCaveSpiderTextures(EntityCaveSpider par1EntityCaveSpider)
{
return caveSpiderTextures;
}
protected ResourceLocation getSpiderTextures(EntitySpider par1EntitySpider)
protected TextureLocation getSpiderTextures(EntitySpider par1EntitySpider)
{
return this.getCaveSpiderTextures((EntityCaveSpider)par1EntitySpider);
}
@ -38,7 +39,7 @@ public class RenderCaveSpider extends RenderSpider
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getCaveSpiderTextures((EntityCaveSpider)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderChicken.java
View File

@ -1,8 +1,10 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderChicken extends RenderLiving
{
private static final ResourceLocation chickenTextures = new ResourceLocation("textures/entity/chicken.png");
private static final TextureLocation chickenTextures = new TextureLocation("textures/entity/chicken.png");
public RenderChicken(ModelBase par1ModelBase, float par2)
{
@ -14,7 +16,7 @@ public class RenderChicken extends RenderLiving
super.doRenderLiving(par1EntityChicken, par2, par4, par6, par8, par9);
}
protected ResourceLocation getChickenTextures(EntityChicken par1EntityChicken)
protected TextureLocation getChickenTextures(EntityChicken par1EntityChicken)
{
return chickenTextures;
}
@ -47,7 +49,7 @@ public class RenderChicken extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getChickenTextures((EntityChicken)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderCow.java
View File

@ -1,15 +1,17 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderCow extends RenderLiving
{
private static final ResourceLocation cowTextures = new ResourceLocation("textures/entity/cow/cow.png");
private static final TextureLocation cowTextures = new TextureLocation("textures/entity/cow/cow.png");
public RenderCow(ModelBase par1ModelBase, float par2)
{
super(par1ModelBase, par2);
}
protected ResourceLocation getCowTextures(EntityCow par1EntityCow)
protected TextureLocation getCowTextures(EntityCow par1EntityCow)
{
return cowTextures;
}
@ -17,7 +19,7 @@ public class RenderCow extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getCowTextures((EntityCow)par1Entity);
}

9
src/main/java/net/minecraft/src/RenderCreeper.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderCreeper extends RenderLiving
{
private static final ResourceLocation armoredCreeperTextures = new ResourceLocation("textures/entity/creeper/creeper_armor.png");
private static final ResourceLocation creeperTextures = new ResourceLocation("textures/entity/creeper/creeper.png");
private static final TextureLocation armoredCreeperTextures = new TextureLocation("textures/entity/creeper/creeper_armor.png");
private static final TextureLocation creeperTextures = new TextureLocation("textures/entity/creeper/creeper.png");
/** The creeper model. */
private ModelBase creeperModel = new ModelCreeper(2.0F);
@ -125,7 +126,7 @@ public class RenderCreeper extends RenderLiving
return -1;
}
protected ResourceLocation getCreeperTextures(EntityCreeper par1EntityCreeper)
protected TextureLocation getCreeperTextures(EntityCreeper par1EntityCreeper)
{
return creeperTextures;
}
@ -163,7 +164,7 @@ public class RenderCreeper extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getCreeperTextures((EntityCreeper)par1Entity);
}

15
src/main/java/net/minecraft/src/RenderDragon.java
View File

@ -1,14 +1,17 @@
package net.minecraft.src;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import net.lax1dude.eaglercraft.adapter.Tessellator;
public class RenderDragon extends RenderLiving
{
private static final ResourceLocation enderDragonExplodingTextures = new ResourceLocation("textures/entity/enderdragon/dragon_exploding.png");
private static final ResourceLocation enderDragonCrystalBeamTextures = new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png");
private static final ResourceLocation enderDragonEyesTextures = new ResourceLocation("textures/entity/enderdragon/dragon_eyes.png");
private static final ResourceLocation enderDragonTextures = new ResourceLocation("textures/entity/enderdragon/dragon.png");
private static final TextureLocation enderDragonExplodingTextures = new TextureLocation("textures/entity/enderdragon/dragon_exploding.png");
private static final TextureLocation enderDragonCrystalBeamTextures = new TextureLocation("textures/entity/endercrystal/endercrystal_beam.png");
private static final TextureLocation enderDragonEyesTextures = new TextureLocation("textures/entity/enderdragon/dragon_eyes.png");
private static final TextureLocation enderDragonTextures = new TextureLocation("textures/entity/enderdragon/dragon.png");
/** An instance of the dragon model in RenderDragon */
protected ModelDragon modelDragon;
@ -130,7 +133,7 @@ public class RenderDragon extends RenderLiving
}
}
protected ResourceLocation getEnderDragonTextures(EntityDragon par1EntityDragon)
protected TextureLocation getEnderDragonTextures(EntityDragon par1EntityDragon)
{
return enderDragonTextures;
}
@ -271,7 +274,7 @@ public class RenderDragon extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getEnderDragonTextures((EntityDragon)par1Entity);
}

3
src/main/java/net/minecraft/src/RenderEnchantmentTable.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderEnchantmentTable extends TileEntitySpecialRenderer
{
private static final ResourceLocation enchantingTableBookTextures = new ResourceLocation("textures/entity/enchanting_table_book.png");
private static final TextureLocation enchantingTableBookTextures = new TextureLocation("textures/entity/enchanting_table_book.png");
private ModelBook enchantmentBook = new ModelBook();
public void renderTileEntityEnchantmentTableAt(TileEntityEnchantmentTable par1TileEntityEnchantmentTable, double par2, double par4, double par6, float par8)

7
src/main/java/net/minecraft/src/RenderEndPortal.java
View File

@ -2,12 +2,15 @@ package net.minecraft.src;
import java.nio.FloatBuffer;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class RenderEndPortal extends TileEntitySpecialRenderer
{
private static final ResourceLocation enderPortalEndSkyTextures = new ResourceLocation("textures/environment/end_sky.png");
private static final ResourceLocation endPortalTextures = new ResourceLocation("textures/entity/end_portal.png");
private static final TextureLocation enderPortalEndSkyTextures = new TextureLocation("textures/environment/end_sky.png");
private static final TextureLocation endPortalTextures = new TextureLocation("textures/entity/end_portal.png");
private static final Random field_110644_e = new Random(31100L);
FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16);

7
src/main/java/net/minecraft/src/RenderEnderCrystal.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderEnderCrystal extends Render
{
private static final ResourceLocation enderCrystalTextures = new ResourceLocation("textures/entity/endercrystal/endercrystal.png");
private static final TextureLocation enderCrystalTextures = new TextureLocation("textures/entity/endercrystal/endercrystal.png");
private ModelBase field_76995_b;
public RenderEnderCrystal()
@ -28,7 +29,7 @@ public class RenderEnderCrystal extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getEnderCrystalTextures(EntityEnderCrystal par1EntityEnderCrystal)
protected TextureLocation getEnderCrystalTextures(EntityEnderCrystal par1EntityEnderCrystal)
{
return enderCrystalTextures;
}
@ -36,7 +37,7 @@ public class RenderEnderCrystal extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getEnderCrystalTextures((EntityEnderCrystal)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderEnderman.java
View File

@ -7,8 +7,8 @@ import net.lax1dude.eaglercraft.TextureLocation;
public class RenderEnderman extends RenderLiving
{
private static final ResourceLocation endermanEyesTexture = new ResourceLocation("textures/entity/enderman/enderman_eyes.png");
private static final ResourceLocation endermanTextures = new ResourceLocation("textures/entity/enderman/enderman.png");
private static final TextureLocation endermanEyesTexture = new TextureLocation("textures/entity/enderman/enderman_eyes.png");
private static final TextureLocation endermanTextures = new TextureLocation("textures/entity/enderman/enderman.png");
/** The model of the enderman */
private ModelEnderman endermanModel;
@ -39,7 +39,7 @@ public class RenderEnderman extends RenderLiving
super.doRenderLiving(par1EntityEnderman, par2, par4, par6, par8, par9);
}
protected ResourceLocation getEndermanTextures(EntityEnderman par1EntityEnderman)
protected TextureLocation getEndermanTextures(EntityEnderman par1EntityEnderman)
{
return endermanTextures;
}
@ -141,7 +141,7 @@ public class RenderEnderman extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getEndermanTextures((EntityEnderman)par1Entity);
}

2
src/main/java/net/minecraft/src/RenderEntity.java
View File

@ -20,7 +20,7 @@ public class RenderEntity extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return null;
}

6
src/main/java/net/minecraft/src/RenderFallingSand.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class RenderFallingSand extends Render
@ -58,7 +60,7 @@ public class RenderFallingSand extends Render
}
}
protected ResourceLocation getFallingSandTextures(EntityFallingSand par1EntityFallingSand)
protected TextureLocation getFallingSandTextures(EntityFallingSand par1EntityFallingSand)
{
return TextureMap.locationBlocksTexture;
}
@ -66,7 +68,7 @@ public class RenderFallingSand extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getFallingSandTextures((EntityFallingSand)par1Entity);
}

6
src/main/java/net/minecraft/src/RenderFireball.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -42,7 +44,7 @@ public class RenderFireball extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getFireballTextures(EntityFireball par1EntityFireball)
protected TextureLocation getFireballTextures(EntityFireball par1EntityFireball)
{
return TextureMap.locationItemsTexture;
}
@ -50,7 +52,7 @@ public class RenderFireball extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getFireballTextures((EntityFireball)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderFish.java
View File

@ -1,11 +1,13 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderFish extends Render
{
private static final ResourceLocation field_110792_a = new ResourceLocation("textures/particle/particles.png");
private static final TextureLocation field_110792_a = new TextureLocation("textures/particle/particles.png");
/**
* Actually renders the fishing line and hook
@ -87,7 +89,7 @@ public class RenderFish extends Render
}
}
protected ResourceLocation func_110791_a(EntityFishHook par1EntityFishHook)
protected TextureLocation func_110791_a(EntityFishHook par1EntityFishHook)
{
return field_110792_a;
}
@ -95,7 +97,7 @@ public class RenderFish extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110791_a((EntityFishHook)par1Entity);
}

9
src/main/java/net/minecraft/src/RenderGhast.java
View File

@ -1,18 +1,19 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderGhast extends RenderLiving
{
private static final ResourceLocation ghastTextures = new ResourceLocation("textures/entity/ghast/ghast.png");
private static final ResourceLocation ghastShootingTextures = new ResourceLocation("textures/entity/ghast/ghast_shooting.png");
private static final TextureLocation ghastTextures = new TextureLocation("textures/entity/ghast/ghast.png");
private static final TextureLocation ghastShootingTextures = new TextureLocation("textures/entity/ghast/ghast_shooting.png");
public RenderGhast()
{
super(new ModelGhast(), 0.5F);
}
protected ResourceLocation func_110867_a(EntityGhast par1EntityGhast)
protected TextureLocation func_110867_a(EntityGhast par1EntityGhast)
{
return par1EntityGhast.func_110182_bF() ? ghastShootingTextures : ghastTextures;
}
@ -48,7 +49,7 @@ public class RenderGhast extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110867_a((EntityGhast)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderGiantZombie.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderGiantZombie extends RenderLiving
{
private static final ResourceLocation zombieTextures = new ResourceLocation("textures/entity/zombie/zombie.png");
private static final TextureLocation zombieTextures = new TextureLocation("textures/entity/zombie/zombie.png");
/** Scale of the model to use */
private float scale;
@ -23,7 +24,7 @@ public class RenderGiantZombie extends RenderLiving
GL11.glScalef(this.scale, this.scale, this.scale);
}
protected ResourceLocation getZombieTextures(EntityGiantZombie par1EntityGiantZombie)
protected TextureLocation getZombieTextures(EntityGiantZombie par1EntityGiantZombie)
{
return zombieTextures;
}
@ -40,7 +41,7 @@ public class RenderGiantZombie extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getZombieTextures((EntityGiantZombie)par1Entity);
}

22
src/main/java/net/minecraft/src/RenderHorse.java
View File

@ -2,16 +2,18 @@ package net.minecraft.src;
import com.google.common.collect.Maps;
import java.util.Map;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderHorse extends RenderLiving
{
private static final Map field_110852_a = Maps.newHashMap();
private static final ResourceLocation whiteHorseTextures = new ResourceLocation("textures/entity/horse/horse_white.png");
private static final ResourceLocation muleTextures = new ResourceLocation("textures/entity/horse/mule.png");
private static final ResourceLocation donkeyTextures = new ResourceLocation("textures/entity/horse/donkey.png");
private static final ResourceLocation zombieHorseTextures = new ResourceLocation("textures/entity/horse/horse_zombie.png");
private static final ResourceLocation skeletonHorseTextures = new ResourceLocation("textures/entity/horse/horse_skeleton.png");
private static final TextureLocation whiteHorseTextures = new TextureLocation("textures/entity/horse/horse_white.png");
private static final TextureLocation muleTextures = new TextureLocation("textures/entity/horse/mule.png");
private static final TextureLocation donkeyTextures = new TextureLocation("textures/entity/horse/donkey.png");
private static final TextureLocation zombieHorseTextures = new TextureLocation("textures/entity/horse/horse_zombie.png");
private static final TextureLocation skeletonHorseTextures = new TextureLocation("textures/entity/horse/horse_skeleton.png");
public RenderHorse(ModelBase par1ModelBase, float par2)
{
@ -49,7 +51,7 @@ public class RenderHorse extends RenderLiving
}
}
protected ResourceLocation func_110849_a(EntityHorse par1EntityHorse)
protected TextureLocation func_110849_a(EntityHorse par1EntityHorse)
{
if (!par1EntityHorse.func_110239_cn())
{
@ -78,14 +80,14 @@ public class RenderHorse extends RenderLiving
}
}
private ResourceLocation func_110848_b(EntityHorse par1EntityHorse)
private TextureLocation func_110848_b(EntityHorse par1EntityHorse)
{
String var2 = par1EntityHorse.getHorseTexture();
ResourceLocation var3 = (ResourceLocation)field_110852_a.get(var2);
TextureLocation var3 = (TextureLocation)field_110852_a.get(var2);
if (var3 == null)
{
var3 = new ResourceLocation(var2);
var3 = new TextureLocation(var2);
Minecraft.getMinecraft().getTextureManager().loadTexture(var3, new LayeredTexture(par1EntityHorse.getVariantTexturePaths()));
field_110852_a.put(var2, var3);
}
@ -113,7 +115,7 @@ public class RenderHorse extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110849_a((EntityHorse)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderIronGolem.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderIronGolem extends RenderLiving
{
private static final ResourceLocation ironGolemTextures = new ResourceLocation("textures/entity/iron_golem.png");
private static final TextureLocation ironGolemTextures = new TextureLocation("textures/entity/iron_golem.png");
/** Iron Golem's Model. */
private final ModelIronGolem ironGolemModel;
@ -24,7 +25,7 @@ public class RenderIronGolem extends RenderLiving
super.doRenderLiving(par1EntityIronGolem, par2, par4, par6, par8, par9);
}
protected ResourceLocation getIronGolemTextures(EntityIronGolem par1EntityIronGolem)
protected TextureLocation getIronGolemTextures(EntityIronGolem par1EntityIronGolem)
{
return ironGolemTextures;
}
@ -97,7 +98,7 @@ public class RenderIronGolem extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getIronGolemTextures((EntityIronGolem)par1Entity);
}

11
src/main/java/net/minecraft/src/RenderItem.java
View File

@ -3,6 +3,7 @@ package net.minecraft.src;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -179,9 +180,9 @@ public class RenderItem extends Render
}
}
protected ResourceLocation func_110796_a(EntityItem par1EntityItem)
protected TextureLocation func_110796_a(EntityItem par1EntityItem)
{
return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
return this.renderManager.renderEngine.getTextureLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
}
/**
@ -194,7 +195,7 @@ public class RenderItem extends Render
if (par2Icon == null)
{
TextureManager var9 = Minecraft.getMinecraft().getTextureManager();
ResourceLocation var10 = var9.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
TextureLocation var10 = var9.getTextureLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
par2Icon = ((TextureMap)var9.getTexture(var10)).getAtlasSprite("missingno");
}
@ -393,7 +394,7 @@ public class RenderItem extends Render
else
{
GL11.glDisable(GL11.GL_LIGHTING);
TextureLocation var15 = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber());
TextureLocation var15 = par2TextureManager.getTextureLocation(par3ItemStack.getItemSpriteNumber());
var15.bindTexture();
if (var8 == null)
@ -555,7 +556,7 @@ public class RenderItem extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110796_a((EntityItem)par1Entity);
}

14
src/main/java/net/minecraft/src/RenderItemFrame.java
View File

@ -1,10 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import net.lax1dude.eaglercraft.adapter.Tessellator;
public class RenderItemFrame extends Render
{
private static final ResourceLocation mapBackgroundTextures = new ResourceLocation("textures/map/map_background.png");
private static final TextureLocation mapBackgroundTextures = new TextureLocation("textures/map/map_background.png");
private final RenderBlocks renderBlocksInstance = new RenderBlocks();
private Icon field_94147_f;
@ -28,7 +30,7 @@ public class RenderItemFrame extends Render
GL11.glPopMatrix();
}
protected ResourceLocation func_110788_a(EntityItemFrame par1EntityItemFrame)
protected TextureLocation func_110788_a(EntityItemFrame par1EntityItemFrame)
{
return null;
}
@ -40,7 +42,7 @@ public class RenderItemFrame extends Render
{
GL11.glPushMatrix();
GL11.glRotatef(par1EntityItemFrame.rotationYaw, 0.0F, 1.0F, 0.0F);
this.renderManager.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
TextureMap.locationBlocksTexture.bindTexture();
Block var2 = Block.planks;
float var3 = 0.0625F;
float var4 = 0.75F;
@ -104,7 +106,7 @@ public class RenderItemFrame extends Render
if (var3.getEntityItem().getItem() == Item.map)
{
this.renderManager.renderEngine.bindTexture(mapBackgroundTextures);
mapBackgroundTextures.bindTexture();
Tessellator var4 = Tessellator.instance;
GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
@ -131,7 +133,7 @@ public class RenderItemFrame extends Render
if (var3.getEntityItem().getItem() == Item.compass)
{
TextureManager var11 = Minecraft.getMinecraft().getTextureManager();
var11.bindTexture(TextureMap.locationItemsTexture);
TextureMap.locationItemsTexture.bindTexture();
TextureAtlasSprite var13 = ((TextureMap)var11.getTexture(TextureMap.locationItemsTexture)).getAtlasSprite(Item.compass.getIconIndex(var3.getEntityItem()).getIconName());
if (var13 instanceof TextureCompass)
@ -169,7 +171,7 @@ public class RenderItemFrame extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110788_a((EntityItemFrame)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderLeashKnot.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderLeashKnot extends Render
{
private static final ResourceLocation leashKnotTextures = new ResourceLocation("textures/entity/lead_knot.png");
private static final TextureLocation leashKnotTextures = new TextureLocation("textures/entity/lead_knot.png");
private ModelLeashKnot leashKnotModel = new ModelLeashKnot();
public void func_110799_a(EntityLeashKnot par1EntityLeashKnot, double par2, double par4, double par6, float par8, float par9)
@ -22,7 +23,7 @@ public class RenderLeashKnot extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getLeashKnotTextures(EntityLeashKnot par1EntityLeashKnot)
protected TextureLocation getLeashKnotTextures(EntityLeashKnot par1EntityLeashKnot)
{
return leashKnotTextures;
}
@ -30,7 +31,7 @@ public class RenderLeashKnot extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getLeashKnotTextures((EntityLeashKnot)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderLightningBolt.java
View File

@ -1,6 +1,9 @@
package net.minecraft.src;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public class RenderLightningBolt extends Render
@ -126,7 +129,7 @@ public class RenderLightningBolt extends Render
GL11.glEnable(GL11.GL_TEXTURE_2D);
}
protected ResourceLocation func_110805_a(EntityLightningBolt par1EntityLightningBolt)
protected TextureLocation func_110805_a(EntityLightningBolt par1EntityLightningBolt)
{
return null;
}
@ -134,7 +137,7 @@ public class RenderLightningBolt extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110805_a((EntityLightningBolt)par1Entity);
}

1
src/main/java/net/minecraft/src/RenderLiving.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
public abstract class RenderLiving extends RendererLivingEntity

7
src/main/java/net/minecraft/src/RenderMagmaCube.java
View File

@ -1,17 +1,18 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderMagmaCube extends RenderLiving
{
private static final ResourceLocation magmaCubeTextures = new ResourceLocation("textures/entity/slime/magmacube.png");
private static final TextureLocation magmaCubeTextures = new TextureLocation("textures/entity/slime/magmacube.png");
public RenderMagmaCube()
{
super(new ModelMagmaCube(), 0.25F);
}
protected ResourceLocation getMagmaCubeTextures(EntityMagmaCube par1EntityMagmaCube)
protected TextureLocation getMagmaCubeTextures(EntityMagmaCube par1EntityMagmaCube)
{
return magmaCubeTextures;
}
@ -37,7 +38,7 @@ public class RenderMagmaCube extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getMagmaCubeTextures((EntityMagmaCube)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderMinecart.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderMinecart extends Render
{
private static final ResourceLocation minecartTextures = new ResourceLocation("textures/entity/minecart.png");
private static final TextureLocation minecartTextures = new TextureLocation("textures/entity/minecart.png");
/** instance of ModelMinecart for rendering */
protected ModelBase modelMinecart = new ModelMinecart();
@ -102,7 +103,7 @@ public class RenderMinecart extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getMinecartTextures(EntityMinecart par1EntityMinecart)
protected TextureLocation getMinecartTextures(EntityMinecart par1EntityMinecart)
{
return minecartTextures;
}
@ -121,7 +122,7 @@ public class RenderMinecart extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getMinecartTextures((EntityMinecart)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderMooshroom.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderMooshroom extends RenderLiving
{
private static final ResourceLocation mooshroomTextures = new ResourceLocation("textures/entity/cow/mooshroom.png");
private static final TextureLocation mooshroomTextures = new TextureLocation("textures/entity/cow/mooshroom.png");
public RenderMooshroom(ModelBase par1ModelBase, float par2)
{
@ -16,7 +17,7 @@ public class RenderMooshroom extends RenderLiving
super.doRenderLiving(par1EntityMooshroom, par2, par4, par6, par8, par9);
}
protected ResourceLocation getMooshroomTextures(EntityMooshroom par1EntityMooshroom)
protected TextureLocation getMooshroomTextures(EntityMooshroom par1EntityMooshroom)
{
return mooshroomTextures;
}
@ -67,7 +68,7 @@ public class RenderMooshroom extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getMooshroomTextures((EntityMooshroom)par1Entity);
}

13
src/main/java/net/minecraft/src/RenderOcelot.java
View File

@ -1,13 +1,14 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderOcelot extends RenderLiving
{
private static final ResourceLocation blackOcelotTextures = new ResourceLocation("textures/entity/cat/black.png");
private static final ResourceLocation ocelotTextures = new ResourceLocation("textures/entity/cat/ocelot.png");
private static final ResourceLocation redOcelotTextures = new ResourceLocation("textures/entity/cat/red.png");
private static final ResourceLocation siameseOcelotTextures = new ResourceLocation("textures/entity/cat/siamese.png");
private static final TextureLocation blackOcelotTextures = new TextureLocation("textures/entity/cat/black.png");
private static final TextureLocation ocelotTextures = new TextureLocation("textures/entity/cat/ocelot.png");
private static final TextureLocation redOcelotTextures = new TextureLocation("textures/entity/cat/red.png");
private static final TextureLocation siameseOcelotTextures = new TextureLocation("textures/entity/cat/siamese.png");
public RenderOcelot(ModelBase par1ModelBase, float par2)
{
@ -19,7 +20,7 @@ public class RenderOcelot extends RenderLiving
super.doRenderLiving(par1EntityOcelot, par2, par4, par6, par8, par9);
}
protected ResourceLocation func_110874_a(EntityOcelot par1EntityOcelot)
protected TextureLocation func_110874_a(EntityOcelot par1EntityOcelot)
{
switch (par1EntityOcelot.getTameSkin())
{
@ -73,7 +74,7 @@ public class RenderOcelot extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110874_a((EntityOcelot)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderPainting.java
View File

@ -1,11 +1,13 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderPainting extends Render
{
private static final ResourceLocation field_110807_a = new ResourceLocation("textures/painting/paintings_kristoffer_zetterstrand.png");
private static final TextureLocation field_110807_a = new TextureLocation("textures/painting/paintings_kristoffer_zetterstrand.png");
public void renderThePainting(EntityPainting par1EntityPainting, double par2, double par4, double par6, float par8, float par9)
{
@ -22,7 +24,7 @@ public class RenderPainting extends Render
GL11.glPopMatrix();
}
protected ResourceLocation func_110806_a(EntityPainting par1EntityPainting)
protected TextureLocation func_110806_a(EntityPainting par1EntityPainting)
{
return field_110807_a;
}
@ -131,7 +133,7 @@ public class RenderPainting extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110806_a((EntityPainting)par1Entity);
}

10
src/main/java/net/minecraft/src/RenderPig.java
View File

@ -1,9 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderPig extends RenderLiving
{
private static final ResourceLocation saddledPigTextures = new ResourceLocation("textures/entity/pig/pig_saddle.png");
private static final ResourceLocation pigTextures = new ResourceLocation("textures/entity/pig/pig.png");
private static final TextureLocation saddledPigTextures = new TextureLocation("textures/entity/pig/pig_saddle.png");
private static final TextureLocation pigTextures = new TextureLocation("textures/entity/pig/pig.png");
public RenderPig(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3)
{
@ -24,7 +26,7 @@ public class RenderPig extends RenderLiving
}
}
protected ResourceLocation getPigTextures(EntityPig par1EntityPig)
protected TextureLocation getPigTextures(EntityPig par1EntityPig)
{
return pigTextures;
}
@ -40,7 +42,7 @@ public class RenderPig extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getPigTextures((EntityPig)par1Entity);
}

43
src/main/java/net/minecraft/src/RenderPlayer.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderPlayer extends RendererLivingEntity
{
private static final ResourceLocation steveTextures = new ResourceLocation("textures/entity/steve.png");
private static final TextureLocation steveTextures = new TextureLocation("textures/entity/steve.png");
private ModelBiped modelBipedMain;
private ModelBiped modelArmorChestplate;
private ModelBiped modelArmor;
@ -20,7 +21,7 @@ public class RenderPlayer extends RendererLivingEntity
/**
* Set the specified armor model as the player model. Args: player, armorSlot, partialTick
*/
protected int setArmorModel(AbstractClientPlayer par1AbstractClientPlayer, int par2, float par3)
protected int setArmorModel(EntityPlayer par1AbstractClientPlayer, int par2, float par3)
{
ItemStack var4 = par1AbstractClientPlayer.inventory.armorItemInSlot(3 - par2);
@ -76,7 +77,7 @@ public class RenderPlayer extends RendererLivingEntity
return -1;
}
protected void func_130220_b(AbstractClientPlayer par1AbstractClientPlayer, int par2, float par3)
protected void func_130220_b(EntityPlayer par1AbstractClientPlayer, int par2, float par3)
{
ItemStack var4 = par1AbstractClientPlayer.inventory.armorItemInSlot(3 - par2);
@ -93,7 +94,7 @@ public class RenderPlayer extends RendererLivingEntity
}
}
public void func_130009_a(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
public void func_130009_a(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
{
float var10 = 1.0F;
GL11.glColor3f(var10, var10, var10);
@ -128,7 +129,7 @@ public class RenderPlayer extends RendererLivingEntity
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0;
}
protected ResourceLocation func_110817_a(AbstractClientPlayer par1AbstractClientPlayer)
protected TextureLocation func_110817_a(EntityPlayer par1AbstractClientPlayer)
{
return par1AbstractClientPlayer.getLocationSkin();
}
@ -136,7 +137,7 @@ public class RenderPlayer extends RendererLivingEntity
/**
* Method for adding special render rules
*/
protected void renderSpecials(AbstractClientPlayer par1AbstractClientPlayer, float par2)
protected void renderSpecials(EntityPlayer par1AbstractClientPlayer, float par2)
{
float var3 = 1.0F;
GL11.glColor3f(var3, var3, var3);
@ -356,13 +357,13 @@ public class RenderPlayer extends RendererLivingEntity
}
}
protected void renderPlayerScale(AbstractClientPlayer par1AbstractClientPlayer, float par2)
protected void renderPlayerScale(EntityPlayer par1AbstractClientPlayer, float par2)
{
float var3 = 0.9375F;
GL11.glScalef(var3, var3, var3);
}
protected void func_96450_a(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6, String par8Str, float par9, double par10)
protected void func_96450_a(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, String par8Str, float par9, double par10)
{
if (par10 < 100.0D)
{
@ -401,7 +402,7 @@ public class RenderPlayer extends RendererLivingEntity
/**
* Renders player with sleeping offset if sleeping
*/
protected void renderPlayerSleep(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6)
protected void renderPlayerSleep(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6)
{
if (par1AbstractClientPlayer.isEntityAlive() && par1AbstractClientPlayer.isPlayerSleeping())
{
@ -416,7 +417,7 @@ public class RenderPlayer extends RendererLivingEntity
/**
* Rotates the player if the player is sleeping. This method is called in rotateCorpse.
*/
protected void rotatePlayer(AbstractClientPlayer par1AbstractClientPlayer, float par2, float par3, float par4)
protected void rotatePlayer(EntityPlayer par1AbstractClientPlayer, float par2, float par3, float par4)
{
if (par1AbstractClientPlayer.isEntityAlive() && par1AbstractClientPlayer.isPlayerSleeping())
{
@ -432,7 +433,7 @@ public class RenderPlayer extends RendererLivingEntity
protected void func_96449_a(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, String par8Str, float par9, double par10)
{
this.func_96450_a((AbstractClientPlayer)par1EntityLivingBase, par2, par4, par6, par8Str, par9, par10);
this.func_96450_a((EntityPlayer)par1EntityLivingBase, par2, par4, par6, par8Str, par9, par10);
}
/**
@ -441,12 +442,12 @@ public class RenderPlayer extends RendererLivingEntity
*/
protected void preRenderCallback(EntityLivingBase par1EntityLivingBase, float par2)
{
this.renderPlayerScale((AbstractClientPlayer)par1EntityLivingBase, par2);
this.renderPlayerScale((EntityPlayer)par1EntityLivingBase, par2);
}
protected void func_82408_c(EntityLivingBase par1EntityLivingBase, int par2, float par3)
{
this.func_130220_b((AbstractClientPlayer)par1EntityLivingBase, par2, par3);
this.func_130220_b((EntityPlayer)par1EntityLivingBase, par2, par3);
}
/**
@ -454,17 +455,17 @@ public class RenderPlayer extends RendererLivingEntity
*/
protected int shouldRenderPass(EntityLivingBase par1EntityLivingBase, int par2, float par3)
{
return this.setArmorModel((AbstractClientPlayer)par1EntityLivingBase, par2, par3);
return this.setArmorModel((EntityPlayer) par1EntityLivingBase, par2, par3);
}
protected void renderEquippedItems(EntityLivingBase par1EntityLivingBase, float par2)
{
this.renderSpecials((AbstractClientPlayer)par1EntityLivingBase, par2);
this.renderSpecials((EntityPlayer) par1EntityLivingBase, par2);
}
protected void rotateCorpse(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4)
{
this.rotatePlayer((AbstractClientPlayer)par1EntityLivingBase, par2, par3, par4);
this.rotatePlayer((EntityPlayer) par1EntityLivingBase, par2, par3, par4);
}
/**
@ -472,20 +473,20 @@ public class RenderPlayer extends RendererLivingEntity
*/
protected void renderLivingAt(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6)
{
this.renderPlayerSleep((AbstractClientPlayer)par1EntityLivingBase, par2, par4, par6);
this.renderPlayerSleep((EntityPlayer) par1EntityLivingBase, par2, par4, par6);
}
public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9)
{
this.func_130009_a((AbstractClientPlayer)par1EntityLivingBase, par2, par4, par6, par8, par9);
this.func_130009_a((EntityPlayer)par1EntityLivingBase, par2, par4, par6, par8, par9);
}
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110817_a((AbstractClientPlayer)par1Entity);
return this.func_110817_a((EntityPlayer)par1Entity);
}
/**
@ -496,6 +497,6 @@ public class RenderPlayer extends RendererLivingEntity
*/
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
{
this.func_130009_a((AbstractClientPlayer)par1Entity, par2, par4, par6, par8, par9);
this.func_130009_a((EntityPlayer)par1Entity, par2, par4, par6, par8, par9);
}
}

9
src/main/java/net/minecraft/src/RenderSheep.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSheep extends RenderLiving
{
private static final ResourceLocation sheepTextures = new ResourceLocation("textures/entity/sheep/sheep_fur.png");
private static final ResourceLocation shearedSheepTextures = new ResourceLocation("textures/entity/sheep/sheep.png");
private static final TextureLocation sheepTextures = new TextureLocation("textures/entity/sheep/sheep_fur.png");
private static final TextureLocation shearedSheepTextures = new TextureLocation("textures/entity/sheep/sheep.png");
public RenderSheep(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3)
{
@ -29,7 +30,7 @@ public class RenderSheep extends RenderLiving
}
}
protected ResourceLocation func_110883_a(EntitySheep par1EntitySheep)
protected TextureLocation func_110883_a(EntitySheep par1EntitySheep)
{
return shearedSheepTextures;
}
@ -45,7 +46,7 @@ public class RenderSheep extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110883_a((EntitySheep)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderSilverfish.java
View File

@ -1,8 +1,10 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderSilverfish extends RenderLiving
{
private static final ResourceLocation silverfishTextures = new ResourceLocation("textures/entity/silverfish.png");
private static final TextureLocation silverfishTextures = new TextureLocation("textures/entity/silverfish.png");
public RenderSilverfish()
{
@ -25,7 +27,7 @@ public class RenderSilverfish extends RenderLiving
super.doRenderLiving(par1EntitySilverfish, par2, par4, par6, par8, par9);
}
protected ResourceLocation getSilverfishTextures(EntitySilverfish par1EntitySilverfish)
protected TextureLocation getSilverfishTextures(EntitySilverfish par1EntitySilverfish)
{
return silverfishTextures;
}
@ -64,7 +66,7 @@ public class RenderSilverfish extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getSilverfishTextures((EntitySilverfish)par1Entity);
}

11
src/main/java/net/minecraft/src/RenderSkeleton.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSkeleton extends RenderBiped
{
private static final ResourceLocation skeletonTextures = new ResourceLocation("textures/entity/skeleton/skeleton.png");
private static final ResourceLocation witherSkeletonTextures = new ResourceLocation("textures/entity/skeleton/wither_skeleton.png");
private static final TextureLocation skeletonTextures = new TextureLocation("textures/entity/skeleton/skeleton.png");
private static final TextureLocation witherSkeletonTextures = new TextureLocation("textures/entity/skeleton/wither_skeleton.png");
public RenderSkeleton()
{
@ -25,12 +26,12 @@ public class RenderSkeleton extends RenderBiped
GL11.glTranslatef(0.09375F, 0.1875F, 0.0F);
}
protected ResourceLocation func_110860_a(EntitySkeleton par1EntitySkeleton)
protected TextureLocation func_110860_a(EntitySkeleton par1EntitySkeleton)
{
return par1EntitySkeleton.getSkeletonType() == 1 ? witherSkeletonTextures : skeletonTextures;
}
protected ResourceLocation func_110856_a(EntityLiving par1EntityLiving)
protected TextureLocation func_110856_a(EntityLiving par1EntityLiving)
{
return this.func_110860_a((EntitySkeleton)par1EntityLiving);
}
@ -47,7 +48,7 @@ public class RenderSkeleton extends RenderBiped
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110860_a((EntitySkeleton)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderSlime.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSlime extends RenderLiving
{
private static final ResourceLocation slimeTextures = new ResourceLocation("textures/entity/slime/slime.png");
private static final TextureLocation slimeTextures = new TextureLocation("textures/entity/slime/slime.png");
private ModelBase scaleAmount;
public RenderSlime(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3)
@ -53,7 +54,7 @@ public class RenderSlime extends RenderLiving
GL11.glScalef(var5 * var3, 1.0F / var5 * var3, var5 * var3);
}
protected ResourceLocation getSlimeTextures(EntitySlime par1EntitySlime)
protected TextureLocation getSlimeTextures(EntitySlime par1EntitySlime)
{
return slimeTextures;
}
@ -78,7 +79,7 @@ public class RenderSlime extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getSlimeTextures((EntitySlime)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderSnowMan.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSnowMan extends RenderLiving
{
private static final ResourceLocation snowManTextures = new ResourceLocation("textures/entity/snowman.png");
private static final TextureLocation snowManTextures = new TextureLocation("textures/entity/snowman.png");
/** A reference to the Snowman model in RenderSnowMan. */
private ModelSnowMan snowmanModel;
@ -42,7 +43,7 @@ public class RenderSnowMan extends RenderLiving
}
}
protected ResourceLocation getSnowManTextures(EntitySnowman par1EntitySnowman)
protected TextureLocation getSnowManTextures(EntitySnowman par1EntitySnowman)
{
return snowManTextures;
}
@ -55,7 +56,7 @@ public class RenderSnowMan extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getSnowManTextures((EntitySnowman)par1Entity);
}

4
src/main/java/net/minecraft/src/RenderSnowball.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -60,7 +62,7 @@ public class RenderSnowball extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return TextureMap.locationItemsTexture;
}

9
src/main/java/net/minecraft/src/RenderSpider.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSpider extends RenderLiving
{
private static final ResourceLocation spiderEyesTextures = new ResourceLocation("textures/entity/spider_eyes.png");
private static final ResourceLocation spiderTextures = new ResourceLocation("textures/entity/spider/spider.png");
private static final TextureLocation spiderEyesTextures = new TextureLocation("textures/entity/spider_eyes.png");
private static final TextureLocation spiderTextures = new TextureLocation("textures/entity/spider/spider.png");
public RenderSpider()
{
@ -54,7 +55,7 @@ public class RenderSpider extends RenderLiving
}
}
protected ResourceLocation getSpiderTextures(EntitySpider par1EntitySpider)
protected TextureLocation getSpiderTextures(EntitySpider par1EntitySpider)
{
return spiderTextures;
}
@ -75,7 +76,7 @@ public class RenderSpider extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getSpiderTextures((EntitySpider)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderSquid.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderSquid extends RenderLiving
{
private static final ResourceLocation squidTextures = new ResourceLocation("textures/entity/squid.png");
private static final TextureLocation squidTextures = new TextureLocation("textures/entity/squid.png");
public RenderSquid(ModelBase par1ModelBase, float par2)
{
@ -19,7 +20,7 @@ public class RenderSquid extends RenderLiving
super.doRenderLiving(par1EntitySquid, par2, par4, par6, par8, par9);
}
protected ResourceLocation getSquidTextures(EntitySquid par1EntitySquid)
protected TextureLocation getSquidTextures(EntitySquid par1EntitySquid)
{
return squidTextures;
}
@ -69,7 +70,7 @@ public class RenderSquid extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getSquidTextures((EntitySquid)par1Entity);
}

4
src/main/java/net/minecraft/src/RenderTNTPrimed.java
View File

@ -58,7 +58,7 @@ public class RenderTNTPrimed extends Render
GL11.glPopMatrix();
}
protected ResourceLocation func_110808_a(EntityTNTPrimed par1EntityTNTPrimed)
protected TextureLocation func_110808_a(EntityTNTPrimed par1EntityTNTPrimed)
{
return TextureMap.locationBlocksTexture;
}
@ -66,7 +66,7 @@ public class RenderTNTPrimed extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110808_a((EntityTNTPrimed)par1Entity);
}

17
src/main/java/net/minecraft/src/RenderVillager.java
View File

@ -1,15 +1,16 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderVillager extends RenderLiving
{
private static final ResourceLocation villagerTextures = new ResourceLocation("textures/entity/villager/villager.png");
private static final ResourceLocation farmerVillagerTextures = new ResourceLocation("textures/entity/villager/farmer.png");
private static final ResourceLocation librarianVillagerTextures = new ResourceLocation("textures/entity/villager/librarian.png");
private static final ResourceLocation priestVillagerTextures = new ResourceLocation("textures/entity/villager/priest.png");
private static final ResourceLocation smithVillagerTextures = new ResourceLocation("textures/entity/villager/smith.png");
private static final ResourceLocation butcherVillagerTextures = new ResourceLocation("textures/entity/villager/butcher.png");
private static final TextureLocation villagerTextures = new TextureLocation("textures/entity/villager/villager.png");
private static final TextureLocation farmerVillagerTextures = new TextureLocation("textures/entity/villager/farmer.png");
private static final TextureLocation librarianVillagerTextures = new TextureLocation("textures/entity/villager/librarian.png");
private static final TextureLocation priestVillagerTextures = new TextureLocation("textures/entity/villager/priest.png");
private static final TextureLocation smithVillagerTextures = new TextureLocation("textures/entity/villager/smith.png");
private static final TextureLocation butcherVillagerTextures = new TextureLocation("textures/entity/villager/butcher.png");
/** Model of the villager. */
protected ModelVillager villagerModel;
@ -33,7 +34,7 @@ public class RenderVillager extends RenderLiving
super.doRenderLiving(par1EntityVillager, par2, par4, par6, par8, par9);
}
protected ResourceLocation func_110902_a(EntityVillager par1EntityVillager)
protected TextureLocation func_110902_a(EntityVillager par1EntityVillager)
{
switch (par1EntityVillager.getProfession())
{
@ -114,7 +115,7 @@ public class RenderVillager extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110902_a((EntityVillager)par1Entity);
}

7
src/main/java/net/minecraft/src/RenderWitch.java
View File

@ -1,10 +1,11 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderWitch extends RenderLiving
{
private static final ResourceLocation witchTextures = new ResourceLocation("textures/entity/witch.png");
private static final TextureLocation witchTextures = new TextureLocation("textures/entity/witch.png");
private final ModelWitch witchModel;
public RenderWitch()
@ -20,7 +21,7 @@ public class RenderWitch extends RenderLiving
super.doRenderLiving(par1EntityWitch, par2, par4, par6, par8, par9);
}
protected ResourceLocation getWitchTextures(EntityWitch par1EntityWitch)
protected TextureLocation getWitchTextures(EntityWitch par1EntityWitch)
{
return witchTextures;
}
@ -142,7 +143,7 @@ public class RenderWitch extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getWitchTextures((EntityWitch)par1Entity);
}

9
src/main/java/net/minecraft/src/RenderWither.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderWither extends RenderLiving
{
private static final ResourceLocation invulnerableWitherTextures = new ResourceLocation("textures/entity/wither/wither_invulnerable.png");
private static final ResourceLocation witherTextures = new ResourceLocation("textures/entity/wither/wither.png");
private static final TextureLocation invulnerableWitherTextures = new TextureLocation("textures/entity/wither/wither_invulnerable.png");
private static final TextureLocation witherTextures = new TextureLocation("textures/entity/wither/wither.png");
private int field_82419_a;
public RenderWither()
@ -28,7 +29,7 @@ public class RenderWither extends RenderLiving
super.doRenderLiving(par1EntityWither, par2, par4, par6, par8, par9);
}
protected ResourceLocation func_110911_a(EntityWither par1EntityWither)
protected TextureLocation func_110911_a(EntityWither par1EntityWither)
{
int var2 = par1EntityWither.func_82212_n();
return var2 > 0 && (var2 > 80 || var2 / 5 % 2 != 1) ? invulnerableWitherTextures : witherTextures;
@ -136,7 +137,7 @@ public class RenderWither extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110911_a((EntityWither)par1Entity);
}

9
src/main/java/net/minecraft/src/RenderWitherSkull.java
View File

@ -1,12 +1,13 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderWitherSkull extends Render
{
private static final ResourceLocation invulnerableWitherTextures = new ResourceLocation("textures/entity/wither/wither_invulnerable.png");
private static final ResourceLocation witherTextures = new ResourceLocation("textures/entity/wither/wither.png");
private static final TextureLocation invulnerableWitherTextures = new TextureLocation("textures/entity/wither/wither_invulnerable.png");
private static final TextureLocation witherTextures = new TextureLocation("textures/entity/wither/wither.png");
/** The Skeleton's head model. */
private final ModelSkeletonHead skeletonHeadModel = new ModelSkeletonHead();
@ -44,7 +45,7 @@ public class RenderWitherSkull extends Render
GL11.glPopMatrix();
}
protected ResourceLocation func_110809_a(EntityWitherSkull par1EntityWitherSkull)
protected TextureLocation func_110809_a(EntityWitherSkull par1EntityWitherSkull)
{
return par1EntityWitherSkull.isInvulnerable() ? invulnerableWitherTextures : witherTextures;
}
@ -52,7 +53,7 @@ public class RenderWitherSkull extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110809_a((EntityWitherSkull)par1Entity);
}

13
src/main/java/net/minecraft/src/RenderWolf.java
View File

@ -1,13 +1,14 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
public class RenderWolf extends RenderLiving
{
private static final ResourceLocation wolfTextures = new ResourceLocation("textures/entity/wolf/wolf.png");
private static final ResourceLocation tamedWolfTextures = new ResourceLocation("textures/entity/wolf/wolf_tame.png");
private static final ResourceLocation anrgyWolfTextures = new ResourceLocation("textures/entity/wolf/wolf_angry.png");
private static final ResourceLocation wolfCollarTextures = new ResourceLocation("textures/entity/wolf/wolf_collar.png");
private static final TextureLocation wolfTextures = new TextureLocation("textures/entity/wolf/wolf.png");
private static final TextureLocation tamedWolfTextures = new TextureLocation("textures/entity/wolf/wolf_tame.png");
private static final TextureLocation anrgyWolfTextures = new TextureLocation("textures/entity/wolf/wolf_angry.png");
private static final TextureLocation wolfCollarTextures = new TextureLocation("textures/entity/wolf/wolf_collar.png");
public RenderWolf(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3)
{
@ -45,7 +46,7 @@ public class RenderWolf extends RenderLiving
}
}
protected ResourceLocation func_110914_a(EntityWolf par1EntityWolf)
protected TextureLocation func_110914_a(EntityWolf par1EntityWolf)
{
return par1EntityWolf.isTamed() ? tamedWolfTextures : (par1EntityWolf.isAngry() ? anrgyWolfTextures : wolfTextures);
}
@ -69,7 +70,7 @@ public class RenderWolf extends RenderLiving
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110914_a((EntityWolf)par1Entity);
}

8
src/main/java/net/minecraft/src/RenderXPOrb.java
View File

@ -1,11 +1,13 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class RenderXPOrb extends Render
{
private static final ResourceLocation experienceOrbTextures = new ResourceLocation("textures/entity/experience_orb.png");
private static final TextureLocation experienceOrbTextures = new TextureLocation("textures/entity/experience_orb.png");
public RenderXPOrb()
{
@ -58,7 +60,7 @@ public class RenderXPOrb extends Render
GL11.glPopMatrix();
}
protected ResourceLocation getExperienceOrbTextures(EntityXPOrb par1EntityXPOrb)
protected TextureLocation getExperienceOrbTextures(EntityXPOrb par1EntityXPOrb)
{
return experienceOrbTextures;
}
@ -66,7 +68,7 @@ public class RenderXPOrb extends Render
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.getExperienceOrbTextures((EntityXPOrb)par1Entity);
}

14
src/main/java/net/minecraft/src/RenderZombie.java
View File

@ -1,10 +1,12 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderZombie extends RenderBiped
{
private static final ResourceLocation zombiePigmanTextures = new ResourceLocation("textures/entity/zombie_pigman.png");
private static final ResourceLocation zombieTextures = new ResourceLocation("textures/entity/zombie/zombie.png");
private static final ResourceLocation zombieVillagerTextures = new ResourceLocation("textures/entity/zombie/zombie_villager.png");
private static final TextureLocation zombiePigmanTextures = new TextureLocation("textures/entity/zombie_pigman.png");
private static final TextureLocation zombieTextures = new TextureLocation("textures/entity/zombie/zombie.png");
private static final TextureLocation zombieVillagerTextures = new TextureLocation("textures/entity/zombie/zombie_villager.png");
private ModelBiped field_82434_o;
private ModelZombieVillager zombieVillagerModel;
protected ModelBiped field_82437_k;
@ -42,7 +44,7 @@ public class RenderZombie extends RenderBiped
super.doRenderLiving(par1EntityZombie, par2, par4, par6, par8, par9);
}
protected ResourceLocation func_110863_a(EntityZombie par1EntityZombie)
protected TextureLocation func_110863_a(EntityZombie par1EntityZombie)
{
return par1EntityZombie instanceof EntityPigZombie ? zombiePigmanTextures : (par1EntityZombie.isVillager() ? zombieVillagerTextures : zombieTextures);
}
@ -94,7 +96,7 @@ public class RenderZombie extends RenderBiped
this.func_82428_a((EntityZombie)par1EntityLiving, par2);
}
protected ResourceLocation func_110856_a(EntityLiving par1EntityLiving)
protected TextureLocation func_110856_a(EntityLiving par1EntityLiving)
{
return this.func_110863_a((EntityZombie)par1EntityLiving);
}
@ -135,7 +137,7 @@ public class RenderZombie extends RenderBiped
/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity par1Entity)
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110863_a((EntityZombie)par1Entity);
}

5
src/main/java/net/minecraft/src/RendererLivingEntity.java
View File

@ -1,12 +1,15 @@
package net.minecraft.src;
import java.util.Random;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public abstract class RendererLivingEntity extends Render
{
private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private static final TextureLocation RES_ITEM_GLINT = new TextureLocation("textures/misc/enchanted_item_glint.png");
protected ModelBase mainModel;
/** The model to be used during the render passes. */

6
src/main/java/net/minecraft/src/ResourceManager.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import java.io.IOException;
import java.util.List;
import java.util.Set;
@ -8,7 +10,7 @@ public interface ResourceManager
{
Set getResourceDomains();
Resource getResource(ResourceLocation var1) throws IOException;
Resource getResource(TextureLocation var1) throws IOException;
List getAllResources(ResourceLocation var1) throws IOException;
List getAllResources(TextureLocation var1) throws IOException;
}

6
src/main/java/net/minecraft/src/ResourcePack.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
@ -7,9 +9,9 @@ import java.util.Set;
public interface ResourcePack
{
InputStream getInputStream(ResourceLocation var1) throws IOException;
InputStream getInputStream(TextureLocation var1) throws IOException;
boolean resourceExists(ResourceLocation var1);
boolean resourceExists(TextureLocation var1);
Set getResourceDomains();

2
src/main/java/net/minecraft/src/ResourcePackRepositoryEntry.java
View File

@ -12,7 +12,7 @@ public class ResourcePackRepositoryEntry
private ResourcePack reResourcePack;
private PackMetadataSection rePackMetadataSection;
private BufferedImage texturePackIcon;
private ResourceLocation locationTexturePackIcon;
private TextureLocation locationTexturePackIcon;
final ResourcePackRepository reResourcePackRepository;

1
src/main/java/net/minecraft/src/SelectionListBase.java
View File

@ -1,5 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;

19
src/main/java/net/minecraft/src/ServerConfigurationManager.java
View File

@ -327,14 +327,8 @@ public abstract class ServerConfigurationManager
Object var6;
if (this.mcServer.isDemo())
{
var6 = new DemoWorldManager(this.mcServer.worldServerForDimension(0));
}
else
{
var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(0));
}
var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(0));
return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), par1Str, (ItemInWorldManager)var6);
}
@ -356,14 +350,7 @@ public abstract class ServerConfigurationManager
par1EntityPlayerMP.dimension = par2;
Object var6;
if (this.mcServer.isDemo())
{
var6 = new DemoWorldManager(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension));
}
else
{
var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension));
}
var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension));
EntityPlayerMP var7 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.getCommandSenderName(), (ItemInWorldManager)var6);
var7.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler;

16
src/main/java/net/minecraft/src/SimpleReloadableResourceManager.java
View File

@ -48,31 +48,31 @@ public class SimpleReloadableResourceManager implements ReloadableResourceManage
return this.setResourceDomains;
}
public Resource getResource(ResourceLocation par1ResourceLocation) throws IOException
public Resource getResource(TextureLocation par1TextureLocation) throws IOException
{
ResourceManager var2 = (ResourceManager)this.domainResourceManagers.get(par1ResourceLocation.getResourceDomain());
ResourceManager var2 = (ResourceManager)this.domainResourceManagers.get(par1TextureLocation.getResourceDomain());
if (var2 != null)
{
return var2.getResource(par1ResourceLocation);
return var2.getResource(par1TextureLocation);
}
else
{
throw new FileNotFoundException(par1ResourceLocation.toString());
throw new FileNotFoundException(par1TextureLocation.toString());
}
}
public List getAllResources(ResourceLocation par1ResourceLocation) throws IOException
public List getAllResources(TextureLocation par1TextureLocation) throws IOException
{
ResourceManager var2 = (ResourceManager)this.domainResourceManagers.get(par1ResourceLocation.getResourceDomain());
ResourceManager var2 = (ResourceManager)this.domainResourceManagers.get(par1TextureLocation.getResourceDomain());
if (var2 != null)
{
return var2.getAllResources(par1ResourceLocation);
return var2.getAllResources(par1TextureLocation);
}
else
{
throw new FileNotFoundException(par1ResourceLocation.toString());
throw new FileNotFoundException(par1TextureLocation.toString());
}
}

12
src/main/java/net/minecraft/src/SimpleResource.java
View File

@ -7,21 +7,23 @@ import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Map;
import net.lax1dude.eaglercraft.TextureLocation;
import org.apache.commons.io.IOUtils;
public class SimpleResource implements Resource
{
private final Map mapMetadataSections = Maps.newHashMap();
private final ResourceLocation srResourceLocation;
private final TextureLocation srTextureLocation;
private final InputStream resourceInputStream;
private final InputStream mcmetaInputStream;
private final MetadataSerializer srMetadataSerializer;
private boolean mcmetaJsonChecked;
private JsonObject mcmetaJson;
public SimpleResource(ResourceLocation par1ResourceLocation, InputStream par2InputStream, InputStream par3InputStream, MetadataSerializer par4MetadataSerializer)
public SimpleResource(TextureLocation par1TextureLocation, InputStream par2InputStream, InputStream par3InputStream, MetadataSerializer par4MetadataSerializer)
{
this.srResourceLocation = par1ResourceLocation;
this.srTextureLocation = par1TextureLocation;
this.resourceInputStream = par2InputStream;
this.mcmetaInputStream = par3InputStream;
this.srMetadataSerializer = par4MetadataSerializer;
@ -81,7 +83,7 @@ public class SimpleResource implements Resource
else if (par1Obj instanceof SimpleResource)
{
SimpleResource var2 = (SimpleResource)par1Obj;
return this.srResourceLocation != null ? this.srResourceLocation.equals(var2.srResourceLocation) : var2.srResourceLocation == null;
return this.srTextureLocation != null ? this.srTextureLocation.equals(var2.srTextureLocation) : var2.srTextureLocation == null;
}
else
{
@ -91,6 +93,6 @@ public class SimpleResource implements Resource
public int hashCode()
{
return this.srResourceLocation == null ? 0 : this.srResourceLocation.hashCode();
return this.srTextureLocation == null ? 0 : this.srTextureLocation.hashCode();
}
}

6
src/main/java/net/minecraft/src/SimpleTexture.java
View File

@ -7,11 +7,11 @@ import javax.imageio.ImageIO;
public class SimpleTexture extends AbstractTexture
{
private final ResourceLocation textureLocation;
private final TextureLocation textureLocation;
public SimpleTexture(ResourceLocation par1ResourceLocation)
public SimpleTexture(TextureLocation par1TextureLocation)
{
this.textureLocation = par1ResourceLocation;
this.textureLocation = par1TextureLocation;
}
public void loadTexture(ResourceManager par1ResourceManager) throws IOException

4
src/main/java/net/minecraft/src/SoundPool.java
View File

@ -2,6 +2,8 @@ package net.minecraft.src;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.lax1dude.eaglercraft.TextureLocation;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@ -67,7 +69,7 @@ public class SoundPool
private URL func_110654_c(String par1Str) throws MalformedURLException
{
ResourceLocation var2 = new ResourceLocation(par1Str);
TextureLocation var2 = new TextureLocation(par1Str);
String var3 = String.format("%s:%s:%s/%s", new Object[] {"mcsounddomain", var2.getResourceDomain(), this.soundType, var2.getResourcePath()});
SoundPoolProtocolHandler var4 = new SoundPoolProtocolHandler(this);
return new URL((URL)null, var3, var4);

6
src/main/java/net/minecraft/src/SoundPoolURLConnection.java
View File

@ -1,12 +1,14 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
class SoundPoolURLConnection extends URLConnection
{
private final ResourceLocation field_110659_b;
private final TextureLocation field_110659_b;
final SoundPool theSoundPool;
@ -14,7 +16,7 @@ class SoundPoolURLConnection extends URLConnection
{
super(par2URL);
this.theSoundPool = par1SoundPool;
this.field_110659_b = new ResourceLocation(par2URL.getPath());
this.field_110659_b = new TextureLocation(par2URL.getPath());
}
public void connect() {}

6
src/main/java/net/minecraft/src/TextureUtil.java
View File

@ -4,6 +4,8 @@ import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.IntBuffer;
import javax.imageio.ImageIO;
import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -137,9 +139,9 @@ public class TextureUtil
GL11.glBindTexture(GL11.GL_TEXTURE_2D, par0);
}
public static int[] readImageData(ResourceManager par0ResourceManager, ResourceLocation par1ResourceLocation) throws IOException
public static int[] readImageData(ResourceManager par0ResourceManager, TextureLocation par1TextureLocation) throws IOException
{
BufferedImage var2 = ImageIO.read(par0ResourceManager.getResource(par1ResourceLocation).getInputStream());
BufferedImage var2 = ImageIO.read(par0ResourceManager.getResource(par1TextureLocation).getInputStream());
int var3 = var2.getWidth();
int var4 = var2.getHeight();
int[] var5 = new int[var3 * var4];

2
src/main/java/net/minecraft/src/TexturedQuad.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator;
public class TexturedQuad
{
public PositionTextureVertex[] vertexPositions;

Some files were not shown because too many files have changed in this diff Show More