u23
This commit is contained in:
parent
2ebb5d6da9
commit
401ebe2324
1261 changed files with 12766 additions and 138431 deletions
|
|
@ -306,7 +306,7 @@ public class Minecraft implements IThreadListener {
|
|||
|
||||
public Minecraft(GameConfiguration gameConfig) {
|
||||
theMinecraft = this;
|
||||
StringTranslate.doCLINIT();
|
||||
StringTranslate.initClient();
|
||||
this.launchedVersion = gameConfig.gameInfo.version;
|
||||
this.mcDefaultResourcePack = new DefaultResourcePack();
|
||||
this.session = gameConfig.userInfo.session;
|
||||
|
|
@ -2054,7 +2054,7 @@ public class Minecraft implements IThreadListener {
|
|||
}
|
||||
|
||||
public ListenableFuture<Object> scheduleResourcesRefresh() {
|
||||
return this.addScheduledTask(new Runnable() {
|
||||
return this.addScheduledTaskFuture(new Runnable() {
|
||||
public void run() {
|
||||
Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
|
||||
I18n.format("resourcePack.load.pleaseWait"));
|
||||
|
|
@ -2186,7 +2186,7 @@ public class Minecraft implements IThreadListener {
|
|||
this.entityRenderer.loadEntityShader(viewingEntity);
|
||||
}
|
||||
|
||||
public <V> ListenableFuture<V> addScheduledTask(Callable<V> callableToSchedule) {
|
||||
public <V> ListenableFuture<V> addScheduledTaskFuture(Callable<V> callableToSchedule) {
|
||||
Validate.notNull(callableToSchedule);
|
||||
ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule);
|
||||
synchronized (this.scheduledTasks) {
|
||||
|
|
@ -2195,9 +2195,13 @@ public class Minecraft implements IThreadListener {
|
|||
}
|
||||
}
|
||||
|
||||
public ListenableFuture<Object> addScheduledTask(Runnable runnableToSchedule) {
|
||||
public ListenableFuture<Object> addScheduledTaskFuture(Runnable runnableToSchedule) {
|
||||
Validate.notNull(runnableToSchedule);
|
||||
return this.addScheduledTask(Executors.callable(runnableToSchedule));
|
||||
return this.addScheduledTaskFuture(Executors.callable(runnableToSchedule));
|
||||
}
|
||||
|
||||
public void addScheduledTask(Runnable runnableToSchedule) {
|
||||
this.addScheduledTaskFuture(Executors.callable(runnableToSchedule));
|
||||
}
|
||||
|
||||
public BlockRendererDispatcher getBlockRendererDispatcher() {
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ public class GuiOverlayDebug extends Gui {
|
|||
Float.valueOf(MathHelper.wrapAngleTo180_float(entity.rotationPitch)) }) });
|
||||
if (this.mc.theWorld != null && this.mc.theWorld.isBlockLoaded(blockpos)) {
|
||||
Chunk chunk = this.mc.theWorld.getChunkFromBlockCoords(blockpos);
|
||||
arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName);
|
||||
arraylist.add("Biome: " + chunk.getBiome(blockpos, null).biomeName);
|
||||
arraylist.add("Light: " + chunk.getLightSubtracted(blockpos, 0) + " ("
|
||||
+ chunk.getLightFor(EnumSkyBlock.SKY, blockpos) + " sky, "
|
||||
+ chunk.getLightFor(EnumSkyBlock.BLOCK, blockpos) + " block)");
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
|||
import net.lax1dude.eaglercraft.v1_8.profile.ServerSkinCache;
|
||||
import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets;
|
||||
import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
|
||||
import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
|
@ -239,6 +241,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
|
|||
private final Map<EaglercraftUUID, NetworkPlayerInfo> playerInfoMap = Maps.newHashMap();
|
||||
public int currentServerMaxPlayers = 20;
|
||||
private boolean field_147308_k = false;
|
||||
private boolean isIntegratedServer = false;
|
||||
/**+
|
||||
* Just an ordinary random number generator, used to randomize
|
||||
* audio pitch of item/orb pickup and randomize both
|
||||
|
|
@ -254,6 +257,8 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
|
|||
this.netManager = parNetworkManager;
|
||||
this.profile = parGameProfile;
|
||||
this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager());
|
||||
this.isIntegratedServer = (parNetworkManager instanceof ClientIntegratedServerNetworkManager)
|
||||
|| (parNetworkManager instanceof LANClientNetworkManager);
|
||||
}
|
||||
|
||||
/**+
|
||||
|
|
@ -1769,4 +1774,8 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
|
|||
public GameProfile getGameProfile() {
|
||||
return this.profile;
|
||||
}
|
||||
|
||||
public boolean isClientInEaglerSingleplayerOrLAN() {
|
||||
return isIntegratedServer;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
package net.minecraft.client.renderer.entity;
|
||||
|
||||
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager;
|
||||
import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.EmissiveItems;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
|
@ -55,9 +57,18 @@ public class RenderSnowball<T extends Entity> extends Render<T> {
|
|||
GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
|
||||
GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
|
||||
this.bindTexture(TextureMap.locationBlocksTexture);
|
||||
this.field_177083_e.func_181564_a(this.func_177082_d(entity), ItemCameraTransforms.TransformType.GROUND);
|
||||
ItemStack itm = this.func_177082_d(entity);
|
||||
this.field_177083_e.func_181564_a(itm, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.disableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
if (DynamicLightManager.isRenderingLights()) {
|
||||
float[] emission = EmissiveItems.getItemEmission(itm);
|
||||
if (emission != null) {
|
||||
float mag = 0.1f;
|
||||
DynamicLightManager.renderDynamicLight("entity_" + entity.getEntityId() + "_item_throw", d0, d1, d2,
|
||||
emission[0] * mag, emission[1] * mag, emission[2] * mag, false);
|
||||
}
|
||||
}
|
||||
super.doRender(entity, d0, d1, d2, f, f1);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue