From 948f5fcd5329a3621845d5971b08b5a67068b39a Mon Sep 17 00:00:00 2001 From: Aether Date: Mon, 14 Oct 2024 18:15:42 -0400 Subject: [PATCH] u37. NOTE: elytra texture is broken fix that :3 --- build.gradle | 2 +- javascript/index.html | 1 - .../java/net/minecraft/client/Minecraft.java | 1 - .../client/renderer/EntityRenderer.java | 132 +- .../renderer/texture/AbstractTexture.java | 29 +- .../java/net/minecraft/entity/Entity.java | 2508 +---------------- .../minecraft/entity/ai/EntityAITasks.java | 3 +- .../java/net/minecraft/item/ItemStack.java | 2 +- .../server/network/NetHandlerLoginServer.java | 33 +- src/game/java/net/minecraft/world/World.java | 2 +- .../Alfheim/lighting/LightingEngine.java | 27 +- .../eaglercraft/v1_8/EaglercraftVersion.java | 6 + .../v1_8/internal/GLObjectMap.java | 6 +- 13 files changed, 130 insertions(+), 2622 deletions(-) diff --git a/build.gradle b/build.gradle index 72962a8..acbf07f 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ def folder = "javascript" def name = "classes.js" teavm.js { - obfuscated = false + obfuscated = true sourceMap = true targetFileName = "../" + name optimization = OptimizationLevel.BALANCED // Change to "AGGRESSIVE" for release diff --git a/javascript/index.html b/javascript/index.html index 2988f55..9fda0ad 100644 --- a/javascript/index.html +++ b/javascript/index.html @@ -18,7 +18,6 @@ if(window.location.href.indexOf("file:") === 0) { alert("HTTP please, do not open this file locally, run a local HTTP server and load it via HTTP"); }else { - var relayId = Math.floor(Math.random() * 3); const isHttps = document.location.protocol === "https:"; var serverURL = isHttps ? "wss://" : "ws://"; serverURL += document.location.host + "/"; diff --git a/src/game/java/net/minecraft/client/Minecraft.java b/src/game/java/net/minecraft/client/Minecraft.java index 7b6c6de..5589c96 100644 --- a/src/game/java/net/minecraft/client/Minecraft.java +++ b/src/game/java/net/minecraft/client/Minecraft.java @@ -1672,7 +1672,6 @@ public class Minecraft implements IThreadListener { if (!this.isGamePaused) { this.renderGlobal.updateClouds(); } - this.mcProfiler.endStartSection("processRenderGlobalLightUpdates"); if (!isGamePaused) ((ILightUpdatesProcessor) renderGlobal).alfheim$processLightUpdates(); diff --git a/src/game/java/net/minecraft/client/renderer/EntityRenderer.java b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java index cf5caff..c90b4ca 100644 --- a/src/game/java/net/minecraft/client/renderer/EntityRenderer.java +++ b/src/game/java/net/minecraft/client/renderer/EntityRenderer.java @@ -15,7 +15,6 @@ import java.util.concurrent.Callable; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import net.hoosiertransfer.Config; import net.lax1dude.eaglercraft.v1_8.Display; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; @@ -37,8 +36,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ShadersRenderPassFuture import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.gui.GuiShaderConfig; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.EmissiveItems; import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager; -import net.lax1dude.eaglercraft.v1_8.voice.VoiceTagRenderer; import net.lax1dude.eaglercraft.v1_8.vector.Vector4f; +import net.lax1dude.eaglercraft.v1_8.voice.VoiceTagRenderer; import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.minecraft.block.Block; import net.minecraft.block.BlockBed; @@ -92,31 +91,22 @@ import net.minecraft.util.Vec3i; import net.minecraft.world.WorldSettings; import net.minecraft.world.biome.BiomeGenBase; -/** - * + +/**+ * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. * * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, hoosiertransfer, - * ayunami2000. All Rights Reserved. + * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * @@ -138,8 +128,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { private MouseFilter mouseFilterXAxis = new MouseFilter(); private MouseFilter mouseFilterYAxis = new MouseFilter(); private float thirdPersonDistance = 4.0F; - /** - * + + /**+ * Third person distance temp */ private float thirdPersonDistanceTemp = 4.0F; @@ -155,8 +144,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { private boolean cloudFog; private boolean renderHand = true; private boolean drawBlockOutline = true; - /** - * + + /**+ * Previous frame time in milliseconds */ private long prevFrameTime = Minecraft.getSystemTime(); @@ -170,8 +158,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { private int rainSoundCounter; private float[] rainXCoords = new float[1024]; private float[] rainYCoords = new float[1024]; - /** - * + + /**+ * Fog color buffer */ private FloatBuffer fogColorBuffer = GLAllocation.createDirectFloatBuffer(16); @@ -190,6 +177,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { private int frameCount; private GameOverlayFramebuffer overlayFramebuffer; private float eagPartialTicks = 0.0f; + public float currentProjMatrixFOV = 0.0f; public EntityRenderer(Minecraft mcIn, IResourceManager resourceManagerIn) { @@ -236,8 +224,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { this.useShader = !this.useShader; } - /** - * + + /**+ * What shader to use when spectating this entity */ public void loadEntityShader(Entity entityIn) { @@ -253,8 +240,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { public void onResourceManagerReload(IResourceManager var1) { } - /** - * + + /**+ * Updates the entity renderer */ public void updateRenderer() { @@ -280,6 +266,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { if (this.mc.getRenderViewEntity() == null) { this.mc.setRenderViewEntity(this.mc.thePlayer); } + float f3 = this.mc.theWorld.getLightBrightness( DeferredStateManager.isDeferredRenderer() ? new BlockPos(this.mc.getRenderViewEntity()).up() : new BlockPos(this.mc.getRenderViewEntity())); @@ -287,8 +274,8 @@ public class EntityRenderer implements IResourceManagerReloadListener { float f2 = f3 * (1.0F - f4) + f4; this.fogColor1 += (f2 - this.fogColor1) * 0.1F; ++this.rendererUpdateCount; - this.addRainParticles(); this.itemRenderer.updateEquippedItem(); + this.addRainParticles(); this.bossColorModifierPrev = this.bossColorModifier; if (BossStatus.hasColorModifier) { this.bossColorModifier += 0.05F; @@ -300,13 +287,13 @@ public class EntityRenderer implements IResourceManagerReloadListener { } else if (this.bossColorModifier > 0.0F) { this.bossColorModifier -= 0.0125F; } + } public void updateShaderGroupSize(int width, int height) { } - /** - * + + /**+ * Finds what block or object the mouse is over at the specified * partial tick time. Args: partialTickTime */ @@ -397,8 +384,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } } - /** - * + + /**+ * Update FOV modifier hand */ private void updateFovModifierHand() { @@ -420,8 +406,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } - /** - * + + /**+ * Changes the field of view of the player depending on if they * are underwater or not */ @@ -473,8 +458,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } - /** - * + + /**+ * Setups all the GL settings for view bobbing. Args: * partialTickTime */ @@ -495,8 +479,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } } - /** - * + + /**+ * sets up player's eye (or camera in third person mode) */ private void orientCamera(float partialTicks) { @@ -597,8 +580,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { this.cloudFog = this.mc.renderGlobal.hasCloudFog(d0, d1, d2, partialTicks); } - /** - * + + /**+ * sets up projection, view effects, camera position/rotation */ private void setupCameraTransform(float partialTicks, int pass) { @@ -648,27 +630,26 @@ public class EntityRenderer implements IResourceManagerReloadListener { this.orientCamera(partialTicks); if (this.debugView) { switch (this.debugViewDirection) { - case 0: - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); - break; - case 1: - GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); - break; - case 2: - GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); - break; - case 3: - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - break; - case 4: - GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F); + case 0: + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); + break; + case 1: + GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); + break; + case 2: + GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); + break; + case 3: + GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); + break; + case 4: + GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F); } } } - /** - * + + /**+ * Render player hand */ private void renderHand(float partialTicks, int xOffset) { @@ -743,8 +724,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); } - /** - * + + /**+ * Recompute a random value that is applied to block color in * updateLightmap() */ @@ -1065,7 +1045,6 @@ public class EntityRenderer implements IResourceManagerReloadListener { }); throw new ReportedException(crashreport); } - } this.mc.voiceOverlay.drawOverlay(); } @@ -1125,7 +1104,6 @@ public class EntityRenderer implements IResourceManagerReloadListener { } public void renderWorld(float partialTicks, long finishTimeNano) { - this.updateLightmap(partialTicks); if (this.mc.getRenderViewEntity() == null) { this.mc.setRenderViewEntity(this.mc.thePlayer); @@ -1345,7 +1323,6 @@ public class EntityRenderer implements IResourceManagerReloadListener { this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); GlStateManager.shadeModel(GL_SMOOTH); renderglobal.renderBlockLayer(EnumWorldBlockLayer.TRANSLUCENT, (double) partialTicks, pass, entity); - GlStateManager.disablePolygonOffset(); GlStateManager.shadeModel(GL_FLAT); GlStateManager.depthMask(true); GlStateManager.enableCull(); @@ -1469,8 +1446,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } } - /** - * + + /**+ * Render rain and snow */ protected void renderRainSnow(float partialTicks) { @@ -1663,8 +1639,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { } } - /** - * + + /**+ * Setup orthogonal projection for rendering GUI screen overlays */ public void setupOverlayRendering() { @@ -1679,8 +1654,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.translate(0.0F, 0.0F, -2000.0F); } - /** - * + + /**+ * calculates fog and calls glClearColor */ private void updateFogColor(float partialTicks) { @@ -1822,8 +1796,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F); } - /** - * + + /**+ * Sets up the fog to be rendered. If the arg passed in is -1 * the fog starts at 0 and goes to 80% of far plane distance and * is used for sky rendering. @@ -1897,8 +1870,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.enableFog(); } - /** - * + + /**+ * Update and return fogColorBuffer with the RGBA values passed * as arguments */ @@ -1948,12 +1920,12 @@ public class EntityRenderer implements IResourceManagerReloadListener { float eyeHeight = entity.getEyeHeight(); frustum.setPosition(d0, d1, d2); - // StringBuilder builder = new StringBuilder(); - // long ll = Double.doubleToLongBits(d0); - // for(int i = 63; i >= 0; --i) { - // builder.append((ll >>> i) & 1); - // } - // System.out.println(builder.toString()); +// StringBuilder builder = new StringBuilder(); +// long ll = Double.doubleToLongBits(d0); +// for(int i = 63; i >= 0; --i) { +// builder.append((ll >>> i) & 1); +// } +// System.out.println(builder.toString()); float waveTimer = (float) ((EagRuntime.steadyTimeMillis() % 600000l) * 0.001); DeferredStateManager.setWaterWindOffset(0.0f, 0.0f, waveTimer, waveTimer); diff --git a/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java b/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java index 4283ad2..bbf818c 100644 --- a/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java +++ b/src/game/java/net/minecraft/client/renderer/texture/AbstractTexture.java @@ -4,31 +4,22 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; -/** - * + +/**+ * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. * * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, hoosiertransfer, - * ayunami2000. All Rights Reserved. + * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * @@ -39,6 +30,7 @@ public abstract class AbstractTexture implements ITextureObject { protected boolean mipmap; protected boolean blurLast; protected boolean mipmapLast; + protected boolean hasAllocated; public void setBlurMipmapDirect(boolean parFlag, boolean parFlag2) { if (blur != parFlag || mipmap != parFlag2) { @@ -76,6 +68,7 @@ public abstract class AbstractTexture implements ITextureObject { public int getGlTextureId() { if (this.glTextureId == -1) { this.glTextureId = TextureUtil.glGenTextures(); + hasAllocated = false; } return this.glTextureId; diff --git a/src/game/java/net/minecraft/entity/Entity.java b/src/game/java/net/minecraft/entity/Entity.java index 7096d2c..5329e4c 100644 --- a/src/game/java/net/minecraft/entity/Entity.java +++ b/src/game/java/net/minecraft/entity/Entity.java @@ -1,4 +1,3 @@ -<<<<<<< HEAD:src/main/java/net/minecraft/entity/Entity.java package net.minecraft.entity; import java.util.List; @@ -7,6 +6,7 @@ import net.hoosiertransfer.Config; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.HString; +import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager; @@ -20,6 +20,7 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockPattern; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.command.CommandResultStats; import net.minecraft.command.ICommandSender; @@ -368,7 +369,6 @@ public abstract class Entity implements ICommandSender { * Gets called every tick from main Entity class */ public void onEntityUpdate() { - this.worldObj.theProfiler.startSection("entityBaseTick"); if (this.ridingEntity != null && this.ridingEntity.isDead) { this.ridingEntity = null; } @@ -380,7 +380,6 @@ public abstract class Entity implements ICommandSender { this.prevRotationPitch = this.rotationPitch; this.prevRotationYaw = this.rotationYaw; if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) { - this.worldObj.theProfiler.startSection("portal"); MinecraftServer minecraftserver = ((WorldServer) this.worldObj).getMinecraftServer(); int i = this.getMaxInPortalTime(); if (this.inPortal) { @@ -413,8 +412,6 @@ public abstract class Entity implements ICommandSender { if (this.timeUntilPortal > 0) { --this.timeUntilPortal; } - - this.worldObj.theProfiler.endSection(); } this.spawnRunningParticles(); @@ -450,7 +447,6 @@ public abstract class Entity implements ICommandSender { } this.firstUpdate = false; - this.worldObj.theProfiler.endSection(); } /** @@ -533,7 +529,6 @@ public abstract class Entity implements ICommandSender { this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z)); this.resetPositionToBB(); } else { - this.worldObj.theProfiler.startSection("move"); double d0 = this.posX; double d1 = this.posY; double d2 = this.posZ; @@ -703,8 +698,6 @@ public abstract class Entity implements ICommandSender { } } - this.worldObj.theProfiler.endSection(); - this.worldObj.theProfiler.startSection("rest"); this.resetPositionToBB(); this.isCollidedHorizontally = d3 != x || d5 != z; this.isCollidedVertically = d4 != y; @@ -798,8 +791,6 @@ public abstract class Entity implements ICommandSender { this.playSound("random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); this.fire = -this.fireResistance; } - - this.worldObj.theProfiler.endSection(); } } @@ -2146,6 +2137,19 @@ public abstract class Entity implements ICommandSender { } } + public String getNameProfanityFilter() { + if (this.hasCustomName()) { + return this.getCustomNameTagProfanityFilter(); + } else { + String s = EntityList.getEntityString(this); + if (s == null) { + s = "generic"; + } + + return StatCollector.translateToLocal("entity." + s + ".name"); + } + } + /** * + * Return the Entity parts making up this Entity (currently only @@ -2238,7 +2242,6 @@ public abstract class Entity implements ICommandSender { */ public void travelToDimension(int i) { if (!this.worldObj.isRemote && !this.isDead) { - this.worldObj.theProfiler.startSection("changeDimension"); MinecraftServer minecraftserver = MinecraftServer.getServer(); int j = this.dimension; WorldServer worldserver = minecraftserver.worldServerForDimension(j); @@ -2251,9 +2254,7 @@ public abstract class Entity implements ICommandSender { this.worldObj.removeEntity(this); this.isDead = false; - this.worldObj.theProfiler.startSection("reposition"); minecraftserver.getConfigurationManager().transferEntityToWorld(this, j, worldserver, worldserver1); - this.worldObj.theProfiler.endStartSection("reloading"); Entity entity = EntityList.createEntityByName(EntityList.getEntityString(this), worldserver1); if (entity != null) { entity.copyDataFromOld(this); @@ -2266,10 +2267,8 @@ public abstract class Entity implements ICommandSender { } this.isDead = true; - this.worldObj.theProfiler.endSection(); worldserver.resetUpdateEntityTick(); worldserver1.resetUpdateEntityTick(); - this.worldObj.theProfiler.endSection(); } } @@ -2377,2445 +2376,6 @@ public abstract class Entity implements ICommandSender { return chatcomponenttext; } - /** - * + - * Sets the custom name tag for this entity - */ - public void setCustomNameTag(String name) { - this.dataWatcher.updateObject(2, name); - } - - public String getCustomNameTag() { - return this.dataWatcher.getWatchableObjectString(2); - } - - /** - * + - * Returns true if this thing is named - */ - public boolean hasCustomName() { - return this.dataWatcher.getWatchableObjectString(2).length() > 0; - } - - public void setAlwaysRenderNameTag(boolean alwaysRenderNameTag) { - this.dataWatcher.updateObject(3, Byte.valueOf((byte) (alwaysRenderNameTag ? 1 : 0))); - } - - public boolean getAlwaysRenderNameTag() { - return this.dataWatcher.getWatchableObjectByte(3) == 1; - } - - /** - * + - * Sets the position of the entity and updates the 'last' - * variables - */ - public void setPositionAndUpdate(double d0, double d1, double d2) { - this.setLocationAndAngles(d0, d1, d2, this.rotationYaw, this.rotationPitch); - } - - public boolean getAlwaysRenderNameTagForRender() { - return this.getAlwaysRenderNameTag(); - } - - public void onDataWatcherUpdate(int dataID) { - } - - public EnumFacing getHorizontalFacing() { - return EnumFacing - .getHorizontal(MathHelper.floor_double((double) (this.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3); - } - - protected HoverEvent getHoverEvent() { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - String s = EntityList.getEntityString(this); - nbttagcompound.setString("id", this.getUniqueID().toString()); - if (s != null) { - nbttagcompound.setString("type", s); - } - - nbttagcompound.setString("name", this.getName()); - return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new ChatComponentText(nbttagcompound.toString())); - } - - public boolean isSpectatedByPlayer(EntityPlayerMP var1) { - return true; - } - - public AxisAlignedBB getEntityBoundingBox() { - return this.boundingBox; - } - - public void setEntityBoundingBox(AxisAlignedBB bb) { - this.boundingBox = bb; - } - - public float getEyeHeight() { - return this.height * 0.85F; - } - - public boolean isOutsideBorder() { - return this.isOutsideBorder; - } - - public void setOutsideBorder(boolean outsideBorder) { - this.isOutsideBorder = outsideBorder; - } - - public boolean replaceItemInInventory(int inventorySlot, ItemStack itemStackIn) { - return false; - } - - /** - * + - * Send a chat message to the CommandSender - */ - public void addChatMessage(IChatComponent var1) { - } - - /** - * + - * Returns {@code true} if the CommandSender is allowed to - * execute the command, {@code false} if not - */ - public boolean canCommandSenderUseCommand(int var1, String var2) { - return true; - } - - /** - * + - * Get the position in the world. {@code null} is not - * allowed! If you are not an entity in the world, return - * the coordinates 0, 0, 0 - */ - public BlockPos getPosition() { - return new BlockPos(this.posX, this.posY + 0.5D, this.posZ); - } - - /** - * + - * Get the position vector. {@code null} is not allowed! - * If you are not an entity in the world, return 0.0D, 0.0D, - * 0.0D - */ - public Vec3 getPositionVector() { - return new Vec3(this.posX, this.posY, this.posZ); - } - - /** - * + - * Get the world, if available. {@code null} is not - * allowed! If you are not an entity in the world, return - * the overworld - */ - public World getEntityWorld() { - return this.worldObj; - } - - /** - * + - * Returns the entity associated with the command sender. MAY BE - * NULL! - */ - public Entity getCommandSenderEntity() { - return this; - } - - /** - * + - * Returns true if the command sender should be sent feedback - * about executed commands - */ - public boolean sendCommandFeedback() { - return false; - } - - public void setCommandStat(CommandResultStats.Type commandresultstats$type, int i) { - this.cmdResultStats.func_179672_a(this, commandresultstats$type, i); - } - - public CommandResultStats getCommandStats() { - return this.cmdResultStats; - } - - public void func_174817_o(Entity entityIn) { - this.cmdResultStats.func_179671_a(entityIn.getCommandStats()); - } - - public NBTTagCompound getNBTTagCompound() { - return null; - } - - /** - * + - * Called when client receives entity's NBTTagCompound from - * server. - */ - public void clientUpdateEntityNBT(NBTTagCompound compound) { - } - - /** - * + - * New version of interactWith that includes vector information - * on where precisely the player targeted. - */ - public boolean interactAt(EntityPlayer player, Vec3 targetVec3) { - return false; - } - - public boolean isImmuneToExplosions() { - return false; - } - - protected void applyEnchantments(EntityLivingBase entityLivingBaseIn, Entity entityIn) { - if (entityIn instanceof EntityLivingBase) { - EnchantmentHelper.applyThornEnchantments((EntityLivingBase) entityIn, entityLivingBaseIn); - } - - EnchantmentHelper.applyArthropodEnchantments(entityLivingBaseIn, entityIn); - } - - public void renderDynamicLightsEagler(float partialTicks, boolean isInFrustum) { - double entityX = prevPosX + (posX - prevPosX) * (double) partialTicks; - double entityY = prevPosY + (posY - prevPosY) * (double) partialTicks; - double entityZ = prevPosZ + (posZ - prevPosZ) * (double) partialTicks; - double entityX2 = entityX - TileEntityRendererDispatcher.staticPlayerX; - double entityY2 = entityY - TileEntityRendererDispatcher.staticPlayerY; - double entityZ2 = entityZ - TileEntityRendererDispatcher.staticPlayerZ; - if (entityX2 * entityX2 + entityY2 * entityY2 - + entityZ2 * entityZ2 < (isInFrustum ? (64.0 * 64.0) : (24.0 * 24.0))) { - renderDynamicLightsEaglerAt(entityX, entityY, entityZ, entityX2, entityY2, entityZ2, partialTicks, - isInFrustum); - } - } - - protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, - double renderY, double renderZ, float partialTicks, boolean isInFrustum) { - float size = Math.max(width, height); - if (size < 1.0f && !isInFrustum) { - return; - } - if (this.isBurning()) { - float mag = 5.0f * size; - DynamicLightManager.renderDynamicLight("entity_" + entityId + "_fire", entityX, entityY + height * 0.75, - entityZ, mag, 0.487f * mag, 0.1411f * mag, false); - } - } - - public void renderDynamicLightsEaglerSimple(float partialTicks) { - double entityX = prevPosX + (posX - prevPosX) * (double) partialTicks; - double entityY = prevPosY + (posY - prevPosY) * (double) partialTicks; - double entityZ = prevPosZ + (posZ - prevPosZ) * (double) partialTicks; - renderDynamicLightsEaglerSimpleAt(entityX, entityY, entityZ, partialTicks); - } - - protected void renderDynamicLightsEaglerSimpleAt(double entityX, double entityY, double entityZ, - float partialTicks) { - float renderBrightness = this.getEaglerDynamicLightsValueSimple(partialTicks); - if (renderBrightness > 0.1f) { - DynamicLightsStateManager.renderDynamicLight("entity_" + entityId + "_lightmap", entityX, - entityY + height * 0.85, entityZ, renderBrightness * 13.0f); - } - } - - protected float getEaglerDynamicLightsValueSimple(float partialTicks) { - float size = Math.max(width, height); - if (size < 1.0f) { - return 0.0f; - } - if (this.isBurning()) { - return size / 2.0f; - } - return 0.0f; - } -======= -package net.minecraft.entity; - -import java.util.List; -import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -import net.lax1dude.eaglercraft.v1_8.HString; -import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager; -import net.lax1dude.eaglercraft.v1_8.profanity_filter.ProfanityFilter; - -import java.util.concurrent.Callable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.BlockWall; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.block.state.pattern.BlockPattern; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.command.CommandResultStats; -import net.minecraft.command.ICommandSender; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.EnchantmentProtection; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.event.HoverEvent; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagDouble; -import net.minecraft.nbt.NBTTagFloat; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; - -/**+ - * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. - * - * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" - * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team - * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public abstract class Entity implements ICommandSender { - private static final AxisAlignedBB ZERO_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); - private static int nextEntityID; - private int entityId; - public double renderDistanceWeight; - public boolean preventEntitySpawning; - public Entity riddenByEntity; - public Entity ridingEntity; - public boolean forceSpawn; - public World worldObj; - public double prevPosX; - public double prevPosY; - public double prevPosZ; - public double posX; - public double posY; - public double posZ; - public double motionX; - public double motionY; - public double motionZ; - public float rotationYaw; - public float rotationPitch; - public float prevRotationYaw; - public float prevRotationPitch; - private AxisAlignedBB boundingBox; - public boolean onGround; - public boolean isCollidedHorizontally; - public boolean isCollidedVertically; - public boolean isCollided; - public boolean velocityChanged; - protected boolean isInWeb; - private boolean isOutsideBorder; - public boolean isDead; - public float width; - public float height; - public float prevDistanceWalkedModified; - public float distanceWalkedModified; - public float distanceWalkedOnStepModified; - public float fallDistance; - private int nextStepDistance; - public double lastTickPosX; - public double lastTickPosY; - public double lastTickPosZ; - public float stepHeight; - public boolean noClip; - public float entityCollisionReduction; - protected EaglercraftRandom rand; - public int ticksExisted; - public int fireResistance; - private int fire; - protected boolean inWater; - public int hurtResistantTime; - protected boolean firstUpdate; - protected boolean isImmuneToFire; - protected DataWatcher dataWatcher; - private double entityRiderPitchDelta; - private double entityRiderYawDelta; - public boolean addedToChunk; - public int chunkCoordX; - public int chunkCoordY; - public int chunkCoordZ; - public int serverPosX; - public int serverPosY; - public int serverPosZ; - public boolean ignoreFrustumCheck; - public boolean isAirBorne; - public int timeUntilPortal; - protected boolean inPortal; - protected int portalCounter; - public int dimension; - protected BlockPos field_181016_an; - protected Vec3 field_181017_ao; - protected EnumFacing field_181018_ap; - private boolean invulnerable; - protected EaglercraftUUID entityUniqueID; - private final CommandResultStats cmdResultStats; - - public int getEntityId() { - return this.entityId; - } - - public void setEntityId(int id) { - this.entityId = id; - } - - /**+ - * Called by the /kill command. - */ - public void onKillCommand() { - this.setDead(); - } - - public Entity(World worldIn) { - this.entityId = nextEntityID++; - this.renderDistanceWeight = 1.0D; - this.boundingBox = ZERO_AABB; - this.width = 0.6F; - this.height = 1.8F; - this.nextStepDistance = 1; - this.rand = new EaglercraftRandom(); - this.fireResistance = 1; - this.firstUpdate = true; - this.entityUniqueID = MathHelper.getRandomUuid(this.rand); - this.cmdResultStats = new CommandResultStats(); - this.worldObj = worldIn; - this.setPosition(0.0D, 0.0D, 0.0D); - if (worldIn != null) { - this.dimension = worldIn.provider.getDimensionId(); - } - - this.dataWatcher = new DataWatcher(this); - this.dataWatcher.addObject(0, Byte.valueOf((byte) 0)); - this.dataWatcher.addObject(1, Short.valueOf((short) 300)); - this.dataWatcher.addObject(3, Byte.valueOf((byte) 0)); - this.dataWatcher.addObject(2, ""); - this.dataWatcher.addObject(4, Byte.valueOf((byte) 0)); - this.entityInit(); - } - - protected abstract void entityInit(); - - public DataWatcher getDataWatcher() { - return this.dataWatcher; - } - - public boolean equals(Object object) { - return object instanceof Entity ? ((Entity) object).entityId == this.entityId : false; - } - - public int hashCode() { - return this.entityId; - } - - /**+ - * Keeps moving the entity up so it isn't colliding with blocks - * and other requirements for this entity to be spawned (only - * actually used on players though its also on Entity) - */ - protected void preparePlayerToSpawn() { - if (this.worldObj != null) { - while (this.posY > 0.0D && this.posY < 256.0D) { - this.setPosition(this.posX, this.posY, this.posZ); - if (this.worldObj.getCollidingBoundingBoxes(this, this.getEntityBoundingBox()).isEmpty()) { - break; - } - - ++this.posY; - } - - this.motionX = this.motionY = this.motionZ = 0.0D; - this.rotationPitch = 0.0F; - } - } - - /**+ - * Will get destroyed next tick. - */ - public void setDead() { - this.isDead = true; - } - - /**+ - * Sets the width and height of the entity. Args: width, height - */ - protected void setSize(float f, float f1) { - if (f != this.width || f1 != this.height) { - float f2 = this.width; - this.width = f; - this.height = f1; - this.setEntityBoundingBox( - new AxisAlignedBB(this.getEntityBoundingBox().minX, this.getEntityBoundingBox().minY, - this.getEntityBoundingBox().minZ, this.getEntityBoundingBox().minX + (double) this.width, - this.getEntityBoundingBox().minY + (double) this.height, - this.getEntityBoundingBox().minZ + (double) this.width)); - if (this.width > f2 && !this.firstUpdate && !this.worldObj.isRemote) { - this.moveEntity((double) (f2 - this.width), 0.0D, (double) (f2 - this.width)); - } - } - - } - - /**+ - * Sets the rotation of the entity. Args: yaw, pitch (both in - * degrees) - */ - protected void setRotation(float yaw, float pitch) { - this.rotationYaw = yaw % 360.0F; - this.rotationPitch = pitch % 360.0F; - } - - /**+ - * Sets the x,y,z of the entity from the given parameters. Also - * seems to set up a bounding box. - */ - public void setPosition(double x, double y, double z) { - this.posX = x; - this.posY = y; - this.posZ = z; - float f = this.width / 2.0F; - float f1 = this.height; - this.setEntityBoundingBox( - new AxisAlignedBB(x - (double) f, y, z - (double) f, x + (double) f, y + (double) f1, z + (double) f)); - } - - /**+ - * Adds 15% to the entity's yaw and subtracts 15% from the - * pitch. Clamps pitch from -90 to 90. Both arguments in - * degrees. - */ - public void setAngles(float yaw, float pitch) { - float f = this.rotationPitch; - float f1 = this.rotationYaw; - this.rotationYaw = (float) ((double) this.rotationYaw + (double) yaw * 0.15D); - this.rotationPitch = (float) ((double) this.rotationPitch - (double) pitch * 0.15D); - this.rotationPitch = MathHelper.clamp_float(this.rotationPitch, -90.0F, 90.0F); - this.prevRotationPitch += this.rotationPitch - f; - this.prevRotationYaw += this.rotationYaw - f1; - } - - /**+ - * Called to update the entity's position/logic. - */ - public void onUpdate() { - this.onEntityUpdate(); - } - - /**+ - * Gets called every tick from main Entity class - */ - public void onEntityUpdate() { - if (this.ridingEntity != null && this.ridingEntity.isDead) { - this.ridingEntity = null; - } - - this.prevDistanceWalkedModified = this.distanceWalkedModified; - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - this.prevRotationPitch = this.rotationPitch; - this.prevRotationYaw = this.rotationYaw; - if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) { - MinecraftServer minecraftserver = ((WorldServer) this.worldObj).getMinecraftServer(); - int i = this.getMaxInPortalTime(); - if (this.inPortal) { - if (minecraftserver.getAllowNether()) { - if (this.ridingEntity == null && this.portalCounter++ >= i) { - this.portalCounter = i; - this.timeUntilPortal = this.getPortalCooldown(); - byte b0; - if (this.worldObj.provider.getDimensionId() == -1) { - b0 = 0; - } else { - b0 = -1; - } - - this.travelToDimension(b0); - } - - this.inPortal = false; - } - } else { - if (this.portalCounter > 0) { - this.portalCounter -= 4; - } - - if (this.portalCounter < 0) { - this.portalCounter = 0; - } - } - - if (this.timeUntilPortal > 0) { - --this.timeUntilPortal; - } - } - - this.spawnRunningParticles(); - this.handleWaterMovement(); - if (this.worldObj.isRemote) { - this.fire = 0; - } else if (this.fire > 0) { - if (this.isImmuneToFire) { - this.fire -= 4; - if (this.fire < 0) { - this.fire = 0; - } - } else { - if (this.fire % 20 == 0) { - this.attackEntityFrom(DamageSource.onFire, 1.0F); - } - - --this.fire; - } - } - - if (this.isInLava()) { - this.setOnFireFromLava(); - this.fallDistance *= 0.5F; - } - - if (this.posY < -64.0D) { - this.kill(); - } - - if (!this.worldObj.isRemote) { - this.setFlag(0, this.fire > 0); - } - - this.firstUpdate = false; - } - - /**+ - * Return the amount of time this entity should stay in a portal - * before being transported. - */ - public int getMaxInPortalTime() { - return 0; - } - - /**+ - * Called whenever the entity is walking inside of lava. - */ - protected void setOnFireFromLava() { - if (!this.isImmuneToFire) { - this.attackEntityFrom(DamageSource.lava, 4.0F); - this.setFire(15); - } - } - - /**+ - * Sets entity to burn for x amount of seconds, cannot lower - * amount of existing fire. - */ - public void setFire(int seconds) { - int i = seconds * 20; - i = EnchantmentProtection.getFireTimeForEntity(this, i); - if (this.fire < i) { - this.fire = i; - } - - } - - /**+ - * Removes fire from entity. - */ - public void extinguish() { - this.fire = 0; - } - - /**+ - * sets the dead flag. Used when you fall off the bottom of the - * world. - */ - protected void kill() { - this.setDead(); - } - - /**+ - * Checks if the offset position from the entity's current - * position is inside of liquid. Args: x, y, z - */ - public boolean isOffsetPositionInLiquid(double x, double y, double z) { - AxisAlignedBB axisalignedbb = this.getEntityBoundingBox().offset(x, y, z); - return this.isLiquidPresentInAABB(axisalignedbb); - } - - /**+ - * Determines if a liquid is present within the specified - * AxisAlignedBB. - */ - private boolean isLiquidPresentInAABB(AxisAlignedBB bb) { - return this.worldObj.getCollidingBoundingBoxes(this, bb).isEmpty() && !this.worldObj.isAnyLiquid(bb); - } - - /**+ - * Tries to moves the entity by the passed in displacement. - * Args: x, y, z - */ - public void moveEntity(double x, double y, double z) { - if (this.noClip) { - this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z)); - this.resetPositionToBB(); - } else { - double d0 = this.posX; - double d1 = this.posY; - double d2 = this.posZ; - if (this.isInWeb) { - this.isInWeb = false; - x *= 0.25D; - y *= 0.05000000074505806D; - z *= 0.25D; - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - } - - double d3 = x; - double d4 = y; - double d5 = z; - boolean flag = this.onGround && this.isSneaking() && this instanceof EntityPlayer; - if (flag) { - double d6; - for (d6 = 0.05D; x != 0.0D && this.worldObj - .getCollidingBoundingBoxes(this, this.getEntityBoundingBox().offset(x, -1.0D, 0.0D)) - .isEmpty(); d3 = x) { - if (x < d6 && x >= -d6) { - x = 0.0D; - } else if (x > 0.0D) { - x -= d6; - } else { - x += d6; - } - } - - for (; z != 0.0D && this.worldObj - .getCollidingBoundingBoxes(this, this.getEntityBoundingBox().offset(0.0D, -1.0D, z)) - .isEmpty(); d5 = z) { - if (z < d6 && z >= -d6) { - z = 0.0D; - } else if (z > 0.0D) { - z -= d6; - } else { - z += d6; - } - } - - for (; x != 0.0D && z != 0.0D - && this.worldObj - .getCollidingBoundingBoxes(this, this.getEntityBoundingBox().offset(x, -1.0D, z)) - .isEmpty(); d5 = z) { - if (x < d6 && x >= -d6) { - x = 0.0D; - } else if (x > 0.0D) { - x -= d6; - } else { - x += d6; - } - - d3 = x; - if (z < d6 && z >= -d6) { - z = 0.0D; - } else if (z > 0.0D) { - z -= d6; - } else { - z += d6; - } - } - } - - List list1 = this.worldObj.getCollidingBoundingBoxes(this, - this.getEntityBoundingBox().addCoord(x, y, z)); - AxisAlignedBB axisalignedbb = this.getEntityBoundingBox(); - - for (int i = 0, l = list1.size(); i < l; ++i) { - y = list1.get(i).calculateYOffset(this.getEntityBoundingBox(), y); - } - - this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, y, 0.0D)); - boolean flag1 = this.onGround || d4 != y && d4 < 0.0D; - - for (int i = 0, l = list1.size(); i < l; ++i) { - x = list1.get(i).calculateXOffset(this.getEntityBoundingBox(), x); - } - - this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, 0.0D, 0.0D)); - - for (int i = 0, l = list1.size(); i < l; ++i) { - z = list1.get(i).calculateZOffset(this.getEntityBoundingBox(), z); - } - - this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, 0.0D, z)); - if (this.stepHeight > 0.0F && flag1 && (d3 != x || d5 != z)) { - double d11 = x; - double d7 = y; - double d8 = z; - AxisAlignedBB axisalignedbb3 = this.getEntityBoundingBox(); - this.setEntityBoundingBox(axisalignedbb); - y = (double) this.stepHeight; - List list = this.worldObj.getCollidingBoundingBoxes(this, - this.getEntityBoundingBox().addCoord(d3, y, d5)); - AxisAlignedBB axisalignedbb4 = this.getEntityBoundingBox(); - AxisAlignedBB axisalignedbb5 = axisalignedbb4.addCoord(d3, 0.0D, d5); - double d9 = y; - - for (int i = 0, l = list.size(); i < l; ++i) { - d9 = list.get(i).calculateYOffset(axisalignedbb5, d9); - } - - axisalignedbb4 = axisalignedbb4.offset(0.0D, d9, 0.0D); - double d15 = d3; - - for (int i = 0, l = list.size(); i < l; ++i) { - d15 = list.get(i).calculateXOffset(axisalignedbb4, d15); - } - - axisalignedbb4 = axisalignedbb4.offset(d15, 0.0D, 0.0D); - double d16 = d5; - - for (int i = 0, l = list.size(); i < l; ++i) { - d16 = list.get(i).calculateZOffset(axisalignedbb4, d16); - } - - axisalignedbb4 = axisalignedbb4.offset(0.0D, 0.0D, d16); - AxisAlignedBB axisalignedbb14 = this.getEntityBoundingBox(); - double d17 = y; - - for (int i = 0, l = list.size(); i < l; ++i) { - d17 = list.get(i).calculateYOffset(axisalignedbb14, d17); - } - - axisalignedbb14 = axisalignedbb14.offset(0.0D, d17, 0.0D); - double d18 = d3; - - for (int i = 0, l = list.size(); i < l; ++i) { - d18 = list.get(i).calculateXOffset(axisalignedbb14, d18); - } - - axisalignedbb14 = axisalignedbb14.offset(d18, 0.0D, 0.0D); - double d19 = d5; - - for (int i = 0, l = list.size(); i < l; ++i) { - d19 = list.get(i).calculateZOffset(axisalignedbb14, d19); - } - - axisalignedbb14 = axisalignedbb14.offset(0.0D, 0.0D, d19); - double d20 = d15 * d15 + d16 * d16; - double d10 = d18 * d18 + d19 * d19; - if (d20 > d10) { - x = d15; - z = d16; - y = -d9; - this.setEntityBoundingBox(axisalignedbb4); - } else { - x = d18; - z = d19; - y = -d17; - this.setEntityBoundingBox(axisalignedbb14); - } - - for (int i = 0, l = list.size(); i < l; ++i) { - y = list.get(i).calculateYOffset(this.getEntityBoundingBox(), y); - } - - this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, y, 0.0D)); - if (d11 * d11 + d8 * d8 >= x * x + z * z) { - x = d11; - y = d7; - z = d8; - this.setEntityBoundingBox(axisalignedbb3); - } - } - - this.resetPositionToBB(); - this.isCollidedHorizontally = d3 != x || d5 != z; - this.isCollidedVertically = d4 != y; - this.onGround = this.isCollidedVertically && d4 < 0.0D; - this.isCollided = this.isCollidedHorizontally || this.isCollidedVertically; - int i = MathHelper.floor_double(this.posX); - int j = MathHelper.floor_double(this.posY - 0.20000000298023224D); - int k = MathHelper.floor_double(this.posZ); - BlockPos blockpos = new BlockPos(i, j, k); - Block block1 = this.worldObj.getBlockState(blockpos).getBlock(); - if (block1.getMaterial() == Material.air) { - Block block = this.worldObj.getBlockState(blockpos.down()).getBlock(); - if (block instanceof BlockFence || block instanceof BlockWall || block instanceof BlockFenceGate) { - block1 = block; - blockpos = blockpos.down(); - } - } - - this.updateFallState(y, this.onGround, block1, blockpos); - if (d3 != x) { - this.motionX = 0.0D; - } - - if (d5 != z) { - this.motionZ = 0.0D; - } - - if (d4 != y) { - block1.onLanded(this.worldObj, this); - } - - if (this.canTriggerWalking() && !flag && this.ridingEntity == null) { - double d12 = this.posX - d0; - double d13 = this.posY - d1; - double d14 = this.posZ - d2; - if (block1 != Blocks.ladder) { - d13 = 0.0D; - } - - if (block1 != null && this.onGround) { - block1.onEntityCollidedWithBlock(this.worldObj, blockpos, this); - } - - this.distanceWalkedModified = (float) ((double) this.distanceWalkedModified - + (double) MathHelper.sqrt_double(d12 * d12 + d14 * d14) * 0.6D); - this.distanceWalkedOnStepModified = (float) ((double) this.distanceWalkedOnStepModified - + (double) MathHelper.sqrt_double(d12 * d12 + d13 * d13 + d14 * d14) * 0.6D); - if (this.distanceWalkedOnStepModified > (float) this.nextStepDistance - && block1.getMaterial() != Material.air) { - this.nextStepDistance = (int) this.distanceWalkedOnStepModified + 1; - if (this.isInWater()) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX * 0.20000000298023224D - + this.motionY * this.motionY + this.motionZ * this.motionZ * 0.20000000298023224D) - * 0.35F; - if (f > 1.0F) { - f = 1.0F; - } - - this.playSound(this.getSwimSound(), f, - 1.0F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); - } - - this.playStepSound(blockpos, block1); - } - } - - try { - this.doBlockCollisions(); - } catch (Throwable throwable) { - CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Checking entity block collision"); - CrashReportCategory crashreportcategory = crashreport - .makeCategory("Entity being checked for collision"); - this.addEntityCrashInfo(crashreportcategory); - throw new ReportedException(crashreport); - } - - boolean flag2 = this.isWet(); - if (this.worldObj.isFlammableWithin(this.getEntityBoundingBox().contract(0.001D, 0.001D, 0.001D))) { - this.dealFireDamage(1); - if (!flag2) { - ++this.fire; - if (this.fire == 0) { - this.setFire(8); - } - } - } else if (this.fire <= 0) { - this.fire = -this.fireResistance; - } - - if (flag2 && this.fire > 0) { - this.playSound("random.fizz", 0.7F, 1.6F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); - this.fire = -this.fireResistance; - } - } - } - - /**+ - * Resets the entity's position to the center (planar) and - * bottom (vertical) points of its bounding box. - */ - private void resetPositionToBB() { - this.posX = (this.getEntityBoundingBox().minX + this.getEntityBoundingBox().maxX) / 2.0D; - this.posY = this.getEntityBoundingBox().minY; - this.posZ = (this.getEntityBoundingBox().minZ + this.getEntityBoundingBox().maxZ) / 2.0D; - } - - protected String getSwimSound() { - return "game.neutral.swim"; - } - - protected void doBlockCollisions() { - BlockPos blockpos = new BlockPos(this.getEntityBoundingBox().minX + 0.001D, - this.getEntityBoundingBox().minY + 0.001D, this.getEntityBoundingBox().minZ + 0.001D); - BlockPos blockpos1 = new BlockPos(this.getEntityBoundingBox().maxX - 0.001D, - this.getEntityBoundingBox().maxY - 0.001D, this.getEntityBoundingBox().maxZ - 0.001D); - if (this.worldObj.isAreaLoaded(blockpos, blockpos1)) { - for (int i = blockpos.getX(); i <= blockpos1.getX(); ++i) { - for (int j = blockpos.getY(); j <= blockpos1.getY(); ++j) { - for (int k = blockpos.getZ(); k <= blockpos1.getZ(); ++k) { - BlockPos blockpos2 = new BlockPos(i, j, k); - IBlockState iblockstate = this.worldObj.getBlockState(blockpos2); - - try { - iblockstate.getBlock().onEntityCollidedWithBlock(this.worldObj, blockpos2, iblockstate, - this); - } catch (Throwable throwable) { - CrashReport crashreport = CrashReport.makeCrashReport(throwable, - "Colliding entity with block"); - CrashReportCategory crashreportcategory = crashreport - .makeCategory("Block being collided with"); - CrashReportCategory.addBlockInfo(crashreportcategory, blockpos2, iblockstate); - throw new ReportedException(crashreport); - } - } - } - } - } - - } - - protected void playStepSound(BlockPos pos, Block blockIn) { - Block.SoundType block$soundtype = blockIn.stepSound; - if (this.worldObj.getBlockState(pos.up()).getBlock() == Blocks.snow_layer) { - block$soundtype = Blocks.snow_layer.stepSound; - this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F, - block$soundtype.getFrequency()); - } else if (!blockIn.getMaterial().isLiquid()) { - this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F, - block$soundtype.getFrequency()); - } - - } - - public void playSound(String s, float f, float f1) { - if (!this.isSilent()) { - this.worldObj.playSoundAtEntity(this, s, f, f1); - } - - } - - /**+ - * @return True if this entity will not play sounds - */ - public boolean isSilent() { - return this.dataWatcher.getWatchableObjectByte(4) == 1; - } - - /**+ - * When set to true the entity will not play sounds. - */ - public void setSilent(boolean isSilent) { - this.dataWatcher.updateObject(4, Byte.valueOf((byte) (isSilent ? 1 : 0))); - } - - /**+ - * returns if this entity triggers Block.onEntityWalking on the - * blocks they walk on. used for spiders and wolves to prevent - * them from trampling crops - */ - protected boolean canTriggerWalking() { - return true; - } - - protected void updateFallState(double d0, boolean flag, Block block, BlockPos blockpos) { - if (flag) { - if (this.fallDistance > 0.0F) { - if (block != null) { - block.onFallenUpon(this.worldObj, blockpos, this, this.fallDistance); - } else { - this.fall(this.fallDistance, 1.0F); - } - - this.fallDistance = 0.0F; - } - } else if (d0 < 0.0D) { - this.fallDistance = (float) ((double) this.fallDistance - d0); - } - - } - - /**+ - * Returns the collision bounding box for this entity - */ - public AxisAlignedBB getCollisionBoundingBox() { - return null; - } - - /**+ - * Will deal the specified amount of damage to the entity if the - * entity isn't immune to fire damage. Args: amountDamage - */ - protected void dealFireDamage(int amount) { - if (!this.isImmuneToFire) { - this.attackEntityFrom(DamageSource.inFire, (float) amount); - } - - } - - public final boolean isImmuneToFire() { - return this.isImmuneToFire; - } - - public void fall(float distance, float damageMultiplier) { - if (this.riddenByEntity != null) { - this.riddenByEntity.fall(distance, damageMultiplier); - } - - } - - /**+ - * Checks if this entity is either in water or on an open air - * block in rain (used in wolves). - */ - public boolean isWet() { - return this.inWater || this.worldObj.canLightningStrike(new BlockPos(this.posX, this.posY, this.posZ)) - || this.worldObj - .canLightningStrike(new BlockPos(this.posX, this.posY + (double) this.height, this.posZ)); - } - - /**+ - * Checks if this entity is inside water (if inWater field is - * true as a result of handleWaterMovement() returning true) - */ - public boolean isInWater() { - return this.inWater; - } - - /**+ - * Returns if this entity is in water and will end up adding the - * waters velocity to the entity - */ - public boolean handleWaterMovement() { - if (this.worldObj.handleMaterialAcceleration( - this.getEntityBoundingBox().expand(0.0D, -0.4000000059604645D, 0.0D).contract(0.001D, 0.001D, 0.001D), - Material.water, this)) { - if (!this.inWater && !this.firstUpdate) { - this.resetHeight(); - } - - this.fallDistance = 0.0F; - this.inWater = true; - this.fire = 0; - } else { - this.inWater = false; - } - - return this.inWater; - } - - /**+ - * sets the players height back to normal after doing things - * like sleeping and dieing - */ - protected void resetHeight() { - float f = MathHelper.sqrt_double(this.motionX * this.motionX * 0.20000000298023224D - + this.motionY * this.motionY + this.motionZ * this.motionZ * 0.20000000298023224D) * 0.2F; - if (f > 1.0F) { - f = 1.0F; - } - - this.playSound(this.getSplashSound(), f, 1.0F + (this.rand.nextFloat() - this.rand.nextFloat()) * 0.4F); - float f1 = (float) MathHelper.floor_double(this.getEntityBoundingBox().minY); - - for (int i = 0; (float) i < 1.0F + this.width * 20.0F; ++i) { - float f2 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - float f3 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX + (double) f2, (double) (f1 + 1.0F), - this.posZ + (double) f3, this.motionX, this.motionY - (double) (this.rand.nextFloat() * 0.2F), - this.motionZ, new int[0]); - } - - for (int j = 0; (float) j < 1.0F + this.width * 20.0F; ++j) { - float f4 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - float f5 = (this.rand.nextFloat() * 2.0F - 1.0F) * this.width; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, this.posX + (double) f4, (double) (f1 + 1.0F), - this.posZ + (double) f5, this.motionX, this.motionY, this.motionZ, new int[0]); - } - - } - - /**+ - * Attempts to create sprinting particles if the entity is - * sprinting and not in water. - */ - public void spawnRunningParticles() { - if (this.isSprinting() && !this.isInWater()) { - this.createRunningParticles(); - } - - } - - protected void createRunningParticles() { - int i = MathHelper.floor_double(this.posX); - int j = MathHelper.floor_double(this.posY - 0.20000000298023224D); - int k = MathHelper.floor_double(this.posZ); - BlockPos blockpos = new BlockPos(i, j, k); - IBlockState iblockstate = this.worldObj.getBlockState(blockpos); - Block block = iblockstate.getBlock(); - if (block.getRenderType() != -1) { - this.worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, - this.posX + ((double) this.rand.nextFloat() - 0.5D) * (double) this.width, - this.getEntityBoundingBox().minY + 0.1D, - this.posZ + ((double) this.rand.nextFloat() - 0.5D) * (double) this.width, -this.motionX * 4.0D, - 1.5D, -this.motionZ * 4.0D, new int[] { Block.getStateId(iblockstate) }); - } - - } - - protected String getSplashSound() { - return "game.neutral.swim.splash"; - } - - /**+ - * Checks if the current block the entity is within of the - * specified material type - */ - public boolean isInsideOfMaterial(Material materialIn) { - double d0 = this.posY + (double) this.getEyeHeight(); - BlockPos blockpos = new BlockPos(this.posX, d0, this.posZ); - IBlockState iblockstate = this.worldObj.getBlockState(blockpos); - Block block = iblockstate.getBlock(); - if (block.getMaterial() == materialIn) { - float f = BlockLiquid.getLiquidHeightPercent(iblockstate.getBlock().getMetaFromState(iblockstate)) - - 0.11111111F; - float f1 = (float) (blockpos.getY() + 1) - f; - boolean flag = d0 < (double) f1; - return !flag && this instanceof EntityPlayer ? false : flag; - } else { - return false; - } - } - - public boolean isInLava() { - return this.worldObj.isMaterialInBB( - this.getEntityBoundingBox().expand(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), - Material.lava); - } - - /**+ - * Used in both water and by flying objects - */ - public void moveFlying(float strafe, float forward, float friction) { - float f = strafe * strafe + forward * forward; - if (f >= 1.0E-4F) { - f = MathHelper.sqrt_float(f); - if (f < 1.0F) { - f = 1.0F; - } - - f = friction / f; - strafe = strafe * f; - forward = forward * f; - float f1 = MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F); - float f2 = MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F); - this.motionX += (double) (strafe * f2 - forward * f1); - this.motionZ += (double) (forward * f2 + strafe * f1); - } - } - - public int getBrightnessForRender(float var1) { - BlockPos blockpos = new BlockPos(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); - int i = 0; - if (DynamicLightsStateManager.isDynamicLightsRender()) { - i += (int) (getEaglerDynamicLightsValueSimple(var1) * 15.0f); - } - return this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getCombinedLight(blockpos, -i) - : (i > 15 ? 240 : (i << 4)); - } - - /**+ - * Gets how bright this entity is. - */ - public float getBrightness(float var1) { - BlockPos blockpos = new BlockPos(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); - float f = this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getLightBrightness(blockpos) : 0.0F; - if (DynamicLightsStateManager.isDynamicLightsRender()) { - f = Math.min(f + getEaglerDynamicLightsValueSimple(var1), 1.0f); - } - return f; - } - - /**+ - * Sets the reference to the World object. - */ - public void setWorld(World worldIn) { - this.worldObj = worldIn; - } - - /**+ - * Sets the entity's position and rotation. - */ - public void setPositionAndRotation(double x, double y, double z, float yaw, float pitch) { - this.prevPosX = this.posX = x; - this.prevPosY = this.posY = y; - this.prevPosZ = this.posZ = z; - this.prevRotationYaw = this.rotationYaw = yaw; - this.prevRotationPitch = this.rotationPitch = pitch; - double d0 = (double) (this.prevRotationYaw - yaw); - if (d0 < -180.0D) { - this.prevRotationYaw += 360.0F; - } - - if (d0 >= 180.0D) { - this.prevRotationYaw -= 360.0F; - } - - this.setPosition(this.posX, this.posY, this.posZ); - this.setRotation(yaw, pitch); - } - - public void moveToBlockPosAndAngles(BlockPos pos, float rotationYawIn, float rotationPitchIn) { - this.setLocationAndAngles((double) pos.getX() + 0.5D, (double) pos.getY(), (double) pos.getZ() + 0.5D, - rotationYawIn, rotationPitchIn); - } - - /**+ - * Sets the location and Yaw/Pitch of an entity in the world - */ - public void setLocationAndAngles(double x, double y, double z, float yaw, float pitch) { - this.lastTickPosX = this.prevPosX = this.posX = x; - this.lastTickPosY = this.prevPosY = this.posY = y; - this.lastTickPosZ = this.prevPosZ = this.posZ = z; - this.rotationYaw = yaw; - this.rotationPitch = pitch; - this.setPosition(this.posX, this.posY, this.posZ); - } - - /**+ - * Returns the distance to the entity. Args: entity - */ - public float getDistanceToEntity(Entity entityIn) { - float f = (float) (this.posX - entityIn.posX); - float f1 = (float) (this.posY - entityIn.posY); - float f2 = (float) (this.posZ - entityIn.posZ); - return MathHelper.sqrt_float(f * f + f1 * f1 + f2 * f2); - } - - /**+ - * Gets the squared distance to the position. Args: x, y, z - */ - public double getDistanceSq(double x, double y, double z) { - double d0 = this.posX - x; - double d1 = this.posY - y; - double d2 = this.posZ - z; - return d0 * d0 + d1 * d1 + d2 * d2; - } - - /**+ - * Gets the squared distance to the position. Args: x, y, z - */ - public double getDistanceSq(BlockPos pos) { - return pos.distanceSq(this.posX, this.posY, this.posZ); - } - - public double getDistanceSqToCenter(BlockPos pos) { - return pos.distanceSqToCenter(this.posX, this.posY, this.posZ); - } - - /**+ - * Gets the distance to the position. Args: x, y, z - */ - public double getDistance(double x, double y, double z) { - double d0 = this.posX - x; - double d1 = this.posY - y; - double d2 = this.posZ - z; - return (double) MathHelper.sqrt_double(d0 * d0 + d1 * d1 + d2 * d2); - } - - /**+ - * Returns the squared distance to the entity. Args: entity - */ - public double getDistanceSqToEntity(Entity entityIn) { - double d0 = this.posX - entityIn.posX; - double d1 = this.posY - entityIn.posY; - double d2 = this.posZ - entityIn.posZ; - return d0 * d0 + d1 * d1 + d2 * d2; - } - - /**+ - * Called by a player entity when they collide with an entity - */ - public void onCollideWithPlayer(EntityPlayer parEntityPlayer) { - } - - /**+ - * Applies a velocity to each of the entities pushing them away - * from each other. Args: entity - */ - public void applyEntityCollision(Entity entityIn) { - if (entityIn.riddenByEntity != this && entityIn.ridingEntity != this) { - if (!entityIn.noClip && !this.noClip) { - double d0 = entityIn.posX - this.posX; - double d1 = entityIn.posZ - this.posZ; - double d2 = MathHelper.abs_max(d0, d1); - if (d2 >= 0.009999999776482582D) { - d2 = (double) MathHelper.sqrt_double(d2); - d0 = d0 / d2; - d1 = d1 / d2; - double d3 = 1.0D / d2; - if (d3 > 1.0D) { - d3 = 1.0D; - } - - d0 = d0 * d3; - d1 = d1 * d3; - d0 = d0 * 0.05000000074505806D; - d1 = d1 * 0.05000000074505806D; - d0 = d0 * (double) (1.0F - this.entityCollisionReduction); - d1 = d1 * (double) (1.0F - this.entityCollisionReduction); - if (this.riddenByEntity == null) { - this.addVelocity(-d0, 0.0D, -d1); - } - - if (entityIn.riddenByEntity == null) { - entityIn.addVelocity(d0, 0.0D, d1); - } - } - - } - } - } - - /**+ - * Adds to the current velocity of the entity. Args: x, y, z - */ - public void addVelocity(double x, double y, double z) { - this.motionX += x; - this.motionY += y; - this.motionZ += z; - this.isAirBorne = true; - } - - /**+ - * Sets that this entity has been attacked. - */ - protected void setBeenAttacked() { - this.velocityChanged = true; - } - - /**+ - * Called when the entity is attacked. - */ - public boolean attackEntityFrom(DamageSource damagesource, float var2) { - if (this.isEntityInvulnerable(damagesource)) { - return false; - } else { - this.setBeenAttacked(); - return false; - } - } - - /**+ - * interpolated look vector - */ - public Vec3 getLook(float partialTicks) { - if (partialTicks == 1.0F) { - return this.getVectorForRotation(this.rotationPitch, this.rotationYaw); - } else { - float f = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * partialTicks; - float f1 = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * partialTicks; - return this.getVectorForRotation(f, f1); - } - } - - /**+ - * Creates a Vec3 using the pitch and yaw of the entities - * rotation. - */ - protected final Vec3 getVectorForRotation(float pitch, float yaw) { - float f = MathHelper.cos(-yaw * 0.017453292F - 3.1415927F); - float f1 = MathHelper.sin(-yaw * 0.017453292F - 3.1415927F); - float f2 = -MathHelper.cos(-pitch * 0.017453292F); - float f3 = MathHelper.sin(-pitch * 0.017453292F); - return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2)); - } - - public Vec3 getPositionEyes(float partialTicks) { - if (partialTicks == 1.0F) { - return new Vec3(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); - } else { - double d0 = this.prevPosX + (this.posX - this.prevPosX) * (double) partialTicks; - double d1 = this.prevPosY + (this.posY - this.prevPosY) * (double) partialTicks - + (double) this.getEyeHeight(); - double d2 = this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTicks; - return new Vec3(d0, d1, d2); - } - } - - public MovingObjectPosition rayTrace(double blockReachDistance, float partialTicks) { - Vec3 vec3 = this.getPositionEyes(partialTicks); - Vec3 vec31 = this.getLook(partialTicks); - Vec3 vec32 = vec3.addVector(vec31.xCoord * blockReachDistance, vec31.yCoord * blockReachDistance, - vec31.zCoord * blockReachDistance); - return this.worldObj.rayTraceBlocks(vec3, vec32, false, false, true); - } - - /**+ - * Returns true if other Entities should be prevented from - * moving through this Entity. - */ - public boolean canBeCollidedWith() { - return false; - } - - /**+ - * Returns true if this entity should push and be pushed by - * other entities when colliding. - */ - public boolean canBePushed() { - return false; - } - - /**+ - * Adds a value to the player score. Currently not actually used - * and the entity passed in does nothing. Args: entity, - * scoreToAdd - */ - public void addToPlayerScore(Entity entityIn, int amount) { - } - - public boolean isInRangeToRender3d(double x, double y, double z) { - double d0 = this.posX - x; - double d1 = this.posY - y; - double d2 = this.posZ - z; - double d3 = d0 * d0 + d1 * d1 + d2 * d2; - return this.isInRangeToRenderDist(d3); - } - - /**+ - * Checks if the entity is in range to render by using the past - * in distance and comparing it to its average edge length * 64 - * * renderDistanceWeight Args: distance - */ - public boolean isInRangeToRenderDist(double distance) { - double d0 = this.getEntityBoundingBox().getAverageEdgeLength(); - if (Double.isNaN(d0)) { - d0 = 1.0D; - } - - d0 = d0 * 64.0D * this.renderDistanceWeight; - return distance < d0 * d0; - } - - /**+ - * Like writeToNBTOptional but does not check if the entity is - * ridden. Used for saving ridden entities with their riders. - */ - public boolean writeMountToNBT(NBTTagCompound tagCompund) { - String s = this.getEntityString(); - if (!this.isDead && s != null) { - tagCompund.setString("id", s); - this.writeToNBT(tagCompund); - return true; - } else { - return false; - } - } - - /**+ - * Either write this entity to the NBT tag given and return - * true, or return false without doing anything. If this returns - * false the entity is not saved on disk. Ridden entities return - * false here as they are saved with their rider. - */ - public boolean writeToNBTOptional(NBTTagCompound tagCompund) { - String s = this.getEntityString(); - if (!this.isDead && s != null && this.riddenByEntity == null) { - tagCompund.setString("id", s); - this.writeToNBT(tagCompund); - return true; - } else { - return false; - } - } - - /**+ - * Save the entity to NBT (calls an abstract helper method to - * write extra data) - */ - public void writeToNBT(NBTTagCompound tagCompund) { - try { - tagCompund.setTag("Pos", this.newDoubleNBTList(new double[] { this.posX, this.posY, this.posZ })); - tagCompund.setTag("Motion", - this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ })); - tagCompund.setTag("Rotation", this.newFloatNBTList(new float[] { this.rotationYaw, this.rotationPitch })); - tagCompund.setFloat("FallDistance", this.fallDistance); - tagCompund.setShort("Fire", (short) this.fire); - tagCompund.setShort("Air", (short) this.getAir()); - tagCompund.setBoolean("OnGround", this.onGround); - tagCompund.setInteger("Dimension", this.dimension); - tagCompund.setBoolean("Invulnerable", this.invulnerable); - tagCompund.setInteger("PortalCooldown", this.timeUntilPortal); - tagCompund.setLong("UUIDMost", this.getUniqueID().getMostSignificantBits()); - tagCompund.setLong("UUIDLeast", this.getUniqueID().getLeastSignificantBits()); - if (this.getCustomNameTag() != null && this.getCustomNameTag().length() > 0) { - tagCompund.setString("CustomName", this.getCustomNameTag()); - tagCompund.setBoolean("CustomNameVisible", this.getAlwaysRenderNameTag()); - } - - this.cmdResultStats.writeStatsToNBT(tagCompund); - if (this.isSilent()) { - tagCompund.setBoolean("Silent", this.isSilent()); - } - - this.writeEntityToNBT(tagCompund); - if (this.ridingEntity != null) { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - if (this.ridingEntity.writeMountToNBT(nbttagcompound)) { - tagCompund.setTag("Riding", nbttagcompound); - } - } - - } catch (Throwable throwable) { - CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Saving entity NBT"); - CrashReportCategory crashreportcategory = crashreport.makeCategory("Entity being saved"); - this.addEntityCrashInfo(crashreportcategory); - throw new ReportedException(crashreport); - } - } - - /**+ - * Reads the entity from NBT (calls an abstract helper method to - * read specialized data) - */ - public void readFromNBT(NBTTagCompound tagCompund) { - try { - NBTTagList nbttaglist = tagCompund.getTagList("Pos", 6); - NBTTagList nbttaglist1 = tagCompund.getTagList("Motion", 6); - NBTTagList nbttaglist2 = tagCompund.getTagList("Rotation", 5); - this.motionX = nbttaglist1.getDoubleAt(0); - this.motionY = nbttaglist1.getDoubleAt(1); - this.motionZ = nbttaglist1.getDoubleAt(2); - if (Math.abs(this.motionX) > 10.0D) { - this.motionX = 0.0D; - } - - if (Math.abs(this.motionY) > 10.0D) { - this.motionY = 0.0D; - } - - if (Math.abs(this.motionZ) > 10.0D) { - this.motionZ = 0.0D; - } - - this.prevPosX = this.lastTickPosX = this.posX = nbttaglist.getDoubleAt(0); - this.prevPosY = this.lastTickPosY = this.posY = nbttaglist.getDoubleAt(1); - this.prevPosZ = this.lastTickPosZ = this.posZ = nbttaglist.getDoubleAt(2); - this.prevRotationYaw = this.rotationYaw = nbttaglist2.getFloatAt(0); - this.prevRotationPitch = this.rotationPitch = nbttaglist2.getFloatAt(1); - this.setRotationYawHead(this.rotationYaw); - this.func_181013_g(this.rotationYaw); - this.fallDistance = tagCompund.getFloat("FallDistance"); - this.fire = tagCompund.getShort("Fire"); - this.setAir(tagCompund.getShort("Air")); - this.onGround = tagCompund.getBoolean("OnGround"); - this.dimension = tagCompund.getInteger("Dimension"); - this.invulnerable = tagCompund.getBoolean("Invulnerable"); - this.timeUntilPortal = tagCompund.getInteger("PortalCooldown"); - if (tagCompund.hasKey("UUIDMost", 4) && tagCompund.hasKey("UUIDLeast", 4)) { - this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"), - tagCompund.getLong("UUIDLeast")); - } else if (tagCompund.hasKey("UUID", 8)) { - this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID")); - } - - this.setPosition(this.posX, this.posY, this.posZ); - this.setRotation(this.rotationYaw, this.rotationPitch); - if (tagCompund.hasKey("CustomName", 8) && tagCompund.getString("CustomName").length() > 0) { - this.setCustomNameTag(tagCompund.getString("CustomName")); - } - - this.setAlwaysRenderNameTag(tagCompund.getBoolean("CustomNameVisible")); - this.cmdResultStats.readStatsFromNBT(tagCompund); - this.setSilent(tagCompund.getBoolean("Silent")); - this.readEntityFromNBT(tagCompund); - if (this.shouldSetPosAfterLoading()) { - this.setPosition(this.posX, this.posY, this.posZ); - } - - } catch (Throwable throwable) { - CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Loading entity NBT"); - CrashReportCategory crashreportcategory = crashreport.makeCategory("Entity being loaded"); - this.addEntityCrashInfo(crashreportcategory); - throw new ReportedException(crashreport); - } - } - - protected boolean shouldSetPosAfterLoading() { - return true; - } - - /**+ - * Returns the string that identifies this Entity's class - */ - protected final String getEntityString() { - return EntityList.getEntityString(this); - } - - protected abstract void readEntityFromNBT(NBTTagCompound var1); - - protected abstract void writeEntityToNBT(NBTTagCompound var1); - - public void onChunkLoad() { - } - - /**+ - * creates a NBT list from the array of doubles passed to this - * function - */ - protected NBTTagList newDoubleNBTList(double... numbers) { - NBTTagList nbttaglist = new NBTTagList(); - - for (int i = 0; i < numbers.length; ++i) { - nbttaglist.appendTag(new NBTTagDouble(numbers[i])); - } - - return nbttaglist; - } - - /**+ - * Returns a new NBTTagList filled with the specified floats - */ - protected NBTTagList newFloatNBTList(float... numbers) { - NBTTagList nbttaglist = new NBTTagList(); - - for (int i = 0; i < numbers.length; ++i) { - nbttaglist.appendTag(new NBTTagFloat(numbers[i])); - } - - return nbttaglist; - } - - public EntityItem dropItem(Item itemIn, int size) { - return this.dropItemWithOffset(itemIn, size, 0.0F); - } - - public EntityItem dropItemWithOffset(Item itemIn, int size, float offsetY) { - return this.entityDropItem(new ItemStack(itemIn, size, 0), offsetY); - } - - /**+ - * Drops an item at the position of the entity. - */ - public EntityItem entityDropItem(ItemStack itemStackIn, float offsetY) { - if (itemStackIn.stackSize != 0 && itemStackIn.getItem() != null) { - EntityItem entityitem = new EntityItem(this.worldObj, this.posX, this.posY + (double) offsetY, this.posZ, - itemStackIn); - entityitem.setDefaultPickupDelay(); - this.worldObj.spawnEntityInWorld(entityitem); - return entityitem; - } else { - return null; - } - } - - /**+ - * Checks whether target entity is alive. - */ - public boolean isEntityAlive() { - return !this.isDead; - } - - /**+ - * Checks if this entity is inside of an opaque block - */ - public boolean isEntityInsideOpaqueBlock() { - if (this.noClip) { - return false; - } else { - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(Integer.MIN_VALUE, - Integer.MIN_VALUE, Integer.MIN_VALUE); - - for (int i = 0; i < 8; ++i) { - int j = MathHelper.floor_double( - this.posY + (double) (((float) ((i >> 0) % 2) - 0.5F) * 0.1F) + (double) this.getEyeHeight()); - int k = MathHelper - .floor_double(this.posX + (double) (((float) ((i >> 1) % 2) - 0.5F) * this.width * 0.8F)); - int l = MathHelper - .floor_double(this.posZ + (double) (((float) ((i >> 2) % 2) - 0.5F) * this.width * 0.8F)); - if (blockpos$mutableblockpos.getX() != k || blockpos$mutableblockpos.getY() != j - || blockpos$mutableblockpos.getZ() != l) { - blockpos$mutableblockpos.func_181079_c(k, j, l); - if (this.worldObj.getBlockState(blockpos$mutableblockpos).getBlock().isVisuallyOpaque()) { - return true; - } - } - } - - return false; - } - } - - /**+ - * First layer of player interaction - */ - public boolean interactFirst(EntityPlayer playerIn) { - return false; - } - - /**+ - * Returns a boundingBox used to collide the entity with other - * entities and blocks. This enables the entity to be pushable - * on contact, like boats or minecarts. - */ - public AxisAlignedBB getCollisionBox(Entity entityIn) { - return null; - } - - /**+ - * Handles updating while being ridden by an entity - */ - public void updateRidden() { - if (this.ridingEntity.isDead) { - this.ridingEntity = null; - } else { - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - this.onUpdate(); - if (this.ridingEntity != null) { - this.ridingEntity.updateRiderPosition(); - this.entityRiderYawDelta += (double) (this.ridingEntity.rotationYaw - - this.ridingEntity.prevRotationYaw); - - for (this.entityRiderPitchDelta += (double) (this.ridingEntity.rotationPitch - - this.ridingEntity.prevRotationPitch); this.entityRiderYawDelta >= 180.0D; this.entityRiderYawDelta -= 360.0D) { - ; - } - - while (this.entityRiderYawDelta < -180.0D) { - this.entityRiderYawDelta += 360.0D; - } - - while (this.entityRiderPitchDelta >= 180.0D) { - this.entityRiderPitchDelta -= 360.0D; - } - - while (this.entityRiderPitchDelta < -180.0D) { - this.entityRiderPitchDelta += 360.0D; - } - - double d0 = this.entityRiderYawDelta * 0.5D; - double d1 = this.entityRiderPitchDelta * 0.5D; - float f = 10.0F; - if (d0 > (double) f) { - d0 = (double) f; - } - - if (d0 < (double) (-f)) { - d0 = (double) (-f); - } - - if (d1 > (double) f) { - d1 = (double) f; - } - - if (d1 < (double) (-f)) { - d1 = (double) (-f); - } - - this.entityRiderYawDelta -= d0; - this.entityRiderPitchDelta -= d1; - } - } - } - - public void updateRiderPosition() { - if (this.riddenByEntity != null) { - this.riddenByEntity.setPosition(this.posX, - this.posY + this.getMountedYOffset() + this.riddenByEntity.getYOffset(), this.posZ); - } - } - - /**+ - * Returns the Y Offset of this entity. - */ - public double getYOffset() { - return 0.0D; - } - - /**+ - * Returns the Y offset from the entity's position for any - * entity riding this one. - */ - public double getMountedYOffset() { - return (double) this.height * 0.75D; - } - - /**+ - * Called when a player mounts an entity. e.g. mounts a pig, - * mounts a boat. - */ - public void mountEntity(Entity entity) { - this.entityRiderPitchDelta = 0.0D; - this.entityRiderYawDelta = 0.0D; - if (entity == null) { - if (this.ridingEntity != null) { - this.setLocationAndAngles(this.ridingEntity.posX, - this.ridingEntity.getEntityBoundingBox().minY + (double) this.ridingEntity.height, - this.ridingEntity.posZ, this.rotationYaw, this.rotationPitch); - this.ridingEntity.riddenByEntity = null; - } - - this.ridingEntity = null; - } else { - if (this.ridingEntity != null) { - this.ridingEntity.riddenByEntity = null; - } - - if (entity != null) { - for (Entity entity1 = entity.ridingEntity; entity1 != null; entity1 = entity1.ridingEntity) { - if (entity1 == this) { - return; - } - } - } - - this.ridingEntity = entity; - entity.riddenByEntity = this; - } - } - - public void setPositionAndRotation2(double d0, double d1, double d2, float f, float f1, int var9, boolean var10) { - this.setPosition(d0, d1, d2); - this.setRotation(f, f1); - List list = this.worldObj.getCollidingBoundingBoxes(this, - this.getEntityBoundingBox().contract(0.03125D, 0.0D, 0.03125D)); - if (!list.isEmpty()) { - double d3 = 0.0D; - - for (AxisAlignedBB axisalignedbb : (List) list) { - if (axisalignedbb.maxY > d3) { - d3 = axisalignedbb.maxY; - } - } - - d1 = d1 + (d3 - this.getEntityBoundingBox().minY); - this.setPosition(d0, d1, d2); - } - - } - - public float getCollisionBorderSize() { - return 0.1F; - } - - /**+ - * returns a (normalized) vector of where this entity is looking - */ - public Vec3 getLookVec() { - return null; - } - - public void func_181015_d(BlockPos parBlockPos) { - if (this.timeUntilPortal > 0) { - this.timeUntilPortal = this.getPortalCooldown(); - } else { - if (!this.worldObj.isRemote && !parBlockPos.equals(this.field_181016_an)) { - this.field_181016_an = parBlockPos; - BlockPattern.PatternHelper blockpattern$patternhelper = Blocks.portal.func_181089_f(this.worldObj, - parBlockPos); - double d0 = blockpattern$patternhelper.getFinger().getAxis() == EnumFacing.Axis.X - ? (double) blockpattern$patternhelper.func_181117_a().getZ() - : (double) blockpattern$patternhelper.func_181117_a().getX(); - double d1 = blockpattern$patternhelper.getFinger().getAxis() == EnumFacing.Axis.X ? this.posZ - : this.posX; - d1 = Math.abs(MathHelper.func_181160_c( - d1 - (double) (blockpattern$patternhelper.getFinger().rotateY() - .getAxisDirection() == EnumFacing.AxisDirection.NEGATIVE ? 1 : 0), - d0, d0 - (double) blockpattern$patternhelper.func_181118_d())); - double d2 = MathHelper.func_181160_c(this.posY - 1.0D, - (double) blockpattern$patternhelper.func_181117_a().getY(), - (double) (blockpattern$patternhelper.func_181117_a().getY() - - blockpattern$patternhelper.func_181119_e())); - this.field_181017_ao = new Vec3(d1, d2, 0.0D); - this.field_181018_ap = blockpattern$patternhelper.getFinger(); - } - - this.inPortal = true; - } - } - - /**+ - * Return the amount of cooldown before this entity can use a - * portal again. - */ - public int getPortalCooldown() { - return 300; - } - - /**+ - * Sets the velocity to the args. Args: x, y, z - */ - public void setVelocity(double x, double y, double z) { - this.motionX = x; - this.motionY = y; - this.motionZ = z; - } - - public void handleStatusUpdate(byte id) { - } - - /**+ - * Setups the entity to do the hurt animation. Only used by - * packets in multiplayer. - */ - public void performHurtAnimation() { - } - - /**+ - * returns the inventory of this entity (only used in - * EntityPlayerMP it seems) - */ - public ItemStack[] getInventory() { - return null; - } - - /**+ - * Sets the held item, or an armor slot. Slot 0 is held item. - * Slot 1-4 is armor. Params: Item, slot - */ - public void setCurrentItemOrArmor(int var1, ItemStack var2) { - } - - /**+ - * Returns true if the entity is on fire. Used by render to add - * the fire effect on rendering. - */ - public boolean isBurning() { - boolean flag = this.worldObj != null && this.worldObj.isRemote; - return !this.isImmuneToFire && (this.fire > 0 || flag && this.getFlag(0)); - } - - /**+ - * Returns true if the entity is riding another entity, used by - * render to rotate the legs to be in 'sit' position for - * players. - */ - public boolean isRiding() { - return this.ridingEntity != null; - } - - /**+ - * Returns if this entity is sneaking. - */ - public boolean isSneaking() { - return this.getFlag(1); - } - - /**+ - * Sets the sneaking flag. - */ - public void setSneaking(boolean sneaking) { - this.setFlag(1, sneaking); - } - - /**+ - * Get if the Entity is sprinting. - */ - public boolean isSprinting() { - return this.getFlag(3); - } - - /**+ - * Set sprinting switch for Entity. - */ - public void setSprinting(boolean flag) { - this.setFlag(3, flag); - } - - public boolean isInvisible() { - return this.getFlag(5); - } - - /**+ - * Only used by renderer in EntityLivingBase - * subclasses.\nDetermines if an entity is visible or not to a - * specfic player, if the entity is normally invisible.\nFor - * EntityLivingBase subclasses, returning false when invisible - * will render the entity semitransparent. - */ - public boolean isInvisibleToPlayer(EntityPlayer player) { - return player.isSpectator() ? false : this.isInvisible(); - } - - public void setInvisible(boolean invisible) { - this.setFlag(5, invisible); - } - - public boolean isEating() { - return this.getFlag(4); - } - - public void setEating(boolean eating) { - this.setFlag(4, eating); - } - - /**+ - * Returns true if the flag is active for the entity. Known - * flags: 0) is burning; 1) is sneaking; 2) is riding something; - * 3) is sprinting; 4) is eating - */ - protected boolean getFlag(int flag) { - return (this.dataWatcher.getWatchableObjectByte(0) & 1 << flag) != 0; - } - - /**+ - * Enable or disable a entity flag, see getEntityFlag to read - * the know flags. - */ - protected void setFlag(int flag, boolean set) { - byte b0 = this.dataWatcher.getWatchableObjectByte(0); - if (set) { - this.dataWatcher.updateObject(0, Byte.valueOf((byte) (b0 | 1 << flag))); - } else { - this.dataWatcher.updateObject(0, Byte.valueOf((byte) (b0 & ~(1 << flag)))); - } - - } - - public int getAir() { - return this.dataWatcher.getWatchableObjectShort(1); - } - - public void setAir(int air) { - this.dataWatcher.updateObject(1, Short.valueOf((short) air)); - } - - /**+ - * Called when a lightning bolt hits the entity. - */ - public void onStruckByLightning(EntityLightningBolt lightningBolt) { - this.attackEntityFrom(DamageSource.lightningBolt, 5.0F); - ++this.fire; - if (this.fire == 0) { - this.setFire(8); - } - - } - - /**+ - * This method gets called when the entity kills another one. - */ - public void onKillEntity(EntityLivingBase entityLivingIn) { - } - - protected boolean pushOutOfBlocks(double d0, double d1, double d2) { - BlockPos blockpos = new BlockPos(d0, d1, d2); - double d3 = d0 - (double) blockpos.getX(); - double d4 = d1 - (double) blockpos.getY(); - double d5 = d2 - (double) blockpos.getZ(); - List list = this.worldObj.func_147461_a(this.getEntityBoundingBox()); - if (list.isEmpty() && !this.worldObj.isBlockFullCube(blockpos)) { - return false; - } else { - byte b0 = 3; - double d6 = 9999.0D; - if (!this.worldObj.isBlockFullCube(blockpos.west()) && d3 < d6) { - d6 = d3; - b0 = 0; - } - - if (!this.worldObj.isBlockFullCube(blockpos.east()) && 1.0D - d3 < d6) { - d6 = 1.0D - d3; - b0 = 1; - } - - if (!this.worldObj.isBlockFullCube(blockpos.up()) && 1.0D - d4 < d6) { - d6 = 1.0D - d4; - b0 = 3; - } - - if (!this.worldObj.isBlockFullCube(blockpos.north()) && d5 < d6) { - d6 = d5; - b0 = 4; - } - - if (!this.worldObj.isBlockFullCube(blockpos.south()) && 1.0D - d5 < d6) { - d6 = 1.0D - d5; - b0 = 5; - } - - float f = this.rand.nextFloat() * 0.2F + 0.1F; - if (b0 == 0) { - this.motionX = (double) (-f); - } - - if (b0 == 1) { - this.motionX = (double) f; - } - - if (b0 == 3) { - this.motionY = (double) f; - } - - if (b0 == 4) { - this.motionZ = (double) (-f); - } - - if (b0 == 5) { - this.motionZ = (double) f; - } - - return true; - } - } - - /**+ - * Sets the Entity inside a web block. - */ - public void setInWeb() { - this.isInWeb = true; - this.fallDistance = 0.0F; - } - - /**+ - * Gets the name of this command sender (usually username, but - * possibly "Rcon") - */ - public String getName() { - if (this.hasCustomName()) { - return this.getCustomNameTag(); - } else { - String s = EntityList.getEntityString(this); - if (s == null) { - s = "generic"; - } - - return StatCollector.translateToLocal("entity." + s + ".name"); - } - } - - /** - * + - * Return the Entity parts making up this Entity (currently only - * for dragons) - */ - public Entity[] getParts() { - return null; - } - - /**+ - * Returns true if Entity argument is equal to this Entity - */ - public boolean isEntityEqual(Entity entityIn) { - return this == entityIn; - } - - public float getRotationYawHead() { - return 0.0F; - } - - /**+ - * Sets the head's yaw rotation of the entity. - */ - public void setRotationYawHead(float rotation) { - } - - public void func_181013_g(float parFloat1) { - } - - /**+ - * If returns false, the item will not inflict any damage - * against entities. - */ - public boolean canAttackWithItem() { - return true; - } - - /**+ - * Called when a player attacks an entity. If this returns true - * the attack will not happen. - */ - public boolean hitByEntity(Entity entityIn) { - return false; - } - - public String toString() { - return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", - new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.entityId), - this.worldObj == null ? "~NULL~" : this.worldObj.getWorldInfo().getWorldName(), - Double.valueOf(this.posX), Double.valueOf(this.posY), Double.valueOf(this.posZ) }); - } - - public boolean isEntityInvulnerable(DamageSource source) { - return this.invulnerable && source != DamageSource.outOfWorld && !source.isCreativePlayer(); - } - - /**+ - * Sets this entity's location and angles to the location and - * angles of the passed in entity. - */ - public void copyLocationAndAnglesFrom(Entity entityIn) { - this.setLocationAndAngles(entityIn.posX, entityIn.posY, entityIn.posZ, entityIn.rotationYaw, - entityIn.rotationPitch); - } - - /**+ - * Prepares this entity in new dimension by copying NBT data - * from entity in old dimension - */ - public void copyDataFromOld(Entity entityIn) { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - entityIn.writeToNBT(nbttagcompound); - this.readFromNBT(nbttagcompound); - this.timeUntilPortal = entityIn.timeUntilPortal; - this.field_181016_an = entityIn.field_181016_an; - this.field_181017_ao = entityIn.field_181017_ao; - this.field_181018_ap = entityIn.field_181018_ap; - } - - /**+ - * Teleports the entity to another dimension. Params: Dimension - * number to teleport to - */ - public void travelToDimension(int i) { - if (!this.worldObj.isRemote && !this.isDead) { - MinecraftServer minecraftserver = MinecraftServer.getServer(); - int j = this.dimension; - WorldServer worldserver = minecraftserver.worldServerForDimension(j); - WorldServer worldserver1 = minecraftserver.worldServerForDimension(i); - this.dimension = i; - if (j == 1 && i == 1) { - worldserver1 = minecraftserver.worldServerForDimension(0); - this.dimension = 0; - } - - this.worldObj.removeEntity(this); - this.isDead = false; - minecraftserver.getConfigurationManager().transferEntityToWorld(this, j, worldserver, worldserver1); - Entity entity = EntityList.createEntityByName(EntityList.getEntityString(this), worldserver1); - if (entity != null) { - entity.copyDataFromOld(this); - if (j == 1 && i == 1) { - BlockPos blockpos = this.worldObj.getTopSolidOrLiquidBlock(worldserver1.getSpawnPoint()); - entity.moveToBlockPosAndAngles(blockpos, entity.rotationYaw, entity.rotationPitch); - } - - worldserver1.spawnEntityInWorld(entity); - } - - this.isDead = true; - worldserver.resetUpdateEntityTick(); - worldserver1.resetUpdateEntityTick(); - } - } - - /**+ - * Explosion resistance of a block relative to this entity - */ - public float getExplosionResistance(Explosion explosionIn, World worldIn, BlockPos pos, IBlockState blockStateIn) { - return blockStateIn.getBlock().getExplosionResistance(this); - } - - public boolean verifyExplosion(Explosion explosionIn, World worldIn, BlockPos pos, IBlockState blockStateIn, - float parFloat1) { - return true; - } - - /**+ - * The maximum height from where the entity is alowed to jump - * (used in pathfinder) - */ - public int getMaxFallHeight() { - return 3; - } - - public Vec3 func_181014_aG() { - return this.field_181017_ao; - } - - public EnumFacing func_181012_aH() { - return this.field_181018_ap; - } - - /**+ - * Return whether this entity should NOT trigger a pressure - * plate or a tripwire. - */ - public boolean doesEntityNotTriggerPressurePlate() { - return false; - } - - public void addEntityCrashInfo(CrashReportCategory category) { - category.addCrashSectionCallable("Entity Type", new Callable() { - public String call() throws Exception { - return EntityList.getEntityString(Entity.this) + " (" + Entity.this.getClass().getCanonicalName() + ")"; - } - }); - category.addCrashSection("Entity ID", Integer.valueOf(this.entityId)); - category.addCrashSectionCallable("Entity Name", new Callable() { - public String call() throws Exception { - return Entity.this.getName(); - } - }); - category.addCrashSection("Entity\'s Exact location", String.format("%.2f, %.2f, %.2f", - new Object[] { Double.valueOf(this.posX), Double.valueOf(this.posY), Double.valueOf(this.posZ) })); - category.addCrashSection("Entity\'s Block location", - CrashReportCategory.getCoordinateInfo((double) MathHelper.floor_double(this.posX), - (double) MathHelper.floor_double(this.posY), (double) MathHelper.floor_double(this.posZ))); - category.addCrashSection("Entity\'s Momentum", String.format("%.2f, %.2f, %.2f", new Object[] { - Double.valueOf(this.motionX), Double.valueOf(this.motionY), Double.valueOf(this.motionZ) })); - category.addCrashSectionCallable("Entity\'s Rider", new Callable() { - public String call() throws Exception { - return Entity.this.riddenByEntity.toString(); - } - }); - category.addCrashSectionCallable("Entity\'s Vehicle", new Callable() { - public String call() throws Exception { - return Entity.this.ridingEntity.toString(); - } - }); - } - - /**+ - * Return whether this entity should be rendered as on fire. - */ - public boolean canRenderOnFire() { - return this.isBurning(); - } - - public EaglercraftUUID getUniqueID() { - return this.entityUniqueID; - } - - public boolean isPushedByWater() { - return true; - } - - /**+ - * Get the formatted ChatComponent that will be used for the - * sender's username in chat - */ - public IChatComponent getDisplayName() { - ChatComponentText chatcomponenttext = new ChatComponentText(this.getName()); - chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent()); - chatcomponenttext.getChatStyle().setInsertion(this.getUniqueID().toString()); - return chatcomponenttext; - } - public IChatComponent getDisplayNameProfanityFilter() { ChatComponentText chatcomponenttext = new ChatComponentText(this.getNameProfanityFilter()); chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent()); @@ -4823,7 +2383,8 @@ public abstract class Entity implements ICommandSender { return chatcomponenttext; } - /**+ + /** + * + * Sets the custom name tag for this entity */ public void setCustomNameTag(String name) { @@ -4834,6 +2395,7 @@ public abstract class Entity implements ICommandSender { return this.dataWatcher.getWatchableObjectString(2); } + private String lastNameTagForFilter = null; private String lastFilteredNameTagForFilter = null; @@ -4854,7 +2416,8 @@ public abstract class Entity implements ICommandSender { } } - /**+ + /** + * + * Returns true if this thing is named */ public boolean hasCustomName() { @@ -4869,7 +2432,8 @@ public abstract class Entity implements ICommandSender { return this.dataWatcher.getWatchableObjectByte(3) == 1; } - /**+ + /** + * + * Sets the position of the entity and updates the 'last' * variables */ @@ -4929,13 +2493,15 @@ public abstract class Entity implements ICommandSender { return false; } - /**+ + /** + * + * Send a chat message to the CommandSender */ public void addChatMessage(IChatComponent var1) { } - /**+ + /** + * + * Returns {@code true} if the CommandSender is allowed to * execute the command, {@code false} if not */ @@ -4943,7 +2509,8 @@ public abstract class Entity implements ICommandSender { return true; } - /**+ + /** + * + * Get the position in the world. {@code null} is not * allowed! If you are not an entity in the world, return * the coordinates 0, 0, 0 @@ -4952,7 +2519,8 @@ public abstract class Entity implements ICommandSender { return new BlockPos(this.posX, this.posY + 0.5D, this.posZ); } - /**+ + /** + * + * Get the position vector. {@code null} is not allowed! * If you are not an entity in the world, return 0.0D, 0.0D, * 0.0D @@ -4961,7 +2529,8 @@ public abstract class Entity implements ICommandSender { return new Vec3(this.posX, this.posY, this.posZ); } - /**+ + /** + * + * Get the world, if available. {@code null} is not * allowed! If you are not an entity in the world, return * the overworld @@ -4970,7 +2539,8 @@ public abstract class Entity implements ICommandSender { return this.worldObj; } - /**+ + /** + * + * Returns the entity associated with the command sender. MAY BE * NULL! */ @@ -4978,7 +2548,8 @@ public abstract class Entity implements ICommandSender { return this; } - /**+ + /** + * + * Returns true if the command sender should be sent feedback * about executed commands */ @@ -5002,14 +2573,16 @@ public abstract class Entity implements ICommandSender { return null; } - /**+ + /** + * + * Called when client receives entity's NBTTagCompound from * server. */ public void clientUpdateEntityNBT(NBTTagCompound compound) { } - /**+ + /** + * + * New version of interactWith that includes vector information * on where precisely the player targeted. */ @@ -5082,5 +2655,4 @@ public abstract class Entity implements ICommandSender { } return 0.0f; } ->>>>>>> b302c97c (u37):src/game/java/net/minecraft/entity/Entity.java } \ No newline at end of file diff --git a/src/game/java/net/minecraft/entity/ai/EntityAITasks.java b/src/game/java/net/minecraft/entity/ai/EntityAITasks.java index 2242461..6705d6c 100644 --- a/src/game/java/net/minecraft/entity/ai/EntityAITasks.java +++ b/src/game/java/net/minecraft/entity/ai/EntityAITasks.java @@ -51,8 +51,7 @@ public class EntityAITasks { private int tickCount; private int tickRate = 3; - public EntityAITasks(Profiler profilerIn) { - this.theProfiler = profilerIn; + public EntityAITasks() { } /**+ diff --git a/src/game/java/net/minecraft/item/ItemStack.java b/src/game/java/net/minecraft/item/ItemStack.java index affd3fe..5c9b534 100644 --- a/src/game/java/net/minecraft/item/ItemStack.java +++ b/src/game/java/net/minecraft/item/ItemStack.java @@ -684,7 +684,7 @@ public final class ItemStack { } public List getTooltipImpl(EntityPlayer playerIn, boolean advanced, boolean profanityFilter) { - ArrayList arraylist = Lists.newArrayList(); + ArrayList list = Lists.newArrayList(); String s = profanityFilter ? this.getDisplayNameProfanityFilter() : this.getDisplayName(); if (this.hasDisplayName()) { s = EnumChatFormatting.ITALIC + s; diff --git a/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java b/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java index 465fe9b..774ff12 100644 --- a/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java +++ b/src/game/java/net/minecraft/server/network/NetHandlerLoginServer.java @@ -28,31 +28,22 @@ import org.apache.commons.lang3.Validate; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -/** - * + +/**+ * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. * * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team * - * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, hoosiertransfer, - * ayunami2000. All Rights Reserved. + * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * @@ -77,8 +68,7 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable this.networkManager = parNetworkManager; } - /** - * + + /**+ * Like the old updateEntity(), except more generic. */ public void update() { @@ -157,8 +147,7 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable } - /** - * + + /**+ * Invoked when disconnecting, the parameter is a ChatComponent * describing the reason for termination */ diff --git a/src/game/java/net/minecraft/world/World.java b/src/game/java/net/minecraft/world/World.java index 314b693..fa58d4c 100644 --- a/src/game/java/net/minecraft/world/World.java +++ b/src/game/java/net/minecraft/world/World.java @@ -176,7 +176,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL private LightingEngine alfheim$lightingEngine; - protected World(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, Profiler profilerIn, + protected World(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, boolean client) { this.ambientTickCountdown = this.rand.nextInt(12000); this.spawnHostileMobs = true; diff --git a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java index 52cd1c8..05cee56 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java @@ -4,7 +4,6 @@ import net.hoosiertransfer.Alfheim.util.ClampUtil; import net.hoosiertransfer.Alfheim.util.DeduplicatedLongQueue; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.profiler.Profiler; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3i; @@ -21,8 +20,6 @@ public class LightingEngine { private final World world; - private final Profiler profiler; - private final DeduplicatedLongQueue[] lightUpdateQueues = new DeduplicatedLongQueue[EnumSkyBlock.values().length]; private final DeduplicatedLongQueue[] darkeningQueues = new DeduplicatedLongQueue[MAX_LIGHT_LEVEL + 1]; @@ -75,7 +72,6 @@ public class LightingEngine { public LightingEngine(final World world) { this.world = world; - profiler = world.theProfiler; initialBrightenings = new DeduplicatedLongQueue(16384); initialDarkenings = new DeduplicatedLongQueue(16384); @@ -115,11 +111,7 @@ public class LightingEngine { if (queue.isEmpty()) return; - profiler.startSection("process"); - processLightUpdatesForTypeInner(lightType, queue); - - profiler.endSection(); } private boolean isCallingFromMainThread() { @@ -127,15 +119,8 @@ public class LightingEngine { } public void processLightUpdates() { - profiler.startSection("processSky"); - processLightUpdatesForType(EnumSkyBlock.SKY); - - profiler.endStartSection("processBlock"); - processLightUpdatesForType(EnumSkyBlock.BLOCK); - - profiler.endSection(); } private void processLightUpdatesForTypeInner(final EnumSkyBlock lightType, final DeduplicatedLongQueue queue) { @@ -152,8 +137,6 @@ public class LightingEngine { if (currentQueue != null) currentQueue.clearSet(); - profiler.startSection("prepare"); - // Process the queued updates and enqueue them for further processing while (nextItem()) { if (currentChunk == null) @@ -171,8 +154,6 @@ public class LightingEngine { // scheduling } - profiler.endStartSection("enqueueBrightening"); - currentQueue = initialBrightenings; if (currentQueue != null) @@ -192,8 +173,6 @@ public class LightingEngine { // for later } - profiler.endStartSection("enqueueDarkening"); - currentQueue = initialDarkenings; if (currentQueue != null) @@ -207,8 +186,6 @@ public class LightingEngine { // to only schedule once } - profiler.endStartSection("process"); - // Iterate through enqueued updates (brightening and darkening in parallel) from // brightest to darkest so that we only need to iterate once for (byte currentLight = MAX_LIGHT_LEVEL; currentLight >= 0; --currentLight) { @@ -294,9 +271,7 @@ public class LightingEngine { } } } - - profiler.endSection(); - + updating = false; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 7c281d7..8382fdb 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -42,6 +42,12 @@ public class EaglercraftVersion { public static final BigInteger updateSignatureModulus = new BigInteger( "9934844152704206425984038360710846195785255499658630347555679233517037320419089417353684680137701223265944443284321705629368787894053054988233896240570752560271396448764359123258518818693879688207544671033079915029195517675413202427147319375331350380376604266826560830299822638274516845927247015696509586216934495843289602444650044805651410710164106192952455213102521880119736500301420208590760465989706511018182601545217390196438291842825959549203290633490664834390313090964927686415922400638755956780717898579080985306487440294133874610155281675147758926351882699414541707391045631732309999601681661304360813629331"); + // Client brand identification system configuration + + public static final EaglercraftUUID clientBrandUUID = EagUtils.makeClientBrandUUID(projectForkName); + + public static final EaglercraftUUID legacyClientUUIDInSharedWorld = EagUtils.makeClientBrandUUIDLegacy(projectOriginName); + // Miscellaneous variables: public static final String mainMenuStringA = "Minecraft 1.9.4"; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java index 31b2d68..509a749 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/GLObjectMap.java @@ -60,6 +60,10 @@ public class GLObjectMap { return (T) values[obj]; } + public void set(int obj, T val) { + values[obj] = val; + } + private void resize() { int oldSize = size; size += size / 2; @@ -74,4 +78,4 @@ public class GLObjectMap { insertIndex = 0; allocatedObjects = 0; } -} +} \ No newline at end of file