catfoolyou/Project164
1
0
Fork 0
mirror of https://github.com/catfoolyou/Project164.git synced 2025-06-12 10:04:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix water rendering bug

Browse Source
This commit is contained in:
catfoolyou 2025-02-28 12:59:26 -05:00
parent 0fd1510cbf
commit 3f7df728c9
76 changed files with 102 additions and 1841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

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

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

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

@ -11,9 +11,6 @@ import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.CallableIsServerModded;
import net.minecraft.src.CallableServerMemoryStats;
import net.minecraft.src.CallableServerProfiler;
import net.minecraft.src.ChunkCoordinates; import net.minecraft.src.ChunkCoordinates;
import net.minecraft.src.CommandBase; import net.minecraft.src.CommandBase;
import net.minecraft.src.ConvertingProgressUpdate; import net.minecraft.src.ConvertingProgressUpdate;
@ -817,18 +814,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
*/ */
public CrashReport addServerInfoToCrashReport(CrashReport par1CrashReport) public CrashReport addServerInfoToCrashReport(CrashReport par1CrashReport)
{ {
par1CrashReport.getCategory().addCrashSectionCallable("Profiler Position", new CallableIsServerModded(this));
if (this.worldServers != null && this.worldServers.length > 0 && this.worldServers[0] != null)
{
par1CrashReport.getCategory().addCrashSectionCallable("Vec3 Pool Size", new CallableServerProfiler(this));
}
if (this.serverConfigManager != null)
{
par1CrashReport.getCategory().addCrashSectionCallable("Player Count", new CallableServerMemoryStats(this));
}
return par1CrashReport; return par1CrashReport;
} }

31
src/main/java/net/minecraft/src/CallableBlockDataValue.java
View File

@ -1,31 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
final class CallableBlockDataValue implements Callable
{
final int field_85063_a;
CallableBlockDataValue(int par1)
{
this.field_85063_a = par1;
}
public String callBlockDataValue()
{
if (this.field_85063_a < 0)
{
return "Unknown? (Got " + this.field_85063_a + ")";
}
else
{
String var1 = String.format("%4s", new Object[] {Integer.toBinaryString(this.field_85063_a)}).replace(" ", "0");
return String.format("%1$d / 0x%1$X / 0b%2$s", new Object[] {Integer.valueOf(this.field_85063_a), var1});
}
}
public Object call()
{
return this.callBlockDataValue();
}
}

29
src/main/java/net/minecraft/src/CallableBlockLocation.java
View File

@ -1,29 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
final class CallableBlockLocation implements Callable
{
final int blockXCoord;
final int blockYCoord;
final int blockZCoord;
CallableBlockLocation(int par1, int par2, int par3)
{
this.blockXCoord = par1;
this.blockYCoord = par2;
this.blockZCoord = par3;
}
public String callBlockLocationInfo()
{
return CrashReportCategory.getLocationInfo(this.blockXCoord, this.blockYCoord, this.blockZCoord);
}
public Object call()
{
return this.callBlockLocationInfo();
}
}

30
src/main/java/net/minecraft/src/CallableBlockType.java
View File

@ -1,30 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
final class CallableBlockType implements Callable
{
final int blockID;
CallableBlockType(int par1)
{
this.blockID = par1;
}
public String callBlockType()
{
try
{
return String.format("ID #%d (%s // %s)", new Object[] {Integer.valueOf(this.blockID), Block.blocksList[this.blockID].getUnlocalizedName(), Block.blocksList[this.blockID].getClass().getCanonicalName()});
}
catch (Throwable var2)
{
return "ID #" + this.blockID;
}
}
public Object call()
{
return this.callBlockType();
}
}

29
src/main/java/net/minecraft/src/CallableChunkPosHash.java
View File

@ -1,29 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableChunkPosHash implements Callable
{
final int field_85165_a;
final int field_85163_b;
final MapGenStructure theMapStructureGenerator;
CallableChunkPosHash(MapGenStructure par1MapGenStructure, int par2, int par3)
{
this.theMapStructureGenerator = par1MapGenStructure;
this.field_85165_a = par2;
this.field_85163_b = par3;
}
public String callChunkPositionHash()
{
return String.valueOf(ChunkCoordIntPair.chunkXZ2Int(this.field_85165_a, this.field_85163_b));
}
public Object call()
{
return this.callChunkPositionHash();
}
}

23
src/main/java/net/minecraft/src/CallableClientMemoryStats.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableClientMemoryStats implements Callable
{
final Minecraft theMinecraft;
CallableClientMemoryStats(Minecraft par1Minecraft)
{
this.theMinecraft = par1Minecraft;
}
public String callClientMemoryStats()
{
return this.theMinecraft.mcProfiler.profilingEnabled ? this.theMinecraft.mcProfiler.getNameOfLastSection() : "N/A (disabled)";
}
public Object call()
{
return this.callClientMemoryStats();
}
}

23
src/main/java/net/minecraft/src/CallableClientProfiler.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableClientProfiler implements Callable
{
final Minecraft theMinecraft;
CallableClientProfiler(Minecraft par1Minecraft)
{
this.theMinecraft = par1Minecraft;
}
public String callClientProfilerInfo()
{
return "en_US";
}
public Object call()
{
return this.callClientProfilerInfo();
}
}

32
src/main/java/net/minecraft/src/CallableCrashMemoryReport.java
View File

@ -1,32 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableCrashMemoryReport implements Callable
{
final CrashReport theCrashReport;
CallableCrashMemoryReport(CrashReport par1CrashReport)
{
this.theCrashReport = par1CrashReport;
}
/**
* Returns a string with allocated and used memory.
*/
public String getMemoryReport()
{
int var1 = AxisAlignedBB.getAABBPool().getlistAABBsize();
int var2 = 56 * var1;
int var3 = var2 / 1024 / 1024;
int var4 = AxisAlignedBB.getAABBPool().getnextPoolIndex();
int var5 = 56 * var4;
int var6 = var5 / 1024 / 1024;
return var1 + " (" + var2 + " bytes; " + var3 + " MB) allocated, " + var4 + " (" + var5 + " bytes; " + var6 + " MB) used";
}
public Object call()
{
return this.getMemoryReport();
}
}

23
src/main/java/net/minecraft/src/CallableEntityName.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableEntityName implements Callable
{
final Entity theEntity;
CallableEntityName(Entity par1Entity)
{
this.theEntity = par1Entity;
}
public String callEntityName()
{
return this.theEntity.getEntityName();
}
public Object call()
{
return this.callEntityName();
}
}

33
src/main/java/net/minecraft/src/CallableEntityTracker.java
View File

@ -1,33 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableEntityTracker implements Callable
{
final int field_96570_a;
final EntityTracker theEntityTracker;
CallableEntityTracker(EntityTracker par1EntityTracker, int par2)
{
this.theEntityTracker = par1EntityTracker;
this.field_96570_a = par2;
}
public String func_96568_a()
{
String var1 = "Once per " + this.field_96570_a + " ticks";
if (this.field_96570_a == Integer.MAX_VALUE)
{
var1 = "Maximum (" + var1 + ")";
}
return var1;
}
public Object call()
{
return this.func_96568_a();
}
}

23
src/main/java/net/minecraft/src/CallableEntityType.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableEntityType implements Callable
{
final Entity theEntity;
CallableEntityType(Entity par1Entity)
{
this.theEntity = par1Entity;
}
public String callEntityType()
{
return EntityList.getEntityString(this.theEntity) + " (" + this.theEntity.getClass().getCanonicalName() + ")";
}
public Object call()
{
return this.callEntityType();
}
}

25
src/main/java/net/minecraft/src/CallableGLInfo.java
View File

@ -1,25 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import net.lax1dude.eaglercraft.EaglerAdapter;
class CallableGLInfo implements Callable
{
/** The Minecraft instance. */
final Minecraft mc;
CallableGLInfo(Minecraft par1Minecraft)
{
this.mc = par1Minecraft;
}
public String getTexturePack()
{
return "GL_SHADING_LANGUAGE_VERSION = 35724 and GL_VERSION = 7938";
}
public Object call()
{
return this.getTexturePack();
}
}

23
src/main/java/net/minecraft/src/CallableIntCache.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableIntCache implements Callable
{
final CrashReport theCrashReport;
CallableIntCache(CrashReport par1CrashReport)
{
this.theCrashReport = par1CrashReport;
}
public String func_85083_a()
{
return IntCache.func_85144_b();
}
public Object call()
{
return this.func_85083_a();
}
}

29
src/main/java/net/minecraft/src/CallableIsFeatureChunk.java
View File

@ -1,29 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableIsFeatureChunk implements Callable
{
final int field_85169_a;
final int field_85167_b;
final MapGenStructure theMapStructureGenerator;
CallableIsFeatureChunk(MapGenStructure par1MapGenStructure, int par2, int par3)
{
this.theMapStructureGenerator = par1MapGenStructure;
this.field_85169_a = par2;
this.field_85167_b = par3;
}
public String func_85166_a()
{
return this.theMapStructureGenerator.canSpawnStructureAtCoords(this.field_85169_a, this.field_85167_b) ? "True" : "False";
}
public Object call()
{
return this.func_85166_a();
}
}

25
src/main/java/net/minecraft/src/CallableIsServerModded.java
View File

@ -1,25 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import net.minecraft.server.MinecraftServer;
public class CallableIsServerModded implements Callable
{
/** Reference to the MinecraftServer object. */
final MinecraftServer mcServer;
public CallableIsServerModded(MinecraftServer par1MinecraftServer)
{
this.mcServer = par1MinecraftServer;
}
public String func_96558_a()
{
return this.mcServer.theProfiler.profilingEnabled ? this.mcServer.theProfiler.getNameOfLastSection() : "N/A (disabled)";
}
public Object call()
{
return this.func_96558_a();
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableItemName implements Callable
{
final ItemStack theItemStack;
final InventoryPlayer playerInventory;
CallableItemName(InventoryPlayer par1InventoryPlayer, ItemStack par2ItemStack)
{
this.playerInventory = par1InventoryPlayer;
this.theItemStack = par2ItemStack;
}
public String callItemDisplayName()
{
return this.theItemStack.getDisplayName();
}
public Object call()
{
return this.callItemDisplayName();
}
}

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

@ -1,24 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLaunchedVersion implements Callable
{
/** Reference to the Minecraft object. */
final Minecraft mc;
CallableLaunchedVersion(Minecraft par1Minecraft)
{
this.mc = par1Minecraft;
}
public String getLWJGLVersion()
{
return Minecraft.getLaunchedVersion(this.mc);
}
public Object call()
{
return this.getLWJGLVersion();
}
}

23
src/main/java/net/minecraft/src/CallableLevelDimension.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelDimension implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelDimension(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelDimension()
{
return String.valueOf(WorldInfo.func_85122_i(this.worldInfoInstance));
}
public Object call()
{
return this.callLevelDimension();
}
}

23
src/main/java/net/minecraft/src/CallableLevelGamemode.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelGamemode implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelGamemode(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelGameModeInfo()
{
return String.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", new Object[] {WorldInfo.getGameType(this.worldInfoInstance).getName(), Integer.valueOf(WorldInfo.getGameType(this.worldInfoInstance).getID()), Boolean.valueOf(WorldInfo.func_85117_p(this.worldInfoInstance)), Boolean.valueOf(WorldInfo.func_85131_q(this.worldInfoInstance))});
}
public Object call()
{
return this.callLevelGameModeInfo();
}
}

23
src/main/java/net/minecraft/src/CallableLevelGenerator.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelGenerator implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelGenerator(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelGeneratorInfo()
{
return String.format("ID %02d - %s, ver %d. Features enabled: %b", new Object[] {Integer.valueOf(WorldInfo.getTerrainTypeOfWorld(this.worldInfoInstance).getWorldTypeID()), WorldInfo.getTerrainTypeOfWorld(this.worldInfoInstance).getWorldTypeName(), Integer.valueOf(WorldInfo.getTerrainTypeOfWorld(this.worldInfoInstance).getGeneratorVersion()), Boolean.valueOf(WorldInfo.getMapFeaturesEnabled(this.worldInfoInstance))});
}
public Object call()
{
return this.callLevelGeneratorInfo();
}
}

23
src/main/java/net/minecraft/src/CallableLevelGeneratorOptions.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelGeneratorOptions implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelGeneratorOptions(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelGeneratorOptions()
{
return WorldInfo.getWorldGeneratorOptions(this.worldInfoInstance);
}
public Object call()
{
return this.callLevelGeneratorOptions();
}
}

23
src/main/java/net/minecraft/src/CallableLevelSeed.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelSeed implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelSeed(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelSeed()
{
return String.valueOf(this.worldInfoInstance.getSeed());
}
public Object call()
{
return this.callLevelSeed();
}
}

23
src/main/java/net/minecraft/src/CallableLevelSpawnLocation.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelSpawnLocation implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelSpawnLocation(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelSpawnLocation()
{
return CrashReportCategory.getLocationInfo(WorldInfo.getSpawnXCoordinate(this.worldInfoInstance), WorldInfo.getSpawnYCoordinate(this.worldInfoInstance), WorldInfo.getSpawnZCoordinate(this.worldInfoInstance));
}
public Object call()
{
return this.callLevelSpawnLocation();
}
}

42
src/main/java/net/minecraft/src/CallableLevelStorageVersion.java
View File

@ -1,42 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelStorageVersion implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelStorageVersion(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelStorageFormat()
{
String var1 = "Unknown?";
try
{
switch (WorldInfo.getSaveVersion(this.worldInfoInstance))
{
case 19132:
var1 = "McRegion";
break;
case 19133:
var1 = "Anvil";
}
}
catch (Throwable var3)
{
;
}
return String.format("0x%05X - %s", new Object[] {Integer.valueOf(WorldInfo.getSaveVersion(this.worldInfoInstance)), var1});
}
public Object call()
{
return this.callLevelStorageFormat();
}
}

23
src/main/java/net/minecraft/src/CallableLevelTime.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelTime implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelTime(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelTime()
{
return String.format("%d game time, %d day time", new Object[] {Long.valueOf(WorldInfo.func_85126_g(this.worldInfoInstance)), Long.valueOf(WorldInfo.getWorldTime(this.worldInfoInstance))});
}
public Object call()
{
return this.callLevelTime();
}
}

23
src/main/java/net/minecraft/src/CallableLevelWeather.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLevelWeather implements Callable
{
final WorldInfo worldInfoInstance;
CallableLevelWeather(WorldInfo par1WorldInfo)
{
this.worldInfoInstance = par1WorldInfo;
}
public String callLevelWeatherInfo()
{
return String.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", new Object[] {Integer.valueOf(WorldInfo.getRainTime(this.worldInfoInstance)), Boolean.valueOf(WorldInfo.getRaining(this.worldInfoInstance)), Integer.valueOf(WorldInfo.getThunderTime(this.worldInfoInstance)), Boolean.valueOf(WorldInfo.getThundering(this.worldInfoInstance))});
}
public Object call()
{
return this.callLevelWeatherInfo();
}
}

34
src/main/java/net/minecraft/src/CallableLvl1.java
View File

@ -1,34 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLvl1 implements Callable
{
final int field_85179_a;
/** Reference to the World object. */
final World theWorld;
CallableLvl1(World par1World, int par2)
{
this.theWorld = par1World;
this.field_85179_a = par2;
}
public String getWorldEntitiesAsString()
{
try
{
return String.format("ID #%d (%s // %s)", new Object[] {Integer.valueOf(this.field_85179_a), Block.blocksList[this.field_85179_a].getUnlocalizedName(), Block.blocksList[this.field_85179_a].getClass().getCanonicalName()});
}
catch (Throwable var2)
{
return "ID #" + this.field_85179_a;
}
}
public Object call()
{
return this.getWorldEntitiesAsString();
}
}

27
src/main/java/net/minecraft/src/CallableLvl2.java
View File

@ -1,27 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLvl2 implements Callable
{
/** Reference to the World object. */
final World theWorld;
CallableLvl2(World par1World)
{
this.theWorld = par1World;
}
/**
* Returns the size and contents of the player entity list.
*/
public String getPlayerEntities()
{
return this.theWorld.playerEntities.size() + " total; " + this.theWorld.playerEntities.toString();
}
public Object call()
{
return this.getPlayerEntities();
}
}

27
src/main/java/net/minecraft/src/CallableLvl3.java
View File

@ -1,27 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableLvl3 implements Callable
{
/** Reference to the World object. */
final World theWorld;
CallableLvl3(World par1World)
{
this.theWorld = par1World;
}
/**
* Returns the result of the ChunkProvider's makeString
*/
public String getChunkProvider()
{
return this.theWorld.chunkProvider.makeString();
}
public Object call()
{
return this.getChunkProvider();
}
}

27
src/main/java/net/minecraft/src/CallableMPL1.java
View File

@ -1,27 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableMPL1 implements Callable
{
/** Reference to the WorldClient object. */
final WorldClient theWorldClient;
CallableMPL1(WorldClient par1WorldClient)
{
this.theWorldClient = par1WorldClient;
}
/**
* Returns the size and contents of the entity list.
*/
public String getEntityCountAndList()
{
return WorldClient.getEntityList(this.theWorldClient).size() + " total; " + WorldClient.getEntityList(this.theWorldClient).toString();
}
public Object call()
{
return this.getEntityCountAndList();
}
}

27
src/main/java/net/minecraft/src/CallableMPL2.java
View File

@ -1,27 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableMPL2 implements Callable
{
/** Reference to the WorldClient object. */
final WorldClient theWorldClient;
CallableMPL2(WorldClient par1WorldClient)
{
this.theWorldClient = par1WorldClient;
}
/**
* Returns the size and contents of the entity spawn queue.
*/
public String getEntitySpawnQueueCountAndList()
{
return WorldClient.getEntitySpawnQueue(this.theWorldClient).size() + " total; " + WorldClient.getEntitySpawnQueue(this.theWorldClient).toString();
}
public Object call()
{
return this.getEntitySpawnQueueCountAndList();
}
}

27
src/main/java/net/minecraft/src/CallableMinecraftVersion.java
View File

@ -1,27 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableMinecraftVersion implements Callable
{
/** Reference to the CrashReport object. */
final CrashReport theCrashReport;
CallableMinecraftVersion(CrashReport par1CrashReport)
{
this.theCrashReport = par1CrashReport;
}
/**
* The current version of Minecraft
*/
public String minecraftVersion()
{
return "1.6.4";
}
public Object call()
{
return this.minecraftVersion();
}
}

29
src/main/java/net/minecraft/src/CallableModded.java
View File

@ -1,29 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import net.minecraft.client.ClientBrandRetriever;
class CallableModded implements Callable
{
/** Reference to the Minecraft object. */
final Minecraft mc;
CallableModded(Minecraft par1Minecraft)
{
this.mc = par1Minecraft;
}
/**
* Gets if Client Profiler (aka Snooper) is enabled.
*/
public String getClientProfilerEnabled()
{
String var1 = ClientBrandRetriever.getClientModName();
return !var1.equals("vanilla") ? "Definitely; Client brand changed to \'" + var1 + "\'" : (Minecraft.class.getSigners() == null ? "Very likely; Jar signature invalidated" : "Probably not. Jar signature remains and client brand is untouched.");
}
public Object call()
{
return this.getClientProfilerEnabled();
}
}

31
src/main/java/net/minecraft/src/CallableMouseLocation.java
View File

@ -1,31 +0,0 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import java.util.concurrent.Callable;
class CallableMouseLocation implements Callable
{
final int field_90026_a;
final int field_90024_b;
final EntityRenderer theEntityRenderer;
CallableMouseLocation(EntityRenderer par1EntityRenderer, int par2, int par3)
{
this.theEntityRenderer = par1EntityRenderer;
this.field_90026_a = par2;
this.field_90024_b = par3;
}
public String callMouseLocation()
{
return String.format("Scaled: (%d, %d). Absolute: (%d, %d)", new Object[] {Integer.valueOf(this.field_90026_a), Integer.valueOf(this.field_90024_b), Integer.valueOf(EaglerAdapter.mouseGetX()), Integer.valueOf(EaglerAdapter.mouseGetY())});
}
public Object call()
{
return this.callMouseLocation();
}
}

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

@ -1,24 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableOSInfo implements Callable
{
/** Reference to the CrashReport object. */
final CrashReport theCrashReport;
CallableOSInfo(CrashReport par1CrashReport)
{
this.theCrashReport = par1CrashReport;
}
public String getOsAsString()
{
return System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") version " + System.getProperty("os.version");
}
public Object call()
{
return this.getOsAsString();
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallablePacketClass implements Callable
{
final Packet thePacket;
final NetServerHandler theNetServerHandler;
CallablePacketClass(NetServerHandler par1NetServerHandler, Packet par2Packet)
{
this.theNetServerHandler = par1NetServerHandler;
this.thePacket = par2Packet;
}
public String getPacketClass()
{
return this.thePacket.getClass().getCanonicalName();
}
public Object call()
{
return this.getPacketClass();
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallablePacketID implements Callable
{
final Packet thePacket;
final NetServerHandler theNetServerHandler;
CallablePacketID(NetServerHandler par1NetServerHandler, Packet par2Packet)
{
this.theNetServerHandler = par1NetServerHandler;
this.thePacket = par2Packet;
}
public String callPacketID()
{
return String.valueOf(this.thePacket.getPacketId());
}
public Object call()
{
return this.callPacketID();
}
}

32
src/main/java/net/minecraft/src/CallableParticlePositionInfo.java
View File

@ -1,32 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableParticlePositionInfo implements Callable
{
final double posX;
final double posY;
final double posZ;
final RenderGlobal globalRenderer;
CallableParticlePositionInfo(RenderGlobal par1RenderGlobal, double par2, double par4, double par6)
{
this.globalRenderer = par1RenderGlobal;
this.posX = par2;
this.posY = par4;
this.posZ = par6;
}
public String callParticlePositionInfo()
{
return CrashReportCategory.func_85074_a(this.posX, this.posY, this.posZ);
}
public Object call()
{
return this.callParticlePositionInfo();
}
}

23
src/main/java/net/minecraft/src/CallableParticleScreenName.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableParticleScreenName implements Callable
{
final Minecraft theMinecraft;
CallableParticleScreenName(Minecraft par1Minecraft)
{
this.theMinecraft = par1Minecraft;
}
public String callParticleScreenName()
{
return this.theMinecraft.currentScreen.getClass().getCanonicalName();
}
public Object call()
{
return this.callParticleScreenName();
}
}

23
src/main/java/net/minecraft/src/CallableScreenName.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableScreenName implements Callable
{
final EntityRenderer entityRender;
CallableScreenName(EntityRenderer par1EntityRenderer)
{
this.entityRender = par1EntityRenderer;
}
public String callScreenName()
{
return EntityRenderer.getRendererMinecraft(this.entityRender).currentScreen.getClass().getCanonicalName();
}
public Object call()
{
return this.callScreenName();
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableScreenSize implements Callable
{
final ScaledResolution theScaledResolution;
final EntityRenderer theEntityRenderer;
CallableScreenSize(EntityRenderer par1EntityRenderer, ScaledResolution par2ScaledResolution)
{
this.theEntityRenderer = par1EntityRenderer;
this.theScaledResolution = par2ScaledResolution;
}
public String callScreenSize()
{
return String.format("Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %d", new Object[] {Integer.valueOf(this.theScaledResolution.getScaledWidth()), Integer.valueOf(this.theScaledResolution.getScaledHeight()), Integer.valueOf(EntityRenderer.getRendererMinecraft(this.theEntityRenderer).displayWidth), Integer.valueOf(EntityRenderer.getRendererMinecraft(this.theEntityRenderer).displayHeight), Integer.valueOf(this.theScaledResolution.getScaleFactor())});
}
public Object call()
{
return this.callScreenSize();
}
}

25
src/main/java/net/minecraft/src/CallableServerMemoryStats.java
View File

@ -1,25 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import net.minecraft.server.MinecraftServer;
public class CallableServerMemoryStats implements Callable
{
/** Reference to the MinecraftServer object. */
final MinecraftServer mcServer;
public CallableServerMemoryStats(MinecraftServer par1MinecraftServer)
{
this.mcServer = par1MinecraftServer;
}
public String callServerMemoryStats()
{
return MinecraftServer.getServerConfigurationManager(this.mcServer).getCurrentPlayerCount() + " / " + MinecraftServer.getServerConfigurationManager(this.mcServer).getMaxPlayers() + "; " + MinecraftServer.getServerConfigurationManager(this.mcServer).playerEntityList;
}
public Object call()
{
return this.callServerMemoryStats();
}
}

31
src/main/java/net/minecraft/src/CallableServerProfiler.java
View File

@ -1,31 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import net.minecraft.server.MinecraftServer;
public class CallableServerProfiler implements Callable
{
/** Reference to the MinecraftServer object. */
final MinecraftServer mcServer;
public CallableServerProfiler(MinecraftServer par1MinecraftServer)
{
this.mcServer = par1MinecraftServer;
}
public String callServerProfiler()
{
int var1 = this.mcServer.worldServers[0].getWorldVec3Pool().getPoolSize();
int var2 = 56 * var1;
int var3 = var2 / 1024 / 1024;
int var4 = this.mcServer.worldServers[0].getWorldVec3Pool().func_82590_d();
int var5 = 56 * var4;
int var6 = var5 / 1024 / 1024;
return var1 + " (" + var2 + " bytes; " + var3 + " MB) allocated, " + var4 + " (" + var5 + " bytes; " + var6 + " MB) used";
}
public Object call()
{
return this.callServerProfiler();
}
}

23
src/main/java/net/minecraft/src/CallableStructureType.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableStructureType implements Callable
{
final MapGenStructure theMapStructureGenerator;
CallableStructureType(MapGenStructure par1MapGenStructure)
{
this.theMapStructureGenerator = par1MapGenStructure;
}
public String callStructureType()
{
return this.theMapStructureGenerator.getClass().getCanonicalName();
}
public Object call()
{
return this.callStructureType();
}
}

142
src/main/java/net/minecraft/src/CallableSuspiciousClasses.java
View File

@ -1,142 +0,0 @@
package net.minecraft.src;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
import java.util.concurrent.Callable;
class CallableSuspiciousClasses implements Callable
{
final CrashReport theCrashReport;
CallableSuspiciousClasses(CrashReport par1CrashReport)
{
this.theCrashReport = par1CrashReport;
}
public String callSuspiciousClasses() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException
{
StringBuilder var1 = new StringBuilder();
ArrayList var3;
try
{
Field var2 = ClassLoader.class.getDeclaredField("classes");
var2.setAccessible(true);
var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
}
catch (Exception ex)
{
return "";
}
boolean var4 = true;
boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
HashMap var6 = new HashMap();
String var7 = "";
Collections.sort(var3, new ComparatorClassSorter(this));
Iterator var8 = var3.iterator();
while (var8.hasNext())
{
Class var9 = (Class)var8.next();
if (var9 != null)
{
String var10 = var9.getCanonicalName();
if (var10 != null && !var10.startsWith("org.lwjgl.") && !var10.startsWith("paulscode.") && !var10.startsWith("org.bouncycastle.") && !var10.startsWith("argo.") && !var10.startsWith("com.jcraft.") && !var10.startsWith("com.fasterxml.") && !var10.startsWith("com.google.") && !var10.startsWith("joptsimple.") && !var10.startsWith("org.apache.") && !var10.equals("util.GLX"))
{
if (var5)
{
if (var10.length() <= 3 || var10.equals("net.minecraft.client.main.Main") || var10.equals("net.minecraft.client.Minecraft") || var10.equals("net.minecraft.client.ClientBrandRetriever") || var10.equals("net.minecraft.server.MinecraftServer"))
{
continue;
}
}
else if (var10.startsWith("net.minecraft"))
{
continue;
}
Package var11 = var9.getPackage();
String var12 = var11 == null ? "" : var11.getName();
if (var6.containsKey(var12))
{
int var13 = ((Integer)var6.get(var12)).intValue();
var6.put(var12, Integer.valueOf(var13 + 1));
if (var13 == 3)
{
if (!var4)
{
var1.append(", ");
}
var1.append("...");
var4 = false;
continue;
}
if (var13 > 3)
{
continue;
}
}
else
{
var6.put(var12, Integer.valueOf(1));
}
if (!var7.equals(var12) && var7.length() > 0)
{
var1.append("], ");
}
if (!var4 && var7.equals(var12))
{
var1.append(", ");
}
if (!var7.equals(var12))
{
var1.append("[");
var1.append(var12);
var1.append(".");
}
var1.append(var9.getSimpleName());
var7 = var12;
var4 = false;
}
}
}
if (var4)
{
var1.append("No suspicious classes found.");
}
else
{
var1.append("]");
}
return var1.toString();
}
public Object call()
{
try
{
return this.callSuspiciousClasses();
}
catch (Exception ex)
{
return null;
}
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTagCompound1 implements Callable
{
final String field_82585_a;
final NBTTagCompound theNBTTagCompound;
CallableTagCompound1(NBTTagCompound par1NBTTagCompound, String par2Str)
{
this.theNBTTagCompound = par1NBTTagCompound;
this.field_82585_a = par2Str;
}
public String func_82583_a()
{
return NBTBase.NBTTypes[((NBTBase)NBTTagCompound.getTagMap(this.theNBTTagCompound).get(this.field_82585_a)).getId()];
}
public Object call()
{
return this.func_82583_a();
}
}

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

@ -1,26 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTagCompound2 implements Callable
{
final int field_82588_a;
final NBTTagCompound theNBTTagCompound;
CallableTagCompound2(NBTTagCompound par1NBTTagCompound, int par2)
{
this.theNBTTagCompound = par1NBTTagCompound;
this.field_82588_a = par2;
}
public String func_82586_a()
{
return NBTBase.NBTTypes[this.field_82588_a];
}
public Object call()
{
return this.func_82586_a();
}
}

23
src/main/java/net/minecraft/src/CallableTexturePack.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTexturePack implements Callable
{
final Minecraft theMinecraft;
CallableTexturePack(Minecraft par1Minecraft)
{
this.theMinecraft = par1Minecraft;
}
public String callTexturePack()
{
return this.theMinecraft.gameSettings.skin;
}
public Object call()
{
return this.callTexturePack();
}
}

33
src/main/java/net/minecraft/src/CallableTileEntityData.java
View File

@ -1,33 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTileEntityData implements Callable
{
final TileEntity theTileEntity;
CallableTileEntityData(TileEntity par1TileEntity)
{
this.theTileEntity = par1TileEntity;
}
public String callTileEntityDataInfo()
{
int var1 = this.theTileEntity.worldObj.getBlockMetadata(this.theTileEntity.xCoord, this.theTileEntity.yCoord, this.theTileEntity.zCoord);
if (var1 < 0)
{
return "Unknown? (Got " + var1 + ")";
}
else
{
String var2 = String.format("%4s", new Object[] {Integer.toBinaryString(var1)}).replace(" ", "0");
return String.format("%1$d / 0x%1$X / 0b%2$s", new Object[] {Integer.valueOf(var1), var2});
}
}
public Object call()
{
return this.callTileEntityDataInfo();
}
}

32
src/main/java/net/minecraft/src/CallableTileEntityID.java
View File

@ -1,32 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTileEntityID implements Callable
{
final TileEntity theTileEntity;
CallableTileEntityID(TileEntity par1TileEntity)
{
this.theTileEntity = par1TileEntity;
}
public String callTileEntityID()
{
int var1 = this.theTileEntity.worldObj.getBlockId(this.theTileEntity.xCoord, this.theTileEntity.yCoord, this.theTileEntity.zCoord);
try
{
return String.format("ID #%d (%s // %s)", new Object[] {Integer.valueOf(var1), Block.blocksList[var1].getUnlocalizedName(), Block.blocksList[var1].getClass().getCanonicalName()});
}
catch (Throwable var3)
{
return "ID #" + var1;
}
}
public Object call()
{
return this.callTileEntityID();
}
}

23
src/main/java/net/minecraft/src/CallableTileEntityName.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableTileEntityName implements Callable
{
final TileEntity theTileEntity;
CallableTileEntityName(TileEntity par1TileEntity)
{
this.theTileEntity = par1TileEntity;
}
public String callTileEntityName()
{
return (String)TileEntity.getClassToNameMap().get(this.theTileEntity.getClass()) + " // " + this.theTileEntity.getClass().getCanonicalName();
}
public Object call()
{
return this.callTileEntityName();
}
}

23
src/main/java/net/minecraft/src/CallableType2.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableType2 implements Callable
{
final Minecraft mc;
CallableType2(Minecraft par1Minecraft)
{
this.mc = par1Minecraft;
}
public String func_82886_a()
{
return "Client (map_client.txt)";
}
public Object call()
{
return this.func_82886_a();
}
}

23
src/main/java/net/minecraft/src/CallableUpdatingScreenName.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class CallableUpdatingScreenName implements Callable
{
final Minecraft theMinecraft;
CallableUpdatingScreenName(Minecraft par1Minecraft)
{
this.theMinecraft = par1Minecraft;
}
public String callUpdatingScreenName()
{
return this.theMinecraft.currentScreen.getClass().getCanonicalName();
}
public Object call()
{
return this.callUpdatingScreenName();
}
}

25
src/main/java/net/minecraft/src/ComparatorClassSorter.java
View File

@ -1,25 +0,0 @@
package net.minecraft.src;
import java.util.Comparator;
class ComparatorClassSorter implements Comparator
{
final CallableSuspiciousClasses theSuspiciousClasses;
ComparatorClassSorter(CallableSuspiciousClasses par1CallableSuspiciousClasses)
{
this.theSuspiciousClasses = par1CallableSuspiciousClasses;
}
public int func_85081_a(Class par1Class, Class par2Class)
{
String var3 = par1Class.getPackage() == null ? "" : par1Class.getPackage().getName();
String var4 = par2Class.getPackage() == null ? "" : par2Class.getPackage().getName();
return var3.compareTo(var4);
}
public int compare(Object par1Obj, Object par2Obj)
{
return this.func_85081_a((Class)par1Obj, (Class)par2Obj);
}
}

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

@ -41,15 +41,7 @@ public class CrashReport
*/ */
private void populateEnvironment() private void populateEnvironment()
{ {
this.field_85061_c.addCrashSectionCallable("Minecraft Version", new CallableMinecraftVersion(this));
this.field_85061_c.addCrashSectionCallable("Operating System", new CallableOSInfo(this));
//this.field_85061_c.addCrashSectionCallable("Java Version", new CallableJavaInfo(this));
//this.field_85061_c.addCrashSectionCallable("Java VM Version", new CallableJavaInfo2(this));
//this.field_85061_c.addCrashSectionCallable("Memory", new CallableMemoryInfo(this));
//this.field_85061_c.addCrashSectionCallable("JVM Flags", new CallableJVMFlags(this));
this.field_85061_c.addCrashSectionCallable("AABB Pool Size", new CallableCrashMemoryReport(this));
this.field_85061_c.addCrashSectionCallable("Suspicious classes", new CallableSuspiciousClasses(this));
this.field_85061_c.addCrashSectionCallable("IntCache", new CallableIntCache(this));
} }
/** /**

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

@ -203,8 +203,6 @@ public class CrashReportCategory
public static void addBlockCrashInfo(CrashReportCategory par0CrashReportCategory, int par1, int par2, int par3, int par4, int par5) public static void addBlockCrashInfo(CrashReportCategory par0CrashReportCategory, int par1, int par2, int par3, int par4, int par5)
{ {
par0CrashReportCategory.addCrashSectionCallable("Block type", new CallableBlockType(par4));
par0CrashReportCategory.addCrashSectionCallable("Block data value", new CallableBlockDataValue(par5));
par0CrashReportCategory.addCrashSectionCallable("Block location", new CallableBlockLocation(par1, par2, par3));
} }
} }

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

@ -2351,9 +2351,7 @@ public abstract class Entity
public void addEntityCrashInfo(CrashReportCategory par1CrashReportCategory) public void addEntityCrashInfo(CrashReportCategory par1CrashReportCategory)
{ {
par1CrashReportCategory.addCrashSectionCallable("Entity Type", new CallableEntityType(this));
par1CrashReportCategory.addCrashSection("Entity ID", Integer.valueOf(this.entityId)); par1CrashReportCategory.addCrashSection("Entity ID", Integer.valueOf(this.entityId));
par1CrashReportCategory.addCrashSectionCallable("Entity Name", new CallableEntityName(this));
par1CrashReportCategory.addCrashSection("Entity\'s Exact location", String.format("%.2f, %.2f, %.2f", new Object[] {Double.valueOf(this.posX), Double.valueOf(this.posY), Double.valueOf(this.posZ)})); par1CrashReportCategory.addCrashSection("Entity\'s Exact location", String.format("%.2f, %.2f, %.2f", new Object[] {Double.valueOf(this.posX), Double.valueOf(this.posY), Double.valueOf(this.posZ)}));
par1CrashReportCategory.addCrashSection("Entity\'s Block location", CrashReportCategory.getLocationInfo(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ))); par1CrashReportCategory.addCrashSection("Entity\'s Block location", CrashReportCategory.getLocationInfo(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)));
par1CrashReportCategory.addCrashSection("Entity\'s Momentum", String.format("%.2f, %.2f, %.2f", new Object[] {Double.valueOf(this.motionX), Double.valueOf(this.motionY), Double.valueOf(this.motionZ)})); par1CrashReportCategory.addCrashSection("Entity\'s Momentum", String.format("%.2f, %.2f, %.2f", new Object[] {Double.valueOf(this.motionX), Double.valueOf(this.motionY), Double.valueOf(this.motionZ)}));

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

@ -1042,9 +1042,6 @@ public class EntityRenderer
{ {
CrashReport var10 = CrashReport.makeCrashReport(var12, "Rendering screen"); CrashReport var10 = CrashReport.makeCrashReport(var12, "Rendering screen");
CrashReportCategory var11 = var10.makeCategory("Screen render details"); CrashReportCategory var11 = var10.makeCategory("Screen render details");
var11.addCrashSectionCallable("Screen name", new CallableScreenName(this));
var11.addCrashSectionCallable("Mouse location", new CallableMouseLocation(this, var16, var17));
var11.addCrashSectionCallable("Screen size", new CallableScreenSize(this, var13));
throw new ReportedException(var10); throw new ReportedException(var10);
} }
} }
@ -1157,7 +1154,7 @@ public class EntityRenderer
if (this.debugViewDirection == 0) if (this.debugViewDirection == 0)
{ {
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting2();
this.mc.mcProfiler.endStartSection("entities"); this.mc.mcProfiler.endStartSection("entities");
var5.renderEntities(var4.getPosition(par1), var14, par1); var5.renderEntities(var4.getPosition(par1), var14, par1);
this.enableLightmap((double)par1); this.enableLightmap((double)par1);
@ -1188,15 +1185,8 @@ public class EntityRenderer
EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE);
TextureMap.locationBlocksTexture.bindTexture(); TextureMap.locationBlocksTexture.bindTexture();
if (this.mc.gameSettings.fancyGraphics) //if (this.mc.gameSettings.fancyGraphics)
{ //{
this.mc.mcProfiler.endStartSection("water");
if (this.mc.gameSettings.ambientOcclusion != 0)
{
EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH);
}
EaglerAdapter.glColorMask(false, false, false, false); EaglerAdapter.glColorMask(false, false, false, false);
int var18 = var5.sortAndRender(var4, 1, (double)par1); int var18 = var5.sortAndRender(var4, 1, (double)par1);
@ -1218,16 +1208,21 @@ public class EntityRenderer
if (var18 > 0) if (var18 > 0)
{ {
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL);
var5.renderAllRenderLists(1, (double)par1); var5.renderAllRenderLists(1, (double)par1);
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
} }
EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); //EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT);
} //}
else //else
{ //{
this.mc.mcProfiler.endStartSection("water"); // this.mc.mcProfiler.endStartSection("water");
var5.sortAndRender(var4, 1, (double)par1); var5.sortAndRender(var4, 1, (double)par1);
} //}
EaglerAdapter.glTexParameterf(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MAX_ANISOTROPY, 1.0f);
EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MIN_FILTER, EaglerAdapter.GL_NEAREST_MIPMAP_LINEAR);
EaglerAdapter.glDepthMask(true); EaglerAdapter.glDepthMask(true);
EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE);

20
src/main/java/net/minecraft/src/EntityTracker.java
View File

@ -166,25 +166,9 @@ public class EntityTracker
this.trackedEntityIDs.addKey(par1Entity.entityId, var5); this.trackedEntityIDs.addKey(par1Entity.entityId, var5);
var5.sendEventsToPlayers(this.theWorld.playerEntities); var5.sendEventsToPlayers(this.theWorld.playerEntities);
} }
catch (Throwable var11) catch (Exception var10)
{ {
CrashReport var6 = CrashReport.makeCrashReport(var11, "Adding entity to track"); var10.printStackTrace();
CrashReportCategory var7 = var6.makeCategory("Entity To Track");
var7.addCrashSection("Tracking range", par2 + " blocks");
var7.addCrashSectionCallable("Update interval", new CallableEntityTracker(this, par3));
par1Entity.addEntityCrashInfo(var7);
CrashReportCategory var8 = var6.makeCategory("Entity That Is Already Tracked");
((EntityTrackerEntry)this.trackedEntityIDs.lookup(par1Entity.entityId)).myEntity.addEntityCrashInfo(var8);
try
{
throw new ReportedException(var6);
}
catch (ReportedException var10)
{
System.err.println("\"Silently\" catching entity tracking error.");
var10.printStackTrace();
}
} }
} }

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

@ -438,7 +438,6 @@ public class InventoryPlayer implements IInventory
CrashReportCategory var4 = var3.makeCategory("Item being added"); CrashReportCategory var4 = var3.makeCategory("Item being added");
var4.addCrashSection("Item ID", Integer.valueOf(par1ItemStack.itemID)); var4.addCrashSection("Item ID", Integer.valueOf(par1ItemStack.itemID));
var4.addCrashSection("Item data", Integer.valueOf(par1ItemStack.getItemDamage())); var4.addCrashSection("Item data", Integer.valueOf(par1ItemStack.getItemDamage()));
var4.addCrashSectionCallable("Item name", new CallableItemName(this, par1ItemStack));
throw new ReportedException(var3); throw new ReportedException(var3);
} }
} }

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

@ -1,22 +0,0 @@
package net.minecraft.src;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
public final class MainProxyAuthenticator extends Authenticator
{
final String field_111237_a;
final String field_111236_b;
public MainProxyAuthenticator(String par1Str, String par2Str)
{
this.field_111237_a = par1Str;
this.field_111236_b = par2Str;
}
protected PasswordAuthentication getPasswordAuthentication()
{
return new PasswordAuthentication(this.field_111237_a, this.field_111236_b.toCharArray());
}
}

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

@ -1,9 +0,0 @@
package net.minecraft.src;
public final class MainShutdownHook extends Thread
{
public void run()
{
Minecraft.stopIntegratedServer();
}
}

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

@ -39,15 +39,9 @@ public abstract class MapGenStructure extends MapGenBase
this.func_143026_a(par2, par3, var7); this.func_143026_a(par2, par3, var7);
} }
} }
catch (Throwable var10) catch (Exception var10)
{ {
CrashReport var8 = CrashReport.makeCrashReport(var10, "Exception preparing structure feature"); var10.printStackTrace();
CrashReportCategory var9 = var8.makeCategory("Feature being prepared");
var9.addCrashSectionCallable("Is feature chunk", new CallableIsFeatureChunk(this, par2, par3));
var9.addCrashSection("Chunk location", String.format("%d,%d", new Object[] {Integer.valueOf(par2), Integer.valueOf(par3)}));
var9.addCrashSectionCallable("Chunk pos hash", new CallableChunkPosHash(this, par2, par3));
var9.addCrashSectionCallable("Structure type", new CallableStructureType(this));
throw new ReportedException(var8);
} }
} }
} }

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

@ -401,8 +401,6 @@ public class NBTTagCompound extends NBTBase
{ {
CrashReport var4 = CrashReport.makeCrashReport(par3ClassCastException, "Reading NBT data"); CrashReport var4 = CrashReport.makeCrashReport(par3ClassCastException, "Reading NBT data");
CrashReportCategory var5 = var4.makeCategoryDepth("Corrupt NBT tag", 1); CrashReportCategory var5 = var4.makeCategoryDepth("Corrupt NBT tag", 1);
var5.addCrashSectionCallable("Tag type found", new CallableTagCompound1(this, par1Str));
var5.addCrashSectionCallable("Tag type expected", new CallableTagCompound2(this, par2));
var5.addCrashSection("Tag name", par1Str); var5.addCrashSection("Tag name", par1Str);
if (this.getName() != null && this.getName().length() > 0) if (this.getName() != null && this.getName().length() > 0)

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

@ -567,13 +567,9 @@ public class NetServerHandler extends NetHandler
{ {
this.netManager.addToSendQueue(par1Packet); this.netManager.addToSendQueue(par1Packet);
} }
catch (Throwable var5) catch (Exception var10)
{ {
CrashReport var6 = CrashReport.makeCrashReport(var5, "Sending packet"); var10.printStackTrace();
CrashReportCategory var4 = var6.makeCategory("Packet being sent");
var4.addCrashSectionCallable("Packet ID", new CallablePacketID(this, par1Packet));
var4.addCrashSectionCallable("Packet class", new CallablePacketClass(this, par1Packet));
throw new ReportedException(var6);
} }
} }

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

@ -7544,8 +7544,10 @@ public class RenderBlocks
Tessellator var4 = Tessellator.instance; Tessellator var4 = Tessellator.instance;
boolean var5 = par1Block.blockID == Block.grass.blockID; boolean var5 = par1Block.blockID == Block.grass.blockID;
if (par1Block == Block.dispenser || par1Block == Block.dropper || par1Block == Block.furnaceIdle) EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MIN_FILTER, EaglerAdapter.GL_NEAREST);
{ EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MAG_FILTER, EaglerAdapter.GL_NEAREST);
if (par1Block == Block.dispenser || par1Block == Block.dropper || par1Block == Block.furnaceIdle) {
par2 = 3; par2 = 3;
} }
@ -7554,18 +7556,16 @@ public class RenderBlocks
float var8; float var8;
float var9; float var9;
if (this.useInventoryTint) if (this.useInventoryTint) {
{
var6 = par1Block.getRenderColor(par2); var6 = par1Block.getRenderColor(par2);
if (var5) if (var5) {
{
var6 = 16777215; var6 = 16777215;
} }
var7 = (float)(var6 >> 16 & 255) / 255.0F; var7 = (float) (var6 >> 16 & 255) / 255.0F;
var8 = (float)(var6 >> 8 & 255) / 255.0F; var8 = (float) (var6 >> 8 & 255) / 255.0F;
var9 = (float)(var6 & 255) / 255.0F; var9 = (float) (var6 & 255) / 255.0F;
EaglerAdapter.glColor4f(var7 * par3, var8 * par3, var9 * par3, 1.0F); EaglerAdapter.glColor4f(var7 * par3, var8 * par3, var9 * par3, 1.0F);
} }
@ -7573,32 +7573,24 @@ public class RenderBlocks
this.setRenderBoundsFromBlock(par1Block); this.setRenderBoundsFromBlock(par1Block);
int var14; int var14;
if (var6 != 0 && var6 != 31 && var6 != 39 && var6 != 16 && var6 != 26) if (var6 != 0 && var6 != 31 && var6 != 39 && var6 != 16 && var6 != 26) {
{ if (var6 == 1) {
if (var6 == 1)
{
var4.startDrawingQuads(); var4.startDrawingQuads();
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
this.drawCrossedSquares(par1Block, par2, -0.5D, -0.5D, -0.5D, 1.0F); this.drawCrossedSquares(par1Block, par2, -0.5D, -0.5D, -0.5D, 1.0F);
var4.draw(); var4.draw();
} } else if (var6 == 19) {
else if (var6 == 19)
{
var4.startDrawingQuads(); var4.startDrawingQuads();
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
par1Block.setBlockBoundsForItemRender(); par1Block.setBlockBoundsForItemRender();
this.renderBlockStemSmall(par1Block, par2, this.renderMaxY, -0.5D, -0.5D, -0.5D); this.renderBlockStemSmall(par1Block, par2, this.renderMaxY, -0.5D, -0.5D, -0.5D);
var4.draw(); var4.draw();
} } else if (var6 == 23) {
else if (var6 == 23)
{
var4.startDrawingQuads(); var4.startDrawingQuads();
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
par1Block.setBlockBoundsForItemRender(); par1Block.setBlockBoundsForItemRender();
var4.draw(); var4.draw();
} } else if (var6 == 13) {
else if (var6 == 13)
{
par1Block.setBlockBoundsForItemRender(); par1Block.setBlockBoundsForItemRender();
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
var7 = 0.0625F; var7 = 0.0625F;
@ -7635,39 +7627,30 @@ public class RenderBlocks
var4.addTranslation(var7, 0.0F, 0.0F); var4.addTranslation(var7, 0.0F, 0.0F);
var4.draw(); var4.draw();
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} } else if (var6 == 22) {
else if (var6 == 22) RenderHelper.enableStandardItemLighting();
{
EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3); ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3);
EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} EaglerAdapter.revertLightMatrix();
else if (var6 == 6) } else if (var6 == 6) {
{
var4.startDrawingQuads(); var4.startDrawingQuads();
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
this.renderBlockCropsImpl(par1Block, par2, -0.5D, -0.5D, -0.5D); this.renderBlockCropsImpl(par1Block, par2, -0.5D, -0.5D, -0.5D);
var4.draw(); var4.draw();
} } else if (var6 == 2) {
else if (var6 == 2)
{
var4.startDrawingQuads(); var4.startDrawingQuads();
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
this.renderTorchAtAngle(par1Block, -0.5D, -0.5D, -0.5D, 0.0D, 0.0D, 0); this.renderTorchAtAngle(par1Block, -0.5D, -0.5D, -0.5D, 0.0D, 0.0D, 0);
var4.draw(); var4.draw();
} } else if (var6 == 10) {
else if (var6 == 10) for (var14 = 0; var14 < 2; ++var14) {
{ if (var14 == 0) {
for (var14 = 0; var14 < 2; ++var14)
{
if (var14 == 0)
{
this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.5D); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.5D);
} }
if (var14 == 1) if (var14 == 1) {
{
this.setRenderBounds(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); this.setRenderBounds(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D);
} }
@ -7698,67 +7681,56 @@ public class RenderBlocks
var4.draw(); var4.draw();
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} }
} } else if (var6 == 27) {
else if (var6 == 27)
{
var14 = 0; var14 = 0;
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
var4.startDrawingQuads(); var4.startDrawingQuads();
for (int var15 = 0; var15 < 8; ++var15) for (int var15 = 0; var15 < 8; ++var15) {
{
byte var16 = 0; byte var16 = 0;
byte var17 = 1; byte var17 = 1;
if (var15 == 0) if (var15 == 0) {
{
var16 = 2; var16 = 2;
} }
if (var15 == 1) if (var15 == 1) {
{
var16 = 3; var16 = 3;
} }
if (var15 == 2) if (var15 == 2) {
{
var16 = 4; var16 = 4;
} }
if (var15 == 3) if (var15 == 3) {
{
var16 = 5; var16 = 5;
var17 = 2; var17 = 2;
} }
if (var15 == 4) if (var15 == 4) {
{
var16 = 6; var16 = 6;
var17 = 3; var17 = 3;
} }
if (var15 == 5) if (var15 == 5) {
{
var16 = 7; var16 = 7;
var17 = 5; var17 = 5;
} }
if (var15 == 6) if (var15 == 6) {
{
var16 = 6; var16 = 6;
var17 = 2; var17 = 2;
} }
if (var15 == 7) if (var15 == 7) {
{
var16 = 3; var16 = 3;
} }
float var11 = (float)var16 / 16.0F; float var11 = (float) var16 / 16.0F;
float var12 = 1.0F - (float)var14 / 16.0F; float var12 = 1.0F - (float) var14 / 16.0F;
float var13 = 1.0F - (float)(var14 + var17) / 16.0F; float var13 = 1.0F - (float) (var14 + var17) / 16.0F;
var14 += var17; var14 += var17;
this.setRenderBounds((double)(0.5F - var11), (double)var13, (double)(0.5F - var11), (double)(0.5F + var11), (double)var12, (double)(0.5F + var11)); this.setRenderBounds((double) (0.5F - var11), (double) var13, (double) (0.5F - var11), (double) (0.5F + var11), (double) var12, (double) (0.5F + var11));
var4.setNormal(0.0F, -1.0F, 0.0F); var4.setNormal(0.0F, -1.0F, 0.0F);
this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 0)); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 0));
var4.setNormal(0.0F, 1.0F, 0.0F); var4.setNormal(0.0F, 1.0F, 0.0F);
@ -7776,33 +7748,26 @@ public class RenderBlocks
var4.draw(); var4.draw();
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
} } else if (var6 == 11) {
else if (var6 == 11) for (var14 = 0; var14 < 4; ++var14) {
{
for (var14 = 0; var14 < 4; ++var14)
{
var8 = 0.125F; var8 = 0.125F;
if (var14 == 0) if (var14 == 0) {
{ this.setRenderBounds((double) (0.5F - var8), 0.0D, 0.0D, (double) (0.5F + var8), 1.0D, (double) (var8 * 2.0F));
this.setRenderBounds((double)(0.5F - var8), 0.0D, 0.0D, (double)(0.5F + var8), 1.0D, (double)(var8 * 2.0F));
} }
if (var14 == 1) if (var14 == 1) {
{ this.setRenderBounds((double) (0.5F - var8), 0.0D, (double) (1.0F - var8 * 2.0F), (double) (0.5F + var8), 1.0D, 1.0D);
this.setRenderBounds((double)(0.5F - var8), 0.0D, (double)(1.0F - var8 * 2.0F), (double)(0.5F + var8), 1.0D, 1.0D);
} }
var8 = 0.0625F; var8 = 0.0625F;
if (var14 == 2) if (var14 == 2) {
{ this.setRenderBounds((double) (0.5F - var8), (double) (1.0F - var8 * 3.0F), (double) (-var8 * 2.0F), (double) (0.5F + var8), (double) (1.0F - var8), (double) (1.0F + var8 * 2.0F));
this.setRenderBounds((double)(0.5F - var8), (double)(1.0F - var8 * 3.0F), (double)(-var8 * 2.0F), (double)(0.5F + var8), (double)(1.0F - var8), (double)(1.0F + var8 * 2.0F));
} }
if (var14 == 3) if (var14 == 3) {
{ this.setRenderBounds((double) (0.5F - var8), (double) (0.5F - var8 * 3.0F), (double) (-var8 * 2.0F), (double) (0.5F + var8), (double) (0.5F - var8), (double) (1.0F + var8 * 2.0F));
this.setRenderBounds((double)(0.5F - var8), (double)(0.5F - var8 * 3.0F), (double)(-var8 * 2.0F), (double)(0.5F + var8), (double)(0.5F - var8), (double)(1.0F + var8 * 2.0F));
} }
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
@ -7834,28 +7799,22 @@ public class RenderBlocks
} }
this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
} } else if (var6 == 21) {
else if (var6 == 21) for (var14 = 0; var14 < 3; ++var14) {
{
for (var14 = 0; var14 < 3; ++var14)
{
var8 = 0.0625F; var8 = 0.0625F;
if (var14 == 0) if (var14 == 0) {
{ this.setRenderBounds((double) (0.5F - var8), 0.30000001192092896D, 0.0D, (double) (0.5F + var8), 1.0D, (double) (var8 * 2.0F));
this.setRenderBounds((double)(0.5F - var8), 0.30000001192092896D, 0.0D, (double)(0.5F + var8), 1.0D, (double)(var8 * 2.0F));
} }
if (var14 == 1) if (var14 == 1) {
{ this.setRenderBounds((double) (0.5F - var8), 0.30000001192092896D, (double) (1.0F - var8 * 2.0F), (double) (0.5F + var8), 1.0D, 1.0D);
this.setRenderBounds((double)(0.5F - var8), 0.30000001192092896D, (double)(1.0F - var8 * 2.0F), (double)(0.5F + var8), 1.0D, 1.0D);
} }
var8 = 0.0625F; var8 = 0.0625F;
if (var14 == 2) if (var14 == 2) {
{ this.setRenderBounds((double) (0.5F - var8), 0.5D, 0.0D, (double) (0.5F + var8), (double) (1.0F - var8), 1.0D);
this.setRenderBounds((double)(0.5F - var8), 0.5D, 0.0D, (double)(0.5F + var8), (double)(1.0F - var8), 1.0D);
} }
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
@ -7885,18 +7844,13 @@ public class RenderBlocks
var4.draw(); var4.draw();
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} }
} } else if (var6 == 32) {
else if (var6 == 32) for (var14 = 0; var14 < 2; ++var14) {
{ if (var14 == 0) {
for (var14 = 0; var14 < 2; ++var14)
{
if (var14 == 0)
{
this.setRenderBounds(0.0D, 0.0D, 0.3125D, 1.0D, 0.8125D, 0.6875D); this.setRenderBounds(0.0D, 0.0D, 0.3125D, 1.0D, 0.8125D, 0.6875D);
} }
if (var14 == 1) if (var14 == 1) {
{
this.setRenderBounds(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D); this.setRenderBounds(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D);
} }
@ -7929,24 +7883,16 @@ public class RenderBlocks
} }
this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
} } else if (var6 == 35) {
else if (var6 == 35)
{
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
this.renderBlockAnvilOrient((BlockAnvil)par1Block, 0, 0, 0, par2 << 2, true); this.renderBlockAnvilOrient((BlockAnvil) par1Block, 0, 0, 0, par2, true);
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} } else if (var6 == 34) {
else if (var6 == 34) for (var14 = 0; var14 < 3; ++var14) {
{ if (var14 == 0) {
for (var14 = 0; var14 < 3; ++var14)
{
if (var14 == 0)
{
this.setRenderBounds(0.125D, 0.0D, 0.125D, 0.875D, 0.1875D, 0.875D); this.setRenderBounds(0.125D, 0.0D, 0.125D, 0.875D, 0.1875D, 0.875D);
this.setOverrideBlockTexture(this.getBlockIcon(Block.obsidian)); this.setOverrideBlockTexture(this.getBlockIcon(Block.obsidian));
} } else if (var14 == 1) {
else if (var14 == 1)
{
this.setRenderBounds(0.1875D, 0.1875D, 0.1875D, 0.8125D, 0.875D, 0.8125D); this.setRenderBounds(0.1875D, 0.1875D, 0.1875D, 0.8125D, 0.875D, 0.8125D);
this.setOverrideBlockTexture(this.getBlockIcon(Block.beacon)); this.setOverrideBlockTexture(this.getBlockIcon(Block.beacon));
} }
@ -7986,18 +7932,13 @@ public class RenderBlocks
this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
this.clearOverrideBlockTexture(); this.clearOverrideBlockTexture();
} } else if (var6 == 38) {
else if (var6 == 38)
{
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
this.renderBlockHopperMetadata((BlockHopper)par1Block, 0, 0, 0, 0, true); this.renderBlockHopperMetadata((BlockHopper) par1Block, 0, 0, 0, 0, true);
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} }
} } else {
else if (var6 == 16) {
{
if (var6 == 16)
{
par2 = 1; par2 = 1;
} }
@ -8010,12 +7951,11 @@ public class RenderBlocks
this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 0, par2)); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 0, par2));
var4.draw(); var4.draw();
if (var5 && this.useInventoryTint) if (var5 && this.useInventoryTint) {
{
var14 = par1Block.getRenderColor(par2); var14 = par1Block.getRenderColor(par2);
var8 = (float)(var14 >> 16 & 255) / 255.0F; var8 = (float) (var14 >> 16 & 255) / 255.0F;
var9 = (float)(var14 >> 8 & 255) / 255.0F; var9 = (float) (var14 >> 8 & 255) / 255.0F;
float var10 = (float)(var14 & 255) / 255.0F; float var10 = (float) (var14 & 255) / 255.0F;
EaglerAdapter.glColor4f(var8 * par3, var9 * par3, var10 * par3, 1.0F); EaglerAdapter.glColor4f(var8 * par3, var9 * par3, var10 * par3, 1.0F);
} }
@ -8024,8 +7964,7 @@ public class RenderBlocks
this.renderFaceYPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 1, par2)); this.renderFaceYPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 1, par2));
var4.draw(); var4.draw();
if (var5 && this.useInventoryTint) if (var5 && this.useInventoryTint) {
{
EaglerAdapter.glColor4f(par3, par3, par3, 1.0F); EaglerAdapter.glColor4f(par3, par3, par3, 1.0F);
} }

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

@ -1712,7 +1712,6 @@ public class RenderGlobal implements IWorldAccess
CrashReport var15 = CrashReport.makeCrashReport(var17, "Exception while adding particle"); CrashReport var15 = CrashReport.makeCrashReport(var17, "Exception while adding particle");
CrashReportCategory var16 = var15.makeCategory("Particle being added"); CrashReportCategory var16 = var15.makeCategory("Particle being added");
var16.addCrashSection("Name", par1Str); var16.addCrashSection("Name", par1Str);
var16.addCrashSectionCallable("Position", new CallableParticlePositionInfo(this, par2, par4, par6));
throw new ReportedException(var15); throw new ReportedException(var15);
} }
} }

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

@ -253,10 +253,7 @@ public class TileEntity
public void func_85027_a(CrashReportCategory par1CrashReportCategory) public void func_85027_a(CrashReportCategory par1CrashReportCategory)
{ {
par1CrashReportCategory.addCrashSectionCallable("Name", new CallableTileEntityName(this));
CrashReportCategory.addBlockCrashInfo(par1CrashReportCategory, this.xCoord, this.yCoord, this.zCoord, this.getBlockType().blockID, this.getBlockMetadata());
par1CrashReportCategory.addCrashSectionCallable("Actual block type", new CallableTileEntityID(this));
par1CrashReportCategory.addCrashSectionCallable("Actual block data value", new CallableTileEntityData(this));
} }
static Map getClassToNameMap() static Map getClassToNameMap()

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

@ -149,12 +149,9 @@ public class TileEntityRenderer
{ {
var9.renderTileEntityAt(par1TileEntity, par2, par4, par6, par8); var9.renderTileEntityAt(par1TileEntity, par2, par4, par6, par8);
} }
catch (Throwable var13) catch (Exception var13)
{ {
CrashReport var11 = CrashReport.makeCrashReport(var13, "Rendering Tile Entity"); var13.printStackTrace();
CrashReportCategory var12 = var11.makeCategory("Tile Entity Details");
par1TileEntity.func_85027_a(var12);
throw new ReportedException(var11);
} }
} }
} }

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

@ -740,7 +740,6 @@ public abstract class World implements IBlockAccess
var10 = -1; var10 = -1;
} }
var9.addCrashSectionCallable("Source block type", new CallableLvl1(this, par4));
CrashReportCategory.addBlockCrashInfo(var9, par1, par2, par3, var5, var10); CrashReportCategory.addBlockCrashInfo(var9, par1, par2, par3, var5, var10);
throw new ReportedException(var8); throw new ReportedException(var8);
} }
@ -4110,8 +4109,6 @@ public abstract class World implements IBlockAccess
{ {
CrashReportCategory var2 = par1CrashReport.makeCategoryDepth("Affected level", 1); CrashReportCategory var2 = par1CrashReport.makeCategoryDepth("Affected level", 1);
var2.addCrashSection("Level name", this.worldInfo == null ? "????" : this.worldInfo.getWorldName()); var2.addCrashSection("Level name", this.worldInfo == null ? "????" : this.worldInfo.getWorldName());
var2.addCrashSectionCallable("All players", new CallableLvl2(this));
var2.addCrashSectionCallable("Chunk stats", new CallableLvl3(this));
try try
{ {

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

@ -394,10 +394,6 @@ public class WorldClient extends World
public CrashReportCategory addWorldInfoToCrashReport(CrashReport par1CrashReport) public CrashReportCategory addWorldInfoToCrashReport(CrashReport par1CrashReport)
{ {
CrashReportCategory var2 = super.addWorldInfoToCrashReport(par1CrashReport); CrashReportCategory var2 = super.addWorldInfoToCrashReport(par1CrashReport);
var2.addCrashSectionCallable("Forced entities", new CallableMPL1(this));
var2.addCrashSectionCallable("Retry entities", new CallableMPL2(this));
var2.addCrashSectionCallable("Server brand", new WorldClientINNER3(this));
var2.addCrashSectionCallable("Server type", new WorldClientINNER4(this));
return var2; return var2;
} }

23
src/main/java/net/minecraft/src/WorldClientINNER3.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class WorldClientINNER3 implements Callable
{
final WorldClient theWorldClient;
WorldClientINNER3(WorldClient par1WorldClient)
{
this.theWorldClient = par1WorldClient;
}
public String func_142026_a()
{
return WorldClient.func_142030_c(this.theWorldClient).thePlayer.func_142021_k();
}
public Object call()
{
return this.func_142026_a();
}
}

23
src/main/java/net/minecraft/src/WorldClientINNER4.java
View File

@ -1,23 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
class WorldClientINNER4 implements Callable
{
final WorldClient theWorldClient;
WorldClientINNER4(WorldClient par1WorldClient)
{
this.theWorldClient = par1WorldClient;
}
public String func_142028_a()
{
return WorldClient.func_142030_c(this.theWorldClient).getIntegratedServer() == null ? "Non-integrated multiplayer server" : "Integrated singleplayer server";
}
public Object call()
{
return this.func_142028_a();
}
}

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

@ -568,15 +568,7 @@ public class WorldInfo
*/ */
public void addToCrashReport(CrashReportCategory par1CrashReportCategory) public void addToCrashReport(CrashReportCategory par1CrashReportCategory)
{ {
par1CrashReportCategory.addCrashSectionCallable("Level seed", new CallableLevelSeed(this));
par1CrashReportCategory.addCrashSectionCallable("Level generator", new CallableLevelGenerator(this));
par1CrashReportCategory.addCrashSectionCallable("Level generator options", new CallableLevelGeneratorOptions(this));
par1CrashReportCategory.addCrashSectionCallable("Level spawn location", new CallableLevelSpawnLocation(this));
par1CrashReportCategory.addCrashSectionCallable("Level time", new CallableLevelTime(this));
par1CrashReportCategory.addCrashSectionCallable("Level dimension", new CallableLevelDimension(this));
par1CrashReportCategory.addCrashSectionCallable("Level storage version", new CallableLevelStorageVersion(this));
par1CrashReportCategory.addCrashSectionCallable("Level weather", new CallableLevelWeather(this));
par1CrashReportCategory.addCrashSectionCallable("Level game mode", new CallableLevelGamemode(this));
} }
/** /**