diff --git a/src/main/java/net/hoosiertransfer/Alfheim/IChunkLightingData.java b/src/main/java/net/hoosiertransfer/Alfheim/IChunkLightingData.java index 2fea94a..9174440 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/IChunkLightingData.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/IChunkLightingData.java @@ -1,6 +1,6 @@ package net.hoosiertransfer.Alfheim; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; public interface IChunkLightingData { diff --git a/src/main/java/net/hoosiertransfer/Alfheim/ILightInfoProvider.java b/src/main/java/net/hoosiertransfer/Alfheim/ILightInfoProvider.java index 7ff7024..fe66a66 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/ILightInfoProvider.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/ILightInfoProvider.java @@ -1,7 +1,7 @@ package net.hoosiertransfer.Alfheim; import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; @@ -9,7 +9,8 @@ public interface ILightInfoProvider { int alfheim$getLightFor(final IBlockAccess iBlockAccess, final EnumSkyBlock lightType, final BlockPos blockPos); - boolean alfheim$useNeighborBrightness(final EnumFacing facing, final IBlockAccess blockAccess, final BlockPos blockPos); + boolean alfheim$useNeighborBrightness(final EnumFacing facing, final IBlockAccess blockAccess, + final BlockPos blockPos); int alfheim$getLightOpacity(final EnumFacing facing, final IBlockAccess blockAccess, final BlockPos blockPos); } \ No newline at end of file diff --git a/src/main/java/net/hoosiertransfer/Alfheim/ILightLevelProvider.java b/src/main/java/net/hoosiertransfer/Alfheim/ILightLevelProvider.java index 0def865..92b96b4 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/ILightLevelProvider.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/ILightLevelProvider.java @@ -1,6 +1,6 @@ package net.hoosiertransfer.Alfheim; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; /** diff --git a/src/main/java/net/hoosiertransfer/Alfheim/ILitBlock.java b/src/main/java/net/hoosiertransfer/Alfheim/ILitBlock.java index 8226dec..4389c4a 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/ILitBlock.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/ILitBlock.java @@ -1,13 +1,18 @@ package net.hoosiertransfer.Alfheim; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; public interface ILitBlock { - int alfheim$getLightFor(final IBlockState blockState, final IBlockAccess blockAccess, final EnumSkyBlock lightType, final BlockPos blockPos); - boolean alfheim$useNeighborBrightness(final IBlockState blockState, final EnumFacing facing, final IBlockAccess blockAccess, final BlockPos blockPos); - int alfheim$getLightOpacity(final IBlockState blockState, final EnumFacing facing, final IBlockAccess blockAccess, final BlockPos blockPos); + int alfheim$getLightFor(final IBlockState blockState, final IBlockAccess blockAccess, final EnumSkyBlock lightType, + final BlockPos blockPos); + + boolean alfheim$useNeighborBrightness(final IBlockState blockState, final EnumFacing facing, + final IBlockAccess blockAccess, final BlockPos blockPos); + + int alfheim$getLightOpacity(final IBlockState blockState, final EnumFacing facing, final IBlockAccess blockAccess, + final BlockPos blockPos); } diff --git a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightUtil.java b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightUtil.java index 72f5dde..87127e9 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightUtil.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightUtil.java @@ -1,11 +1,12 @@ package net.hoosiertransfer.Alfheim.lighting; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class LightUtil { - public static int getLightValueForState(final IBlockState blockState, final IBlockAccess blockAccess, final BlockPos blockPos) { + public static int getLightValueForState(final IBlockState blockState, final IBlockAccess blockAccess, + final BlockPos blockPos) { return blockState.getLightValue(blockAccess, blockPos); } } diff --git a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java index 52cd1c8..8b176e1 100644 --- a/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java +++ b/src/main/java/net/hoosiertransfer/Alfheim/lighting/LightingEngine.java @@ -5,10 +5,10 @@ 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; -import net.minecraft.util.BlockPos.MutableBlockPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.BlockPos.MutableBlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/hoosiertransfer/Culling/CullTask.java b/src/main/java/net/hoosiertransfer/Culling/CullTask.java index 54e442e..e7d5c57 100644 --- a/src/main/java/net/hoosiertransfer/Culling/CullTask.java +++ b/src/main/java/net/hoosiertransfer/Culling/CullTask.java @@ -12,13 +12,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; public class CullTask implements Runnable { public boolean requestCull = false; - + private final OcclusionCullingInstance culling; private final Set unCullable; private final Minecraft client = Minecraft.getMinecraft(); @@ -29,7 +28,7 @@ public class CullTask implements Runnable { private Vec3d lastPos = new Vec3d(0, 0, 0); private Vec3d aabbMin = new Vec3d(0, 0, 0); - private Vec3d aabbMax = new Vec3d(0, 0, 0); + private Vec3d aabbMax = new Vec3d(0, 0, 0); public CullTask(OcclusionCullingInstance culling, Set unCullable) { this.culling = culling; @@ -39,87 +38,99 @@ public class CullTask implements Runnable { @Override public void run() { // while (client != null) { - // try { - // Thread.sleep(Config.SleepDuration); + // try { + // Thread.sleep(Config.SleepDuration); - // if (Config.enableCulling && client.theWorld != null && client.thePlayer != null && client.thePlayer.ticksExisted > 0 && client.getRenderViewEntity() != null) { - // Vec3 cameraMC = getCameraPos(); - // if (requestCull || !(cameraMC.xCoord == lastPos.x && cameraMC.yCoord == lastPos.y && cameraMC.zCoord == lastPos.z)) { - // long start = System.currentTimeMillis(); - // requestCull = false; - // lastPos.set(cameraMC.xCoord, cameraMC.yCoord, cameraMC.zCoord); - // Vec3d camera = lastPos; - // culling.resetCache(); - // boolean noCulling = client.thePlayer.isSpectator() || client.gameSettings.thirdPersonView != 0; - // Iterator iterator = client.theWorld.loadedTileEntityList.iterator(); - // TileEntity entry; - // while(iterator.hasNext()) { - // try { - // entry = iterator.next(); - // } catch(NullPointerException | ConcurrentModificationException ex) { - // break; // We are not synced to the main thread, so NPE's/CME are allowed here and way less - // // overhead probably than trying to sync stuff up for no really good reason - // } - // if (unCullable.contains(entry.getBlockType().getUnlocalizedName())) { - // continue; - // } - // if (!entry.isForcedVisible()) { - // if (noCulling) { - // entry.setCulled(true); - // continue; - // } - // BlockPos pos = entry.getPos(); - // if(pos.distanceSq(cameraMC.xCoord, cameraMC.yCoord, cameraMC.zCoord) < 64*64) { // 64 is the fixed max tile view distance - // aabbMin.set(pos.getX(), pos.getY(), pos.getZ()); - // aabbMax.set(pos.getX()+1d, pos.getY()+1d, pos.getZ()+1d); - // boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera); - // entry.setCulled(!visible); - // } - // } - // } - // Entity entity = null; - // Iterator iterable = client.theWorld.getLoadedEntityList().iterator(); - // while(iterable.hasNext()) { - // try { - // entity = iterable.next(); - // } catch(NullPointerException | ConcurrentModificationException ex) { - // break; // We are not synced to the main thread, so NPE's/CME are allowed here and way less - // // overhead probably than trying to sync stuff up for no really good reason - // } - // if (entity == null) { - // continue; - // } - // if (!entity.isForcedVisible()) { - // if (noCulling || isSkippableArmorstand(entity)) { - // entity.setCulled(false); - // continue; - // } - // if(entity.getPositionVector().squareDistanceTo(cameraMC) > Config.tracingDistance * Config.tracingDistance) { - // entity.setCulled(false); // If your entity view distance is larger than tracingDistance just render it - // continue; - // } - // AxisAlignedBB boundingBox = entity.getEntityBoundingBox(); - // if(boundingBox.maxX - boundingBox.minX > hitboxLimit || boundingBox.maxY - boundingBox.minY > hitboxLimit || boundingBox.maxZ - boundingBox.minZ > hitboxLimit) { - // entity.setCulled(false); // To big to bother to cull - // continue; - // } - // aabbMin.set(boundingBox.minX, boundingBox.minY, boundingBox.minZ); - // aabbMax.set(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ); - // boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera); - // entity.setCulled(!visible); - // } - // } - // lastTime = (System.currentTimeMillis()-start); - // } - // } - // } catch (Exception e) { - // e.printStackTrace(); - // } + // if (Config.enableCulling && client.theWorld != null && client.thePlayer != + // null && client.thePlayer.ticksExisted > 0 && client.getRenderViewEntity() != + // null) { + // Vec3 cameraMC = getCameraPos(); + // if (requestCull || !(cameraMC.xCoord == lastPos.x && cameraMC.yCoord == + // lastPos.y && cameraMC.zCoord == lastPos.z)) { + // long start = System.currentTimeMillis(); + // requestCull = false; + // lastPos.set(cameraMC.xCoord, cameraMC.yCoord, cameraMC.zCoord); + // Vec3d camera = lastPos; + // culling.resetCache(); + // boolean noCulling = client.thePlayer.isSpectator() || + // client.gameSettings.thirdPersonView != 0; + // Iterator iterator = + // client.theWorld.loadedTileEntityList.iterator(); + // TileEntity entry; + // while(iterator.hasNext()) { + // try { + // entry = iterator.next(); + // } catch(NullPointerException | ConcurrentModificationException ex) { + // break; // We are not synced to the main thread, so NPE's/CME are allowed here + // and way less + // // overhead probably than trying to sync stuff up for no really good reason + // } + // if (unCullable.contains(entry.getBlockType().getUnlocalizedName())) { + // continue; + // } + // if (!entry.isForcedVisible()) { + // if (noCulling) { + // entry.setCulled(true); + // continue; + // } + // BlockPos pos = entry.getPos(); + // if(pos.distanceSq(cameraMC.xCoord, cameraMC.yCoord, cameraMC.zCoord) < 64*64) + // { // 64 is the fixed max tile view distance + // aabbMin.set(pos.getX(), pos.getY(), pos.getZ()); + // aabbMax.set(pos.getX()+1d, pos.getY()+1d, pos.getZ()+1d); + // boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera); + // entry.setCulled(!visible); + // } + // } + // } + // Entity entity = null; + // Iterator iterable = client.theWorld.getLoadedEntityList().iterator(); + // while(iterable.hasNext()) { + // try { + // entity = iterable.next(); + // } catch(NullPointerException | ConcurrentModificationException ex) { + // break; // We are not synced to the main thread, so NPE's/CME are allowed here + // and way less + // // overhead probably than trying to sync stuff up for no really good reason + // } + // if (entity == null) { + // continue; + // } + // if (!entity.isForcedVisible()) { + // if (noCulling || isSkippableArmorstand(entity)) { + // entity.setCulled(false); + // continue; + // } + // if(entity.getPositionVector().squareDistanceTo(cameraMC) > + // Config.tracingDistance * Config.tracingDistance) { + // entity.setCulled(false); // If your entity view distance is larger than + // tracingDistance just render it + // continue; + // } + // AxisAlignedBB boundingBox = entity.getEntityBoundingBox(); + // if(boundingBox.maxX - boundingBox.minX > hitboxLimit || boundingBox.maxY - + // boundingBox.minY > hitboxLimit || boundingBox.maxZ - boundingBox.minZ > + // hitboxLimit) { + // entity.setCulled(false); // To big to bother to cull + // continue; + // } + // aabbMin.set(boundingBox.minX, boundingBox.minY, boundingBox.minZ); + // aabbMax.set(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ); + // boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera); + // entity.setCulled(!visible); + // } + // } + // lastTime = (System.currentTimeMillis()-start); + // } + // } + // } catch (Exception e) { + // e.printStackTrace(); + // } // } // System.out.println("Culling thread stopped"); } - private Vec3 getCameraPos() { + private net.minecraft.util.math.Vec3d getCameraPos() { if (client.gameSettings.thirdPersonView == 0) { return client.thePlayer.getPositionEyes(0); } @@ -127,7 +138,9 @@ public class CullTask implements Runnable { } private boolean isSkippableArmorstand(Entity entity) { - if (!Config.skipMarkerArmorStands) return false; - return entity instanceof EntityArmorStand && ((EntityArmorStand) entity).func_181026_s(); // i think this is the marker flag + if (!Config.skipMarkerArmorStands) + return false; + return entity instanceof EntityArmorStand && ((EntityArmorStand) entity).func_181026_s(); // i think this is the + // marker flag } } diff --git a/src/main/java/net/hoosiertransfer/Culling/Provider.java b/src/main/java/net/hoosiertransfer/Culling/Provider.java index 8854fa7..e5994f6 100644 --- a/src/main/java/net/hoosiertransfer/Culling/Provider.java +++ b/src/main/java/net/hoosiertransfer/Culling/Provider.java @@ -4,7 +4,7 @@ import com.logisticscraft.occlusionculling.DataProvider; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class Provider implements DataProvider { private final Minecraft client = Minecraft.getMinecraft(); diff --git a/src/main/java/net/hoosiertransfer/Sodium/SodiumBlockAccess.java b/src/main/java/net/hoosiertransfer/Sodium/SodiumBlockAccess.java index 45048bd..a25c55b 100644 --- a/src/main/java/net/hoosiertransfer/Sodium/SodiumBlockAccess.java +++ b/src/main/java/net/hoosiertransfer/Sodium/SodiumBlockAccess.java @@ -1,8 +1,8 @@ package net.hoosiertransfer.Sodium; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeColorHelper; -import net.minecraft.util.BlockPos; public interface SodiumBlockAccess extends IBlockAccess { int getBlockTint(BlockPos pos, BiomeColorHelper.ColorResolver resolver); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java index d2c0e59..763ff60 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftSoundManager.java @@ -21,8 +21,8 @@ import net.minecraft.client.audio.SoundPoolEntry; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2022-2023 lax1dude, hoosiertransfer, ayunami2000. All Rights diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java index 7a1d10b..2fa3f31 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/json/JSONTypeProvider.java @@ -34,8 +34,8 @@ import net.minecraft.client.resources.data.PackMetadataSectionSerializer; import net.minecraft.client.resources.data.TextureMetadataSection; import net.minecraft.client.resources.data.TextureMetadataSectionSerializer; import net.minecraft.network.ServerStatusResponse; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.gen.ChunkProviderSettings; /** @@ -137,8 +137,8 @@ public class JSONTypeProvider { static { - registerType(IChatComponent.class, new IChatComponent.Serializer()); - registerType(ChatStyle.class, new ChatStyle.Serializer()); + registerType(ITextComponent.class, new ITextComponent.Serializer()); + registerType(Style.class, new Style.Serializer()); registerType(ServerStatusResponse.class, new ServerStatusResponse.Serializer()); registerType(ServerStatusResponse.MinecraftProtocolVersionIdentifier.class, new ServerStatusResponse.MinecraftProtocolVersionIdentifier.Serializer()); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/AcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/AcceleratedEffectRenderer.java index d1926f4..9830f44 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/AcceleratedEffectRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/AcceleratedEffectRenderer.java @@ -4,20 +4,27 @@ import net.lax1dude.eaglercraft.v1_8.opengl.InstancedParticleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.hoosiertransfer.Config; /** * Copyright (c) 2022 lax1dude. 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. * @@ -37,7 +44,7 @@ public class AcceleratedEffectRenderer implements IAcceleratedParticleEngine { this.partialTicks = partialTicks; InstancedParticleRenderer.begin(); Entity et = Minecraft.getMinecraft().getRenderViewEntity(); - if(et != null) { + if (et != null) { f1 = MathHelper.cos(et.rotationYaw * 0.017453292F); f2 = MathHelper.sin(et.rotationYaw * 0.017453292F); f3 = -f2 * MathHelper.sin(et.rotationPitch * 0.017453292F); @@ -48,44 +55,55 @@ public class AcceleratedEffectRenderer implements IAcceleratedParticleEngine { @Override public void draw(float texCoordWidth, float texCoordHeight) { - if (!Config.renderParticles()) return; + if (!Config.renderParticles()) + return; InstancedParticleRenderer.render(texCoordWidth, texCoordHeight, 0.0625f, f1, f5, f2, f3, f4); } @Override public void drawParticle(Entity entityIn, int particleIndexX, int particleIndexY, int lightMapData, int texSize, float particleSize, float r, float g, float b, float a) { - if (!Config.renderParticles()) return; - float xx = (float) (entityIn.prevPosX + (entityIn.posX - entityIn.prevPosX) * (double) partialTicks - EntityFX.interpPosX); - float yy = (float) (entityIn.prevPosY + (entityIn.posY - entityIn.prevPosY) * (double) partialTicks - EntityFX.interpPosY); - float zz = (float) (entityIn.prevPosZ + (entityIn.posZ - entityIn.prevPosZ) * (double) partialTicks - EntityFX.interpPosZ); + if (!Config.renderParticles()) + return; + float xx = (float) (entityIn.prevPosX + (entityIn.posX - entityIn.prevPosX) * (double) partialTicks + - EntityFX.interpPosX); + float yy = (float) (entityIn.prevPosY + (entityIn.posY - entityIn.prevPosY) * (double) partialTicks + - EntityFX.interpPosY); + float zz = (float) (entityIn.prevPosZ + (entityIn.posZ - entityIn.prevPosZ) * (double) partialTicks + - EntityFX.interpPosZ); drawParticle(xx, yy, zz, particleIndexX, particleIndexY, lightMapData, texSize, particleSize, r, g, b, a); } @Override public void drawParticle(Entity entityIn, int particleIndexX, int particleIndexY, int lightMapData, int texSize, float particleSize, int rgba) { - if (!Config.renderParticles()) return; - float xx = (float) (entityIn.prevPosX + (entityIn.posX - entityIn.prevPosX) * (double) partialTicks - EntityFX.interpPosX); - float yy = (float) (entityIn.prevPosY + (entityIn.posY - entityIn.prevPosY) * (double) partialTicks - EntityFX.interpPosY); - float zz = (float) (entityIn.prevPosZ + (entityIn.posZ - entityIn.prevPosZ) * (double) partialTicks - EntityFX.interpPosZ); + if (!Config.renderParticles()) + return; + float xx = (float) (entityIn.prevPosX + (entityIn.posX - entityIn.prevPosX) * (double) partialTicks + - EntityFX.interpPosX); + float yy = (float) (entityIn.prevPosY + (entityIn.posY - entityIn.prevPosY) * (double) partialTicks + - EntityFX.interpPosY); + float zz = (float) (entityIn.prevPosZ + (entityIn.posZ - entityIn.prevPosZ) * (double) partialTicks + - EntityFX.interpPosZ); drawParticle(xx, yy, zz, particleIndexX, particleIndexY, lightMapData, texSize, particleSize, rgba); } @Override public void drawParticle(float posX, float posY, float posZ, int particleIndexX, int particleIndexY, int lightMapData, int texSize, float particleSize, float r, float g, float b, float a) { - if (!Config.renderParticles()) return; + if (!Config.renderParticles()) + return; InstancedParticleRenderer.appendParticle(posX, posY, posZ, particleIndexX, particleIndexY, lightMapData & 0xFF, - (lightMapData >> 16) & 0xFF, (int)(particleSize * 16.0f), texSize, r, g, b, a); + (lightMapData >> 16) & 0xFF, (int) (particleSize * 16.0f), texSize, r, g, b, a); } @Override public void drawParticle(float posX, float posY, float posZ, int particleIndexX, int particleIndexY, int lightMapData, int texSize, float particleSize, int rgba) { - if (!Config.renderParticles()) return; + if (!Config.renderParticles()) + return; InstancedParticleRenderer.appendParticle(posX, posY, posZ, particleIndexX, particleIndexY, lightMapData & 0xFF, - (lightMapData >> 16) & 0xFF, (int)(particleSize * 16.0f), texSize, rgba); + (lightMapData >> 16) & 0xFF, (int) (particleSize * 16.0f), texSize, rgba); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java index 035cafc..0fe2089 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java @@ -22,7 +22,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.StreamBuffer.StreamBufferInstance; import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager; import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.lax1dude.eaglercraft.v1_8.vector.Vector4f; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import static net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionState.*; import static net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionConstants.*; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java index 6f7a498..687e2ec 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/WorldRenderer.java @@ -12,7 +12,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformBufferFunctions; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2022-2023 lax1dude, hoosiertransfer, ayunami2000. All Rights diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java index 789e7fe..a77f27c 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/CloudRenderWorker.java @@ -22,19 +22,26 @@ import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023 lax1dude. 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. * @@ -126,7 +133,8 @@ public class CloudRenderWorker { ByteBuffer cloudNoiseDatBuffer = EagRuntime.allocateByteBuffer(cloudNoiseDat.length); cloudNoiseDatBuffer.put(cloudNoiseDat); cloudNoiseDatBuffer.flip(); - _wglTexImage2D(GL_TEXTURE_2D, 0, _GL_R8, cloudNoiseW, cloudNoiseH, 0, GL_RED, GL_UNSIGNED_BYTE, cloudNoiseDatBuffer); + _wglTexImage2D(GL_TEXTURE_2D, 0, _GL_R8, cloudNoiseW, cloudNoiseH, 0, GL_RED, GL_UNSIGNED_BYTE, + cloudNoiseDatBuffer); EagRuntime.freeByteBuffer(cloudNoiseDatBuffer); cloud3DSamplesTexture = GlStateManager.generateTexture(); @@ -140,14 +148,15 @@ public class CloudRenderWorker { cloud3DSamplesTextureSizeZ, 0, GL_RED, GL_UNSIGNED_BYTE, (ByteBuffer) null); cloud3DSamplesSlices = new IFramebufferGL[cloud3DSamplesTextureSizeZ]; - for(int i = 0; i < cloud3DSamplesTextureSizeZ; ++i) { + for (int i = 0; i < cloud3DSamplesTextureSizeZ; ++i) { cloud3DSamplesSlices[i] = _wglCreateFramebuffer(); _wglBindFramebuffer(_GL_FRAMEBUFFER, cloud3DSamplesSlices[i]); - _wglFramebufferTextureLayer(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, EaglercraftGPU.getNativeTexture(cloud3DSamplesTexture), 0, i); + _wglFramebufferTextureLayer(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, + EaglercraftGPU.getNativeTexture(cloud3DSamplesTexture), 0, i); } GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f); - for(int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { cloudNoiseSampleParaboloidFramebuffer[i] = _wglCreateFramebuffer(); _wglBindFramebuffer(_GL_FRAMEBUFFER, cloudNoiseSampleParaboloidFramebuffer[i]); cloudNoiseSampleParaboloidTexture[i] = GlStateManager.generateTexture(); @@ -156,8 +165,10 @@ public class CloudRenderWorker { _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, i == 3 ? GL_LINEAR : GL_NEAREST); _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, i == 3 ? GL_LINEAR : GL_NEAREST); - EaglercraftGPU.createFramebufferHDR16FTexture(GL_TEXTURE_2D, 0, cloudParaboloidTextureSize, cloudParaboloidTextureSize, GL_RGBA, true); - _wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, EaglercraftGPU.getNativeTexture(cloudNoiseSampleParaboloidTexture[i]), 0); + EaglercraftGPU.createFramebufferHDR16FTexture(GL_TEXTURE_2D, 0, cloudParaboloidTextureSize, + cloudParaboloidTextureSize, GL_RGBA, true); + _wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + EaglercraftGPU.getNativeTexture(cloudNoiseSampleParaboloidTexture[i]), 0); GlStateManager.clear(GL_COLOR_BUFFER_BIT); } @@ -172,7 +183,8 @@ public class CloudRenderWorker { cloudNoiseDatBuffer = EagRuntime.allocateByteBuffer(cloudShapeTexture.length); cloudNoiseDatBuffer.put(cloudShapeTexture); cloudNoiseDatBuffer.flip(); - _wglTexImage3D(GL_TEXTURE_3D, 0, _GL_R8, 32, 16, 24, 0, GL_RED, GL_UNSIGNED_BYTE, (ByteBuffer) cloudNoiseDatBuffer); + _wglTexImage3D(GL_TEXTURE_3D, 0, _GL_R8, 32, 16, 24, 0, GL_RED, GL_UNSIGNED_BYTE, + (ByteBuffer) cloudNoiseDatBuffer); EagRuntime.freeByteBuffer(cloudNoiseDatBuffer); shader_clouds_noise3d = PipelineShaderCloudsNoise3D.compile(); @@ -192,8 +204,9 @@ public class CloudRenderWorker { _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - _wglTexImage2D(GL_TEXTURE_2D, 0, _GL_R8, 1, 1, 0, GL_RED, GL_UNSIGNED_BYTE, (ByteBuffer)null); - _wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, EaglercraftGPU.getNativeTexture(cloudOcclusionTexture), 0); + _wglTexImage2D(GL_TEXTURE_2D, 0, _GL_R8, 1, 1, 0, GL_RED, GL_UNSIGNED_BYTE, (ByteBuffer) null); + _wglFramebufferTexture2D(_GL_FRAMEBUFFER, _GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + EaglercraftGPU.getNativeTexture(cloudOcclusionTexture), 0); } static void setPosition(float x, float y, float z) { @@ -208,11 +221,11 @@ public class CloudRenderWorker { static void update() { long millis = System.currentTimeMillis(); - int cloudProgress = (int)(millis - cloudStartTimer); + int cloudProgress = (int) (millis - cloudStartTimer); int totalCloudSteps = 32 + 32 - 1; int currentCloudStep = cloudProgress * totalCloudSteps / cloudRenderPeriod; boolean b = false; - if(currentCloudStep > totalCloudSteps) { + if (currentCloudStep > totalCloudSteps) { currentCloudStep = totalCloudSteps; b = true; } @@ -222,12 +235,13 @@ public class CloudRenderWorker { WorldClient wc = Minecraft.getMinecraft().theWorld; float rain = wc.getRainStrength(0.0f); - if(cloudRenderProgress == 0) { + if (cloudRenderProgress == 0) { shader_clouds_noise3d.useProgram(); - _wglUniform2f(shader_clouds_noise3d.uniforms.u_textureSize2f, 1.0f / cloud3DSamplesTextureSizeX, 1.0f / cloud3DSamplesTextureSizeY); - float m = (float)((millis % 1200000l) * 0.00002); - _wglUniform3f(shader_clouds_noise3d.uniforms.u_cloudMovement3f, m, 0.0f, m);//2.213f, 0.0f, 2.213f); - + _wglUniform2f(shader_clouds_noise3d.uniforms.u_textureSize2f, 1.0f / cloud3DSamplesTextureSizeX, + 1.0f / cloud3DSamplesTextureSizeY); + float m = (float) ((millis % 1200000l) * 0.00002); + _wglUniform3f(shader_clouds_noise3d.uniforms.u_cloudMovement3f, m, 0.0f, m);// 2.213f, 0.0f, 2.213f); + tmpMatrix1.setIdentity(); tmpVector1.set(renderViewX * playerCoordsNoiseMapScale, 0.0f, renderViewZ * playerCoordsNoiseMapScale); Matrix4f.translate(tmpVector1, tmpMatrix1, tmpMatrix1); @@ -249,13 +263,14 @@ public class CloudRenderWorker { matrixCopyBuffer.put(tmpMatrix1.m32); matrixCopyBuffer.flip(); _wglUniformMatrix4x3fv(shader_clouds_noise3d.uniforms.u_sampleOffsetMatrix4f, false, matrixCopyBuffer); - + shader_clouds_sample.useProgram(); _wglUniform1f(shader_clouds_sample.uniforms.u_rainStrength1f, 0.0f); _wglUniform1f(shader_clouds_sample.uniforms.u_cloudTimer1f, 0.0f); _wglUniform3f(shader_clouds_sample.uniforms.u_cloudOffset3f, renderViewX, renderViewY, renderViewZ); Vector3f currentSunAngle = DeferredStateManager.currentSunLightAngle; - _wglUniform3f(shader_clouds_sample.uniforms.u_sunDirection3f, -currentSunAngle.x, -currentSunAngle.y, -currentSunAngle.z); + _wglUniform3f(shader_clouds_sample.uniforms.u_sunDirection3f, -currentSunAngle.x, -currentSunAngle.y, + -currentSunAngle.z); currentSunAngle = tmpVector1; currentSunAngle.set(DeferredStateManager.currentSunLightColor); float luma = currentSunAngle.x * 0.299f + currentSunAngle.y * 0.587f + currentSunAngle.z * 0.114f; @@ -267,35 +282,39 @@ public class CloudRenderWorker { cloudColorG += (currentSunAngle.y - cloudColorG) * 0.1f; cloudColorB += (currentSunAngle.z - cloudColorB) * 0.1f; _wglUniform3f(shader_clouds_sample.uniforms.u_sunColor3f, cloudColorR, cloudColorG, cloudColorB); - - float cloudDensityTimer = (float)((System.currentTimeMillis() % 10000000l) * 0.001); + + float cloudDensityTimer = (float) ((System.currentTimeMillis() % 10000000l) * 0.001); cloudDensityTimer += MathHelper.sin(cloudDensityTimer * 1.5f) * 1.5f; float x = cloudDensityTimer * 0.004f; - float f1 = MathHelper.sin(x + 0.322f) * 0.544f + MathHelper.sin(x * 4.5f + 1.843f) * 0.69f + MathHelper.sin(x * 3.4f + 0.8f) * 0.6f + MathHelper.sin(x * 6.1f + 1.72f) * 0.7f; + float f1 = MathHelper.sin(x + 0.322f) * 0.544f + MathHelper.sin(x * 4.5f + 1.843f) * 0.69f + + MathHelper.sin(x * 3.4f + 0.8f) * 0.6f + MathHelper.sin(x * 6.1f + 1.72f) * 0.7f; x = cloudDensityTimer * 0.002f; - float f2 = MathHelper.cos(x + 2.7f) + MathHelper.cos(x * 1.28f + 1.3f) * 0.4f + MathHelper.cos(x * 4.0f + 2.5f) * 0.3f + MathHelper.cos(x * 2.3f + 1.07f); + float f2 = MathHelper.cos(x + 2.7f) + MathHelper.cos(x * 1.28f + 1.3f) * 0.4f + + MathHelper.cos(x * 4.0f + 2.5f) * 0.3f + MathHelper.cos(x * 2.3f + 1.07f); float rain2 = rain + wc.getThunderStrength(0.0f); - _wglUniform4f(shader_clouds_sample.uniforms.u_densityModifier4f, 0.015f + f1 * 0.0021f * (1.0f - rain2 * 0.35f) + rain2 * 0.00023f, 0.0325f, -0.0172f + f2 * 0.00168f * (1.0f - rain2 * 0.35f) + rain * 0.0015f, 0.0f); + _wglUniform4f(shader_clouds_sample.uniforms.u_densityModifier4f, + 0.015f + f1 * 0.0021f * (1.0f - rain2 * 0.35f) + rain2 * 0.00023f, 0.0325f, + -0.0172f + f2 * 0.00168f * (1.0f - rain2 * 0.35f) + rain * 0.0015f, 0.0f); } - if(cloudRenderProgress < 32 && currentCloudStep > cloudRenderProgress) { + if (cloudRenderProgress < 32 && currentCloudStep > cloudRenderProgress) { GlStateManager.setActiveTexture(GL_TEXTURE0); GlStateManager.bindTexture(cloudNoiseTexture); - + GlStateManager.viewport(0, 0, cloud3DSamplesTextureSizeX, cloud3DSamplesTextureSizeY); updateShape(); boolean shapeAllow = isDrawingCloudShapes; boolean shapeInit = false; - - for(int i = cloudRenderProgress, j = currentCloudStep < 32 ? currentCloudStep : 32; i < j; ++i) { + + for (int i = cloudRenderProgress, j = currentCloudStep < 32 ? currentCloudStep : 32; i < j; ++i) { int ccl = i * 2; boolean drawShape = false; - if(isDrawingCloudShapes && shapeAllow) { - if(ccl >= shapePosZ && ccl < shapePosZ + shapeSizeZ) { + if (isDrawingCloudShapes && shapeAllow) { + if (ccl >= shapePosZ && ccl < shapePosZ + shapeSizeZ) { drawShape = true; - if(!shapeInit) { + if (!shapeInit) { shapeInit = true; Matrix3f mat = tmpMatrix2; mat.setIdentity(); @@ -305,8 +324,8 @@ public class CloudRenderWorker { mat.m11 = mat.m00; mat = tmpMatrix3; mat.setIdentity(); - mat.m00 = (float)shapeSizeX * 0.5f; - mat.m11 = (float)shapeSizeY * 0.5f; + mat.m00 = (float) shapeSizeX * 0.5f; + mat.m11 = (float) shapeSizeY * 0.5f; Matrix3f.mul(tmpMatrix2, mat, tmpMatrix2); tmpMatrix2.m20 = shapePosX - renderViewX * playerCoordsNoiseMapScale * 128.0f; tmpMatrix2.m21 = shapePosY - renderViewZ * playerCoordsNoiseMapScale * 128.0f; @@ -317,10 +336,10 @@ public class CloudRenderWorker { mat = tmpMatrix2; mat.m20 -= 1.0f; mat.m21 -= 1.0f; - if(!checkFrustum(mat)) { + if (!checkFrustum(mat)) { drawShape = false; shapeAllow = false; - }else { + } else { matrixCopyBuffer.clear(); matrixCopyBuffer.put(mat.m00); matrixCopyBuffer.put(mat.m01); @@ -330,50 +349,55 @@ public class CloudRenderWorker { matrixCopyBuffer.put(mat.m21); matrixCopyBuffer.flip(); shader_clouds_shapes.useProgram(); - _wglUniformMatrix3x2fv(shader_clouds_shapes.uniforms.u_transformMatrix3x2f, false, matrixCopyBuffer); + _wglUniformMatrix3x2fv(shader_clouds_shapes.uniforms.u_transformMatrix3x2f, false, + matrixCopyBuffer); _wglUniform1f(shader_clouds_shapes.uniforms.u_textureLod1f, 0.0f); _wglUniform2f(shader_clouds_shapes.uniforms.u_sampleWeights2f, 0.35f, 0.55f); } } } } - + shader_clouds_noise3d.useProgram(); - + _wglBindFramebuffer(_GL_FRAMEBUFFER, cloud3DSamplesSlices[ccl]); - _wglUniform1f(shader_clouds_noise3d.uniforms.u_textureSlice1f, (float)(ccl / (float)cloud3DSamplesTextureSizeZ)); - + _wglUniform1f(shader_clouds_noise3d.uniforms.u_textureSlice1f, + (float) (ccl / (float) cloud3DSamplesTextureSizeZ)); + DrawUtils.drawStandardQuad2D(); - - if(drawShape) { + + if (drawShape) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL_ONE, GL_SRC_ALPHA); shader_clouds_shapes.useProgram(); - _wglUniform1f(shader_clouds_shapes.uniforms.u_textureLevel1f, (float)(ccl - shapePosZ + 0.5f) / (float)shapeSizeZ); + _wglUniform1f(shader_clouds_shapes.uniforms.u_textureLevel1f, + (float) (ccl - shapePosZ + 0.5f) / (float) shapeSizeZ); GlStateManager.bindTexture3D(cloudSpecialShapeTexture); DrawUtils.drawStandardQuad2D(); GlStateManager.disableBlend(); shader_clouds_noise3d.useProgram(); GlStateManager.bindTexture(cloudNoiseTexture); } - + _wglBindFramebuffer(_GL_FRAMEBUFFER, cloud3DSamplesSlices[ccl + 1]); - _wglUniform1f(shader_clouds_noise3d.uniforms.u_textureSlice1f, (float)((ccl + 1) / (float)cloud3DSamplesTextureSizeZ)); - + _wglUniform1f(shader_clouds_noise3d.uniforms.u_textureSlice1f, + (float) ((ccl + 1) / (float) cloud3DSamplesTextureSizeZ)); + DrawUtils.drawStandardQuad2D(); - - if(drawShape && ccl + 1 < shapePosZ + shapeSizeZ) { + + if (drawShape && ccl + 1 < shapePosZ + shapeSizeZ) { GlStateManager.enableBlend(); shader_clouds_shapes.useProgram(); - _wglUniform1f(shader_clouds_shapes.uniforms.u_textureLevel1f, (float)((ccl + 1) - shapePosZ + 0.5f) / (float)shapeSizeZ); + _wglUniform1f(shader_clouds_shapes.uniforms.u_textureLevel1f, + (float) ((ccl + 1) - shapePosZ + 0.5f) / (float) shapeSizeZ); GlStateManager.bindTexture3D(cloudSpecialShapeTexture); DrawUtils.drawStandardQuad2D(); GlStateManager.disableBlend(); } } } - - if(currentCloudStep >= 32 && currentCloudStep > cloudRenderProgress) { + + if (currentCloudStep >= 32 && currentCloudStep > cloudRenderProgress) { _wglBindFramebuffer(_GL_FRAMEBUFFER, cloudNoiseSampleParaboloidFramebuffer[cloudRenderPhase]); GlStateManager.viewport(0, 0, cloudParaboloidTextureSize, cloudParaboloidTextureSize); @@ -382,61 +406,63 @@ public class CloudRenderWorker { GlStateManager.setActiveTexture(GL_TEXTURE0); GlStateManager.bindTexture3D(cloud3DSamplesTexture); shader_clouds_sample.useProgram(); - + GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(GL_DST_ALPHA, GL_ONE, GL_DST_ALPHA, GL_ZERO); - - for(int i = cloudRenderProgress > 32 ? cloudRenderProgress - 32 : 0, j = currentCloudStep - 31; i < j; ++i) { - if(i == 0) { + + for (int i = cloudRenderProgress > 32 ? cloudRenderProgress - 32 : 0, + j = currentCloudStep - 31; i < j; ++i) { + if (i == 0) { GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f); GlStateManager.clear(GL_COLOR_BUFFER_BIT); } - + _wglUniform1f(shader_clouds_sample.uniforms.u_sampleStep1f, i * 2); DrawUtils.drawStandardQuad2D(); - + _wglUniform1f(shader_clouds_sample.uniforms.u_sampleStep1f, i * 2 + 1); DrawUtils.drawStandardQuad2D(); } GlStateManager.disableBlend(); } - - if(b) { + + if (b) { cloudRenderProgress = 0; cloudStartTimer = System.currentTimeMillis(); cloudProgress = 0; cloudRenderPhase = (cloudRenderPhase + 1) % 3; - }else { + } else { cloudRenderProgress = currentCloudStep; } - + _wglBindFramebuffer(_GL_FRAMEBUFFER, cloudNoiseSampleParaboloidFramebuffer[3]); GlStateManager.viewport(0, 0, cloudParaboloidTextureSize, cloudParaboloidTextureSize); - - float fadeFactor = cloudProgress / (float)cloudRenderPeriod; - if(fadeFactor > 1.0f) fadeFactor = 1.0f; + + float fadeFactor = cloudProgress / (float) cloudRenderPeriod; + if (fadeFactor > 1.0f) + fadeFactor = 1.0f; GlStateManager.setActiveTexture(GL_TEXTURE0); GlStateManager.bindTexture(cloudNoiseSampleParaboloidTexture[(cloudRenderPhase + 1) % 3]); TextureCopyUtil.blitTexture(); - + GlStateManager.enableBlend(); GlStateManager.blendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); GlStateManager.setBlendConstants(0.0f, 0.0f, 0.0f, fadeFactor); GlStateManager.bindTexture(cloudNoiseSampleParaboloidTexture[(cloudRenderPhase + 2) % 3]); TextureCopyUtil.blitTexture(); GlStateManager.disableBlend(); - + _wglBindFramebuffer(_GL_FRAMEBUFFER, cloudOcclusionFramebuffer); GlStateManager.viewport(0, 0, 1, 1); - if(rain >= 1.0f) { + if (rain >= 1.0f) { GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 0.0f); GlStateManager.clear(GL_COLOR_BUFFER_BIT); - }else if(DeferredStateManager.currentSunLightAngle.y < 0.0f) { + } else if (DeferredStateManager.currentSunLightAngle.y < 0.0f) { shader_clouds_sun_occlusion.useProgram(); GlStateManager.bindTexture(cloudNoiseSampleParaboloidTexture[3]); matrixCopyBuffer.clear(); - + tmpVector1.set(0.0f, 1.0f, 0.0f); Vector3f vec33 = tmpVector3; vec33.set(DeferredStateManager.currentSunLightAngle); @@ -445,94 +471,94 @@ public class CloudRenderWorker { vec33.z = -vec33.z; Vector3f.cross(tmpVector1, vec33, tmpVector1); Vector3f.cross(vec33, tmpVector1, tmpVector2); - + float rad = 0.1f; - + matrixCopyBuffer.put(tmpVector1.x * rad); matrixCopyBuffer.put(tmpVector2.x * rad); matrixCopyBuffer.put(vec33.x * rad); - + matrixCopyBuffer.put(tmpVector1.y * rad); matrixCopyBuffer.put(tmpVector2.y * rad); matrixCopyBuffer.put(vec33.y * rad); - + matrixCopyBuffer.put(tmpVector1.z * rad); matrixCopyBuffer.put(tmpVector2.z * rad); matrixCopyBuffer.put(vec33.z * rad); - + rad = 1.0f - rad; matrixCopyBuffer.put(vec33.x * rad); matrixCopyBuffer.put(vec33.y * rad); matrixCopyBuffer.put(vec33.z * rad); - + matrixCopyBuffer.flip(); _wglUniformMatrix4x3fv(shader_clouds_sun_occlusion.uniforms.u_sampleMatrix4x3f, false, matrixCopyBuffer); - - if(rain > 0.0f) { + + if (rain > 0.0f) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL_CONSTANT_ALPHA, GL_ZERO); GlStateManager.setBlendConstants(0.0f, 0.0f, 0.0f, 1.0f - rain); DrawUtils.drawStandardQuad2D(); GlStateManager.disableBlend(); - }else { + } else { DrawUtils.drawStandardQuad2D(); } - }else { + } else { GlStateManager.clearColor(1.0f, 1.0f, 1.0f, 1.0f); GlStateManager.clear(GL_COLOR_BUFFER_BIT); } } static void destroy() { - if(cloudNoiseTexture != -1) { + if (cloudNoiseTexture != -1) { GlStateManager.deleteTexture(cloudNoiseTexture); cloudNoiseTexture = -1; } - for(int i = 0; i < 4; ++i) { - if(cloudNoiseSampleParaboloidFramebuffer[i] != null) { + for (int i = 0; i < 4; ++i) { + if (cloudNoiseSampleParaboloidFramebuffer[i] != null) { _wglDeleteFramebuffer(cloudNoiseSampleParaboloidFramebuffer[i]); cloudNoiseSampleParaboloidFramebuffer[i] = null; } - if(cloudNoiseSampleParaboloidTexture[i] != -1) { + if (cloudNoiseSampleParaboloidTexture[i] != -1) { GlStateManager.deleteTexture(cloudNoiseSampleParaboloidTexture[i]); cloudNoiseSampleParaboloidTexture[i] = -1; } } - if(cloud3DSamplesTexture != -1) { + if (cloud3DSamplesTexture != -1) { GlStateManager.deleteTexture(cloud3DSamplesTexture); cloud3DSamplesTexture = -1; } - if(cloud3DSamplesSlices != null) { - for(int i = 0; i < cloud3DSamplesSlices.length; ++i) { + if (cloud3DSamplesSlices != null) { + for (int i = 0; i < cloud3DSamplesSlices.length; ++i) { _wglDeleteFramebuffer(cloud3DSamplesSlices[i]); } cloud3DSamplesSlices = null; } - if(cloudSpecialShapeTexture != -1) { + if (cloudSpecialShapeTexture != -1) { GlStateManager.deleteTexture(cloudSpecialShapeTexture); cloudSpecialShapeTexture = -1; } - if(cloudOcclusionFramebuffer != null) { + if (cloudOcclusionFramebuffer != null) { _wglDeleteFramebuffer(cloudOcclusionFramebuffer); cloudOcclusionFramebuffer = null; } - if(cloudOcclusionTexture != -1) { + if (cloudOcclusionTexture != -1) { GlStateManager.deleteTexture(cloudOcclusionTexture); cloudOcclusionTexture = -1; } - if(shader_clouds_noise3d != null) { + if (shader_clouds_noise3d != null) { shader_clouds_noise3d.destroy(); shader_clouds_noise3d = null; } - if(shader_clouds_shapes != null) { + if (shader_clouds_shapes != null) { shader_clouds_shapes.destroy(); shader_clouds_shapes = null; } - if(shader_clouds_sample != null) { + if (shader_clouds_sample != null) { shader_clouds_sample.destroy(); shader_clouds_sample = null; } - if(shader_clouds_sun_occlusion != null) { + if (shader_clouds_sun_occlusion != null) { shader_clouds_sun_occlusion.destroy(); shader_clouds_sun_occlusion = null; } @@ -540,38 +566,42 @@ public class CloudRenderWorker { private static void updateShape() { long millis = System.currentTimeMillis(); - float dt = (float)((millis - shapeUpdateTimer) * 0.001); + float dt = (float) ((millis - shapeUpdateTimer) * 0.001); shapeUpdateTimer = millis; - if(millis > nextShapeAppearance) { + if (millis > nextShapeAppearance) { float playerCoordsNoiseMapScale = 0.02f * 128.0f; - if(!isDrawingCloudShapes) { + if (!isDrawingCloudShapes) { float shapeScaleBase = rand.nextFloat() * 3.0f + 2.0f; - shapeSizeX = (int)(32 * shapeScaleBase * (0.9f + rand.nextFloat() * 0.2f)); - shapeSizeY = (int)(16 * shapeScaleBase * (0.95f + rand.nextFloat() * 0.1f)); - shapeSizeZ = (int)(24 * shapeScaleBase * (0.48f + rand.nextFloat() * 0.04f)); + shapeSizeX = (int) (32 * shapeScaleBase * (0.9f + rand.nextFloat() * 0.2f)); + shapeSizeY = (int) (16 * shapeScaleBase * (0.95f + rand.nextFloat() * 0.1f)); + shapeSizeZ = (int) (24 * shapeScaleBase * (0.48f + rand.nextFloat() * 0.04f)); do { - shapePosX = (int)(cloud3DSamplesTextureSizeX * (rand.nextFloat() * 1.5f - 0.75f)); - shapePosY = (int)(cloud3DSamplesTextureSizeY * (rand.nextFloat() * 1.5f - 0.75f)); - }while(shapePosX > -192 && shapePosY > -192 && shapePosX < 192 && shapePosY < 192); + shapePosX = (int) (cloud3DSamplesTextureSizeX * (rand.nextFloat() * 1.5f - 0.75f)); + shapePosY = (int) (cloud3DSamplesTextureSizeY * (rand.nextFloat() * 1.5f - 0.75f)); + } while (shapePosX > -192 && shapePosY > -192 && shapePosX < 192 && shapePosY < 192); float l = -MathHelper.sqrt_float(shapePosX * shapePosX + shapePosY * shapePosY); - shapeRotate = (float)Math.atan2(shapePosY / l, shapePosX / l) / 0.0174532f; + shapeRotate = (float) Math.atan2(shapePosY / l, shapePosX / l) / 0.0174532f; shapeRotate += (rand.nextFloat() - 0.5f) * 90.0f; shapePosX += renderViewX * playerCoordsNoiseMapScale + cloud3DSamplesTextureSizeX * 0.5f; shapePosY += renderViewZ * playerCoordsNoiseMapScale + cloud3DSamplesTextureSizeY * 0.5f; - shapePosZ = (int)((cloud3DSamplesTextureSizeZ - shapeSizeZ) * (rand.nextFloat() * 0.5f + 0.25f)); + shapePosZ = (int) ((cloud3DSamplesTextureSizeZ - shapeSizeZ) * (rand.nextFloat() * 0.5f + 0.25f)); isDrawingCloudShapes = true; - }else { + } else { float dx = MathHelper.cos(-shapeRotate * 0.0174532f); float dy = MathHelper.sin(-shapeRotate * 0.0174532f); - shapePosX += (int)(dx * 10.0f * dt); - shapePosY -= (int)(dy * 10.0f * dt); - if(MathHelper.abs(shapePosX - renderViewX * playerCoordsNoiseMapScale - cloud3DSamplesTextureSizeX * 0.5f) > 300.0f || - MathHelper.abs(shapePosY - renderViewZ * playerCoordsNoiseMapScale - cloud3DSamplesTextureSizeY * 0.5f) > 300.0f) { + shapePosX += (int) (dx * 10.0f * dt); + shapePosY -= (int) (dy * 10.0f * dt); + if (MathHelper + .abs(shapePosX - renderViewX * playerCoordsNoiseMapScale + - cloud3DSamplesTextureSizeX * 0.5f) > 300.0f + || + MathHelper.abs(shapePosY - renderViewZ * playerCoordsNoiseMapScale + - cloud3DSamplesTextureSizeY * 0.5f) > 300.0f) { nextShapeAppearance = millis + 300000l + rand.nextInt(1500000); isDrawingCloudShapes = false; } } - }else { + } else { isDrawingCloudShapes = false; } } @@ -582,25 +612,25 @@ public class CloudRenderWorker { tmp.y = -1.0f; tmp.z = 1.0f; Matrix3f.transform(mat, tmp, tmp); - if(tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { + if (tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { return true; } tmp.x = 1.0f; tmp.y = -1.0f; Matrix3f.transform(mat, tmp, tmp); - if(tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { + if (tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { return true; } tmp.x = 1.0f; tmp.y = 1.0f; Matrix3f.transform(mat, tmp, tmp); - if(tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { + if (tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { return true; } tmp.x = -1.0f; tmp.y = 1.0f; Matrix3f.transform(mat, tmp, tmp); - if(tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { + if (tmp.x >= -1.0f && tmp.x <= 1.0f && tmp.y >= -1.0f && tmp.y <= 1.0f) { return true; } return false; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java index f110e05..137a767 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/DeferredStateManager.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.lax1dude.eaglercraft.v1_8.vector.Vector4f; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java index 6d644b6..a8af5a3 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java @@ -56,9 +56,9 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java index bbe99c0..eff8b32 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java @@ -15,7 +15,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderA import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java index a76ef59..5d33621 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java @@ -15,7 +15,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderA import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java index d258636..8f2a551 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java @@ -19,26 +19,33 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderL import net.lax1dude.eaglercraft.v1_8.vector.Matrix3f; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.minecraft.client.Minecraft; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023 lax1dude. 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. * */ public class LensFlareMeshRenderer { - public static final String streaksTextureLocation ="assets/eagler/glsl/deferred/lens_streaks.bmp"; + public static final String streaksTextureLocation = "assets/eagler/glsl/deferred/lens_streaks.bmp"; public static final String ghostsTextureLocation = "assets/eagler/glsl/deferred/lens_ghosts.bmp"; public static final int ghostsSpriteCount = 4; @@ -63,16 +70,16 @@ public class LensFlareMeshRenderer { static void initialize() { destroy(); - + streaksProgram = PipelineShaderLensFlares.compileStreaks(); streaksProgram.loadUniforms(); - + ghostsProgram = PipelineShaderLensFlares.compileGhosts(); ghostsProgram.loadUniforms(); - + ByteBuffer copyBuffer = EagRuntime.allocateByteBuffer(16384); - for(int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { pushStreakQuad(copyBuffer, 0.0f, 0.0f, 1.0f, 10.0f, 0.0f, 0.0f, 1.0f, 1.0f, (i * 3.14159f / 4.0f)); pushStreakQuad(copyBuffer, 0.0f, 0.0f, 1.5f, 5.0f, 0.0f, 0.0f, 1.0f, 1.0f, ((i + 0.25f) * 3.14159f / 4.0f)); pushStreakQuad(copyBuffer, 0.0f, 0.0f, 0.5f, 7.0f, 0.0f, 0.0f, 1.0f, 1.0f, ((i + 0.5f) * 3.14159f / 4.0f)); @@ -158,12 +165,12 @@ public class LensFlareMeshRenderer { streaksTexture = GlStateManager.generateTexture(); GlStateManager.bindTexture(streaksTexture); byte[] flareTex = EagRuntime.getResourceBytes(streaksTextureLocation); - if(flareTex == null) { + if (flareTex == null) { throw new RuntimeException("Could not locate: " + streaksTextureLocation); } - try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) { + try (DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) { loadFlareTexture(copyBuffer, dis); - }catch(IOException ex) { + } catch (IOException ex) { EagRuntime.freeByteBuffer(copyBuffer); throw new RuntimeException("Could not load: " + streaksTextureLocation, ex); } @@ -171,12 +178,12 @@ public class LensFlareMeshRenderer { ghostsTexture = GlStateManager.generateTexture(); GlStateManager.bindTexture(ghostsTexture); flareTex = EagRuntime.getResourceBytes(ghostsTextureLocation); - if(flareTex == null) { + if (flareTex == null) { throw new RuntimeException("Could not locate: " + ghostsTextureLocation); } - try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) { + try (DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) { loadFlareTexture(copyBuffer, dis); - }catch(IOException ex) { + } catch (IOException ex) { EagRuntime.freeByteBuffer(copyBuffer); throw new RuntimeException("Could not load: " + ghostsTextureLocation, ex); } @@ -191,12 +198,12 @@ public class LensFlareMeshRenderer { _wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); _wglPixelStorei(GL_UNPACK_ALIGNMENT, 1); int mip = 0; - while(dis.read() == 'E') { + while (dis.read() == 'E') { int w = dis.readShort(); int h = dis.readShort(); copyBuffer.clear(); - for(int i = 0, l = w * h; i < l; ++i) { - copyBuffer.put((byte)dis.read()); + for (int i = 0, l = w * h; i < l; ++i) { + copyBuffer.put((byte) dis.read()); } copyBuffer.flip(); _wglTexImage2D(GL_TEXTURE_2D, mip++, _GL_R8, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, copyBuffer); @@ -213,58 +220,60 @@ public class LensFlareMeshRenderer { tmpMat.m11 = tmpMat.m00; tmpMat.m20 = x; tmpMat.m21 = y; - + tmpVec.x = -w; tmpVec.y = -h; tmpVec.z = 1.0f; Matrix3f.transform(tmpMat, tmpVec, tmpVec); - + copyBuffer.putFloat(tmpVec.x); copyBuffer.putFloat(tmpVec.y); copyBuffer.putFloat(tx); copyBuffer.putFloat(ty); - + tmpVec.x = w; tmpVec.y = -h; tmpVec.z = 1.0f; Matrix3f.transform(tmpMat, tmpVec, tmpVec); - + copyBuffer.putFloat(tmpVec.x); copyBuffer.putFloat(tmpVec.y); copyBuffer.putFloat(tx + tw); copyBuffer.putFloat(ty); - + tmpVec.x = w; tmpVec.y = h; tmpVec.z = 1.0f; Matrix3f.transform(tmpMat, tmpVec, tmpVec); - + copyBuffer.putFloat(tmpVec.x); copyBuffer.putFloat(tmpVec.y); copyBuffer.putFloat(tx + tw); copyBuffer.putFloat(ty + th); - + tmpVec.x = -w; tmpVec.y = h; tmpVec.z = 1.0f; Matrix3f.transform(tmpMat, tmpVec, tmpVec); - + copyBuffer.putFloat(tmpVec.x); copyBuffer.putFloat(tmpVec.y); copyBuffer.putFloat(tx); copyBuffer.putFloat(ty + th); } - static void pushGhostQuadAbberated(ByteBuffer copyBuffer, float offset, float scale, int sprite, float r, float g, float b, float a) { + static void pushGhostQuadAbberated(ByteBuffer copyBuffer, float offset, float scale, int sprite, float r, float g, + float b, float a) { pushGhostQuad(copyBuffer, offset, scale, sprite, 0.0f, g, b, a); pushGhostQuad(copyBuffer, offset + 0.005f, scale, sprite, r, 0.0f, 0.0f, a); } - static void pushGhostQuad(ByteBuffer copyBuffer, float offset, float scale, int sprite, float r, float g, float b, float a) { + static void pushGhostQuad(ByteBuffer copyBuffer, float offset, float scale, int sprite, float r, float g, float b, + float a) { copyBuffer.putFloat(offset); copyBuffer.putFloat(scale); copyBuffer.putFloat(0.0f); - copyBuffer.putFloat((float)sprite / ghostsSpriteCount); + copyBuffer.putFloat((float) sprite / ghostsSpriteCount); copyBuffer.putFloat(1.0f); copyBuffer.putFloat(1.0f / ghostsSpriteCount); copyBuffer.putFloat(r * a); @@ -287,7 +296,7 @@ public class LensFlareMeshRenderer { streaksProgram.useProgram(); Minecraft mc = Minecraft.getMinecraft(); - float aspectRatio = (float)mc.displayHeight / (float)mc.displayWidth; + float aspectRatio = (float) mc.displayHeight / (float) mc.displayWidth; float fov = 90.0f / mc.entityRenderer.getFOVModifier(EaglerDeferredPipeline.instance.getPartialTicks(), true); float size = 0.075f * fov * (1.0f + MathHelper.sqrt_float(sunScreenX * sunScreenX + sunScreenY * sunScreenY)); @@ -298,7 +307,8 @@ public class LensFlareMeshRenderer { tmpMat.m20 = sunScreenX; tmpMat.m21 = sunScreenY; - float rotation = sunScreenX * sunScreenX * Math.signum(sunScreenX) + sunScreenY * sunScreenY * Math.signum(sunScreenY); + float rotation = sunScreenX * sunScreenX * Math.signum(sunScreenX) + + sunScreenY * sunScreenY * Math.signum(sunScreenY); tmpMat2.setIdentity(); tmpMat2.m00 = MathHelper.cos(rotation); @@ -311,9 +321,9 @@ public class LensFlareMeshRenderer { Vector3f v = DeferredStateManager.currentSunLightColor; float mag = 1.0f + DeferredStateManager.currentSunAngle.y * 0.8f; - if(mag > 1.0f) { + if (mag > 1.0f) { mag = 1.0f - (mag - 1.0f) * 20.0f; - if(mag < 0.0f) { + if (mag < 0.0f) { mag = 0.0f; } } @@ -340,35 +350,35 @@ public class LensFlareMeshRenderer { } static void destroy() { - if(streaksVertexArray != null) { + if (streaksVertexArray != null) { _wglDeleteVertexArrays(streaksVertexArray); streaksVertexArray = null; } - if(streaksVertexBuffer != null) { + if (streaksVertexBuffer != null) { _wglDeleteBuffers(streaksVertexBuffer); streaksVertexBuffer = null; } - if(ghostsVertexArray != null) { + if (ghostsVertexArray != null) { _wglDeleteVertexArrays(ghostsVertexArray); ghostsVertexArray = null; } - if(ghostsVertexBuffer != null) { + if (ghostsVertexBuffer != null) { _wglDeleteBuffers(ghostsVertexBuffer); ghostsVertexBuffer = null; } - if(streaksTexture != -1) { + if (streaksTexture != -1) { GlStateManager.deleteTexture(streaksTexture); streaksTexture = -1; } - if(ghostsTexture != -1) { + if (ghostsTexture != -1) { GlStateManager.deleteTexture(ghostsTexture); ghostsTexture = -1; } - if(streaksProgram != null) { + if (streaksProgram != null) { streaksProgram.destroy(); streaksProgram = null; } - if(ghostsProgram != null) { + if (ghostsProgram != null) { ghostsProgram.destroy(); ghostsProgram = null; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java index 620ad6d..b9d7f9c 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java @@ -2,19 +2,26 @@ package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture; import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL; import net.minecraft.client.Minecraft; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023 lax1dude. 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. * @@ -27,7 +34,8 @@ public class TextureClockPBRImpl extends EaglerTextureAtlasSpritePBR { super(spriteName); } - public void updateAnimationPBR(IFramebufferGL[] copyColorFramebuffer, IFramebufferGL[] copyMaterialFramebuffer, int materialTexOffset) { + public void updateAnimationPBR(IFramebufferGL[] copyColorFramebuffer, IFramebufferGL[] copyMaterialFramebuffer, + int materialTexOffset) { if (!this.frameTextureDataPBR[0].isEmpty()) { Minecraft minecraft = Minecraft.getMinecraft(); double d0 = 0.0; @@ -53,7 +61,8 @@ public class TextureClockPBRImpl extends EaglerTextureAtlasSpritePBR { this.smoothParam1 += this.smoothParam2; int i, frameCount = this.frameTextureDataPBR[0].size(); - for (i = (int) ((this.smoothParam1 + 1.0) * frameCount) % frameCount; i < 0; i = (i + frameCount) % frameCount) { + for (i = (int) ((this.smoothParam1 + 1.0) * frameCount) % frameCount; i < 0; i = (i + frameCount) + % frameCount) { ; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java index b4ac23a..de67900 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java @@ -2,21 +2,28 @@ package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture; import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL; import net.minecraft.client.Minecraft; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** * Copyright (c) 2023 lax1dude. 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. * @@ -29,13 +36,16 @@ public class TextureCompassPBRImpl extends EaglerTextureAtlasSpritePBR { super(spriteName); } - public void updateAnimationPBR(IFramebufferGL[] copyColorFramebuffer, IFramebufferGL[] copyMaterialFramebuffer, int materialOffset) { + public void updateAnimationPBR(IFramebufferGL[] copyColorFramebuffer, IFramebufferGL[] copyMaterialFramebuffer, + int materialOffset) { Minecraft minecraft = Minecraft.getMinecraft(); if (minecraft.theWorld != null && minecraft.thePlayer != null) { this.updateCompassPBR(minecraft.theWorld, minecraft.thePlayer.posX, minecraft.thePlayer.posZ, - (double) minecraft.thePlayer.rotationYaw, false, copyColorFramebuffer, copyMaterialFramebuffer, materialOffset); + (double) minecraft.thePlayer.rotationYaw, false, copyColorFramebuffer, copyMaterialFramebuffer, + materialOffset); } else { - this.updateCompassPBR((World) null, 0.0, 0.0, 0.0, true, copyColorFramebuffer, copyMaterialFramebuffer, materialOffset); + this.updateCompassPBR((World) null, 0.0, 0.0, 0.0, true, copyColorFramebuffer, copyMaterialFramebuffer, + materialOffset); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java index 6b56bc3..d996c22 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightBucketLoader.java @@ -14,7 +14,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ArrayListSerial; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ListSerial; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2023-2024 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsAcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsAcceleratedEffectRenderer.java index 73567fe..565517f 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsAcceleratedEffectRenderer.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsAcceleratedEffectRenderer.java @@ -18,7 +18,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.program.DynamicLig import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2024 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java index 3d4f82c..3cea2b1 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/dynamiclights/DynamicLightsStateManager.java @@ -10,7 +10,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2024 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java index 4445b32..0e9d58c 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java @@ -22,7 +22,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2022-2024 lax1dude. All Rights Reserved. diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java index 28a6d8f..1a24259 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java @@ -23,9 +23,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiDisconnected; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.GuiConnecting; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * Copyright (c) 2022-2023 lax1dude, hoosiertransfer, ayunami2000. All Rights @@ -135,7 +135,7 @@ public class ConnectionHandshake { di.read(dat); String msg = new String(dat, StandardCharsets.UTF_8); - mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", new ChatComponentText(msg))); + mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", new TextComponentString(msg))); return false; } else if (type == HandshakePacketTypes.PROTOCOL_SERVER_VERSION) { @@ -144,7 +144,7 @@ public class ConnectionHandshake { if (serverVers != protocolV2 && serverVers != protocolV3) { logger.info("Incompatible server version: {}", serverVers); mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", - new ChatComponentText(serverVers < protocolV2 ? "Outdated Server" : "Outdated Client"))); + new TextComponentString(serverVers < protocolV2 ? "Outdated Server" : "Outdated Client"))); return false; } @@ -152,7 +152,7 @@ public class ConnectionHandshake { if (gameVers != 47) { logger.info("Incompatible minecraft protocol version: {}", gameVers); mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", - new ChatComponentText("This server does not support 1.8!"))); + new TextComponentString("This server does not support 1.8!"))); return false; } @@ -197,7 +197,7 @@ public class ConnectionHandshake { logger.error( "Plaintext authentication was attempted but no user confirmation has been given to proceed"); mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", - new ChatComponentText(EnumChatFormatting.RED + new TextComponentString(EnumChatFormatting.RED + "Plaintext authentication was attempted but no user confirmation has been given to proceed"))); return false; } @@ -269,7 +269,7 @@ public class ConnectionHandshake { } else { logger.error("Unsupported authentication type: {}", authType); mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", - new ChatComponentText( + new TextComponentString( EnumChatFormatting.RED + "Unsupported authentication type: " + authType + "\n\n" + EnumChatFormatting.GRAY + "(Use a newer version of the client)"))); return false; @@ -370,7 +370,7 @@ public class ConnectionHandshake { di.read(dat); String errStr = new String(dat, StandardCharsets.UTF_8); mc.displayGuiScreen(new GuiDisconnected(ret, "connect.failed", - IChatComponent.Serializer.jsonToComponent(errStr))); + ITextComponent.Serializer.jsonToComponent(errStr))); return false; } else if (type == HandshakePacketTypes.PROTOCOL_SERVER_ERROR) { showError(mc, connecting, ret, di, serverVers == protocolV2); @@ -429,18 +429,18 @@ public class ConnectionHandshake { RateLimitTracker.registerLockOut(PlatformNetworking.getCurrentURI()); mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(scr)); } else if (errorCode == HandshakePacketTypes.SERVER_ERROR_CUSTOM_MESSAGE) { - if (IChatComponent.Serializer.jsonToComponent(errStr).getUnformattedText().toLowerCase() + if (ITextComponent.Serializer.jsonToComponent(errStr).getUnformattedText().toLowerCase() .contains("reload page")) { EaglerProfile.updateUsernameCookieFromLocalStorage(); reloadPage(); } mc.displayGuiScreen( - new GuiDisconnected(scr, "connect.failed", IChatComponent.Serializer.jsonToComponent(errStr))); + new GuiDisconnected(scr, "connect.failed", ITextComponent.Serializer.jsonToComponent(errStr))); } else if (connecting != null && errorCode == HandshakePacketTypes.SERVER_ERROR_AUTHENTICATION_REQUIRED) { mc.displayGuiScreen(new GuiAuthenticationScreen(connecting, scr, errStr)); } else { mc.displayGuiScreen(new GuiDisconnected(scr, "connect.failed", - new ChatComponentText("Server Error Code " + errorCode + "\n" + errStr))); + new TextComponentString("Server Error Code " + errorCode + "\n" + errStr))); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java index 0c28ed2..8b7cbc7 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java @@ -17,8 +17,8 @@ import net.minecraft.network.EnumPacketDirection; import net.minecraft.network.INetHandler; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * Copyright (c) 2022-2024 lax1dude, hoosiertransfer, ayunami2000. All Rights @@ -85,7 +85,7 @@ public class EaglercraftNetworkManager { @JSBody(params = {}, script = "window.onbeforeunload = null; location.reload();") public static native void reloadPage(); - public void closeChannel(IChatComponent reason) { + public void closeChannel(ITextComponent reason) { PlatformNetworking.playDisconnect(); if (nethandler != null) { nethandler.onDisconnect(reason); @@ -210,7 +210,7 @@ public class EaglercraftNetworkManager { processReceivedPackets(); // catch kick message } catch (IOException e) { } - doClientDisconnect(new ChatComponentTranslation("disconnect.endOfStream")); + doClientDisconnect(new TextComponentTranslation("disconnect.endOfStream")); return true; } else { return false; @@ -219,7 +219,7 @@ public class EaglercraftNetworkManager { protected boolean clientDisconnected = false; - protected void doClientDisconnect(IChatComponent msg) { + protected void doClientDisconnect(ITextComponent msg) { if (!clientDisconnected) { clientDisconnected = true; if (nethandler != null) { diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java index ce73c22..7de29ae 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SkullCommand.java @@ -6,19 +6,26 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets; import net.minecraft.client.Minecraft; import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; /** * Copyright (c) 2024 lax1dude. 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. * @@ -38,31 +45,34 @@ public class SkullCommand { } public void tick() { - if(waitingForSelection && EagRuntime.fileChooserHasResult()) { + if (waitingForSelection && EagRuntime.fileChooserHasResult()) { waitingForSelection = false; FileChooserResult fr = EagRuntime.getFileChooserResult(); - if(fr == null || mc.thePlayer == null || mc.thePlayer.sendQueue == null) { + if (fr == null || mc.thePlayer == null || mc.thePlayer.sendQueue == null) { return; } ImageData loaded = ImageData.loadImageFile(fr.fileData); - if(loaded == null) { - mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("command.skull.error.invalid.png")); + if (loaded == null) { + mc.ingameGUI.getChatGUI() + .printChatMessage(new TextComponentTranslation("command.skull.error.invalid.png")); return; } - if(loaded.width != 64 || loaded.height > 64) { - mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("command.skull.error.invalid.skin", loaded.width, loaded.height)); + if (loaded.width != 64 || loaded.height > 64) { + mc.ingameGUI.getChatGUI().printChatMessage( + new TextComponentTranslation("command.skull.error.invalid.skin", loaded.width, loaded.height)); return; } byte[] rawSkin = new byte[loaded.pixels.length << 2]; - for(int i = 0, j, k; i < 4096; ++i) { + for (int i = 0, j, k; i < 4096; ++i) { j = i << 2; k = loaded.pixels[i]; - rawSkin[j] = (byte)(k >> 24); - rawSkin[j + 1] = (byte)(k >> 16); - rawSkin[j + 2] = (byte)(k >> 8); - rawSkin[j + 3] = (byte)(k & 0xFF); + rawSkin[j] = (byte) (k >> 24); + rawSkin[j + 1] = (byte) (k >> 16); + rawSkin[j + 2] = (byte) (k >> 8); + rawSkin[j + 3] = (byte) (k & 0xFF); } - mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("EAG|Skins-1.8", SkinPackets.writeCreateCustomSkull(rawSkin))); + mc.thePlayer.sendQueue.addToSendQueue( + new C17PacketCustomPayload("EAG|Skins-1.8", SkinPackets.writeCreateCustomSkull(rawSkin))); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java index 86f8948..c5b55f9 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenLANConnecting.java @@ -13,7 +13,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.network.EnumConnectionState; import net.minecraft.network.login.client.C00PacketLoginStart; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; import java.io.IOException; @@ -81,7 +81,7 @@ public class GuiScreenLANConnecting extends GuiScreen { if (mc.currentScreen == this) { mc.loadWorld(null); mc.displayGuiScreen(new GuiDisconnected(parent, "connect.failed", - new ChatComponentText("LAN Connection Refused"))); + new TextComponentString("LAN Connection Refused"))); } } } @@ -122,7 +122,7 @@ public class GuiScreenLANConnecting extends GuiScreen { networkManager = LANClientNetworkManager.connectToWorld(sock, code, sock.getURI()); if (networkManager == null) { this.mc.displayGuiScreen(new GuiDisconnected(parent, "connect.failed", - new ChatComponentText(I18n.format("noRelay.worldFail").replace("$code$", code)))); + new TextComponentString(I18n.format("noRelay.worldFail").replace("$code$", code)))); return; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java index fb38a61..4799113 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenSingleplayerConnecting.java @@ -13,19 +13,26 @@ import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.resources.I18n; import net.minecraft.network.EnumConnectionState; import net.minecraft.network.login.client.C00PacketLoginStart; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; /** * Copyright (c) 2022-2024 lax1dude. 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. * @@ -37,43 +44,47 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen { private GuiButton killTask; private ClientIntegratedServerNetworkManager networkManager = null; private int timer = 0; - + private long startStartTime; private boolean hasOpened = false; - + public GuiScreenSingleplayerConnecting(GuiScreen menu, String message) { this.menu = menu; this.message = message; } - + public void initGui() { - if(startStartTime == 0) this.startStartTime = System.currentTimeMillis(); - this.buttonList.add(killTask = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, I18n.format("singleplayer.busy.killTask"))); + if (startStartTime == 0) + this.startStartTime = System.currentTimeMillis(); + this.buttonList.add(killTask = new GuiButton(0, this.width / 2 - 100, this.height / 3 + 50, + I18n.format("singleplayer.busy.killTask"))); killTask.enabled = false; } - + public void drawScreen(int par1, int par2, float par3) { this.drawDefaultBackground(); float f = 2.0f; int top = this.height / 3; - + long millis = System.currentTimeMillis(); - + long dots = (millis / 500l) % 4l; - this.drawString(fontRendererObj, message + (dots > 0 ? "." : "") + (dots > 1 ? "." : "") + (dots > 2 ? "." : ""), (this.width - this.fontRendererObj.getStringWidth(message)) / 2, top + 10, 0xFFFFFF); - + this.drawString(fontRendererObj, + message + (dots > 0 ? "." : "") + (dots > 1 ? "." : "") + (dots > 2 ? "." : ""), + (this.width - this.fontRendererObj.getStringWidth(message)) / 2, top + 10, 0xFFFFFF); + long elapsed = (millis - startStartTime) / 1000l; - if(elapsed > 3) { + if (elapsed > 3) { this.drawCenteredString(fontRendererObj, "(" + elapsed + "s)", this.width / 2, top + 25, 0xFFFFFF); } - + super.drawScreen(par1, par2, par3); } public boolean doesGuiPauseGame() { return false; } - + public void updateScreen() { ++timer; if (timer > 1) { @@ -87,8 +98,10 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen { this.mc.getSession().setLAN(); this.mc.clearTitles(); this.networkManager.setConnectionState(EnumConnectionState.LOGIN); - this.networkManager.setNetHandler(new NetHandlerSingleplayerLogin(this.networkManager, this.mc, this.menu)); - this.networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(), EaglerProfile.getSkinPacket(), EaglerProfile.getCapePacket())); + this.networkManager.setNetHandler( + new NetHandlerSingleplayerLogin(this.networkManager, this.mc, this.menu)); + this.networkManager.sendPacket(new C00PacketLoginStart(this.mc.getSession().getProfile(), + EaglerProfile.getSkinPacket(), EaglerProfile.getCapePacket())); } try { this.networkManager.processReceivedPackets(); @@ -99,23 +112,24 @@ public class GuiScreenSingleplayerConnecting extends GuiScreen { this.mc.getSession().reset(); if (mc.currentScreen == this) { mc.loadWorld(null); - mc.displayGuiScreen(new GuiDisconnected(menu, "connect.failed", new ChatComponentText("Worker Connection Refused"))); + mc.displayGuiScreen(new GuiDisconnected(menu, "connect.failed", + new TextComponentString("Worker Connection Refused"))); } } } } } - + long millis = System.currentTimeMillis(); - if(millis - startStartTime > 6000l && SingleplayerServerController.canKillWorker()) { + if (millis - startStartTime > 6000l && SingleplayerServerController.canKillWorker()) { killTask.enabled = true; } } protected void actionPerformed(GuiButton par1GuiButton) { - if(par1GuiButton.id == 0) { + if (par1GuiButton.id == 0) { SingleplayerServerController.killWorker(); - this.mc.loadWorld((WorldClient)null); + this.mc.loadWorld((WorldClient) null); this.mc.getSession().reset(); this.mc.displayGuiScreen(menu); } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java index f1b98cd..8688487 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java @@ -8,7 +8,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.resources.I18n; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.WorldSettings; /** @@ -162,7 +162,7 @@ public class GuiShareToLan extends GuiScreen { if (code != null) { SingleplayerServerController.configureLAN(WorldSettings.GameType.getByName(this.gameMode), this.allowCommands); - this.mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(I18n.format("lanServer.opened") + this.mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(I18n.format("lanServer.opened") .replace("$relay$", LANServerController.getCurrentURI()).replace("$code$", code))); } else { this.mc.displayGuiScreen(new GuiScreenNoRelays(this, "noRelay.titleFail")); diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java index 69a1d1d..51c800a 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java @@ -16,8 +16,8 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.*; import net.minecraft.network.EnumPacketDirection; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import java.io.IOException; import java.io.InputStream; @@ -372,7 +372,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { if (fullData.length == 31 && fullData[0] == (byte) 0xFF && fullData[1] == (byte) 0x00 && fullData[2] == (byte) 0x0E) { logger.error("Detected a 1.5 LAN server!"); - this.closeChannel(new ChatComponentTranslation("singleplayer.outdatedLANServerKick")); + this.closeChannel(new TextComponentTranslation("singleplayer.outdatedLANServerKick")); firstPacket = false; return; } @@ -414,7 +414,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { } @Override - public void closeChannel(IChatComponent reason) { + public void closeChannel(ITextComponent reason) { if (!PlatformWebRTC.clientLANClosed()) { PlatformWebRTC.clientLANCloseConnection(); } @@ -432,7 +432,7 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager { processReceivedPackets(); // catch kick message } catch (IOException e) { } - doClientDisconnect(new ChatComponentTranslation("disconnect.endOfStream")); + doClientDisconnect(new TextComponentTranslation("disconnect.endOfStream")); } return clientDisconnected; } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java index ef861b8..d4b5403 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java @@ -3,19 +3,26 @@ package net.lax1dude.eaglercraft.v1_8.sp.server; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; /** * Copyright (c) 2024 lax1dude. 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. * @@ -49,7 +56,7 @@ public class ClientCommandDummy extends CommandBase { @Override public void processCommand(ICommandSender var1, String[] var2) throws CommandException { - var1.addChatMessage(new ChatComponentTranslation("command.clientStub")); + var1.addChatMessage(new TextComponentTranslation("command.clientStub")); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java index 4203ddc..60156c8 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java @@ -20,9 +20,9 @@ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; import net.lax1dude.eaglercraft.v1_8.sp.ipc.*; import net.minecraft.network.EnumConnectionState; import net.minecraft.server.network.NetHandlerLoginServer; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.ReportedException; import net.minecraft.util.StringTranslate; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings.GameType; @@ -114,7 +114,7 @@ public class EaglerIntegratedServerWorker { public static void closeChannel(String channel) { IntegratedServerPlayerNetworkManager netmanager = openChannels.remove(channel); if (netmanager != null) { - netmanager.closeChannel(new ChatComponentText("End of stream")); + netmanager.closeChannel(new TextComponentString("End of stream")); sendIPCPacket(new IPCPacket0CPlayerChannel(channel, false)); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java index e2a8917..1d1a91a 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java @@ -18,8 +18,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.S3FPacketCustomPayload; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; @@ -27,14 +27,21 @@ import net.minecraft.nbt.NBTTagString; /** * Copyright (c) 2022-2024 lax1dude. 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. * @@ -48,11 +55,11 @@ public class IntegratedSkinService { public static final byte[] skullNotFoundTexture = new byte[4096]; static { - for(int y = 0; y < 16; ++y) { - for(int x = 0; x < 64; ++x) { + for (int y = 0; y < 16; ++y) { + for (int x = 0; x < 64; ++x) { int i = (y << 8) | (x << 2); - byte j = ((x + y) & 1) == 1 ? (byte)255 : 0; - skullNotFoundTexture[i] = (byte)255; + byte j = ((x + y) & 1) == 1 ? (byte) 255 : 0; + skullNotFoundTexture[i] = (byte) 255; skullNotFoundTexture[i + 1] = j; skullNotFoundTexture[i + 2] = 0; skullNotFoundTexture[i + 3] = j; @@ -62,8 +69,8 @@ public class IntegratedSkinService { public final VFile2 skullsDirectory; - public final Map playerSkins = new HashMap(); - public final Map customSkulls = new HashMap(); + public final Map playerSkins = new HashMap(); + public final Map customSkulls = new HashMap(); private long lastFlush = 0l; @@ -93,32 +100,34 @@ public class IntegratedSkinService { public void processPacketGetOtherSkin(EaglercraftUUID searchUUID, EntityPlayerMP sender) { byte[] playerSkin = playerSkins.get(searchUUID); - if(playerSkin == null) { + if (playerSkin == null) { playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID); } - sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length)))); + sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, + new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length)))); } public void processPacketGetOtherSkin(EaglercraftUUID searchUUID, String urlStr, EntityPlayerMP sender) { urlStr = urlStr.toLowerCase(); byte[] playerSkin; - if(!urlStr.startsWith("eagler://")) { + if (!urlStr.startsWith("eagler://")) { playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID, 0); - }else { + } else { urlStr = urlStr.substring(9); - if(urlStr.contains(VFile2.pathSeperator)) { + if (urlStr.contains(VFile2.pathSeperator)) { playerSkin = IntegratedSkinPackets.makePresetResponse(searchUUID, 0); - }else { + } else { CustomSkullData sk = customSkulls.get(urlStr); - if(sk == null) { + if (sk == null) { customSkulls.put(urlStr, sk = loadCustomSkull(urlStr)); - }else { + } else { sk.lastHit = System.currentTimeMillis(); } playerSkin = IntegratedSkinPackets.makeCustomResponse(searchUUID, 0, sk.getFullSkin()); } } - sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length)))); + sender.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload(CHANNEL, + new PacketBuffer(Unpooled.buffer(playerSkin, playerSkin.length).writerIndex(playerSkin.length)))); } public void processPacketPlayerSkin(EaglercraftUUID clientUUID, byte[] generatedPacket, int skinModel) { @@ -130,8 +139,8 @@ public class IntegratedSkinService { } public void processPacketInstallNewSkin(byte[] skullData, EntityPlayerMP sender) { - if(!sender.canCommandSenderUseCommand(2, "give")) { - ChatComponentTranslation cc = new ChatComponentTranslation("command.skull.nopermission"); + if (!sender.canCommandSenderUseCommand(2, "give")) { + TextComponentTranslation cc = new TextComponentTranslation("command.skull.nopermission"); cc.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(cc); return; @@ -140,12 +149,15 @@ public class IntegratedSkinService { NBTTagCompound rootTagCompound = new NBTTagCompound(); NBTTagCompound ownerTagCompound = new NBTTagCompound(); ownerTagCompound.setString("Name", "Eagler"); - ownerTagCompound.setString("Id", EaglercraftUUID.nameUUIDFromBytes((("EaglerSkullUUID:" + fileName).getBytes(StandardCharsets.UTF_8))).toString()); + ownerTagCompound.setString("Id", EaglercraftUUID + .nameUUIDFromBytes((("EaglerSkullUUID:" + fileName).getBytes(StandardCharsets.UTF_8))).toString()); NBTTagCompound propertiesTagCompound = new NBTTagCompound(); NBTTagList texturesTagList = new NBTTagList(); NBTTagCompound texturesTagCompound = new NBTTagCompound(); - String texturesProp = "{\"textures\":{\"SKIN\":{\"url\":\"" + fileName + "\",\"metadata\":{\"model\":\"default\"}}}}"; - texturesTagCompound.setString("Value", Base64.encodeBase64String(texturesProp.getBytes(StandardCharsets.UTF_8))); + String texturesProp = "{\"textures\":{\"SKIN\":{\"url\":\"" + fileName + + "\",\"metadata\":{\"model\":\"default\"}}}}"; + texturesTagCompound.setString("Value", + Base64.encodeBase64String(texturesProp.getBytes(StandardCharsets.UTF_8))); texturesTagList.appendTag(texturesTagCompound); propertiesTagCompound.setTag("textures", texturesTagList); ownerTagCompound.setTag("Properties", propertiesTagCompound); @@ -153,7 +165,8 @@ public class IntegratedSkinService { NBTTagCompound displayTagCompound = new NBTTagCompound(); displayTagCompound.setString("Name", EnumChatFormatting.RESET + "Custom Eaglercraft Skull"); NBTTagList loreList = new NBTTagList(); - loreList.appendTag(new NBTTagString(EnumChatFormatting.GRAY + (fileName.length() > 24 ? (fileName.substring(0, 22) + "...") : fileName))); + loreList.appendTag(new NBTTagString( + EnumChatFormatting.GRAY + (fileName.length() > 24 ? (fileName.substring(0, 22) + "...") : fileName))); displayTagCompound.setTag("Lore", loreList); rootTagCompound.setTag("display", displayTagCompound); ItemStack stack = new ItemStack(Items.skull, 1, 3); @@ -165,14 +178,14 @@ public class IntegratedSkinService { * 2.0F); sender.inventoryContainer.detectAndSendChanges(); } - sender.addChatMessage(new ChatComponentTranslation("command.skull.feedback", fileName)); + sender.addChatMessage(new TextComponentTranslation("command.skull.feedback", fileName)); } private static final String hex = "0123456789abcdef"; public String installNewSkull(byte[] skullData) { // set to 16384 to save a full 64x64 skin - if(skullData.length > 4096) { + if (skullData.length > 4096) { byte[] tmp = skullData; skullData = new byte[4096]; System.arraycopy(tmp, 0, skullData, 0, 4096); @@ -182,7 +195,7 @@ public class IntegratedSkinService { byte[] hash = new byte[20]; sha.doFinal(hash, 0); char[] hashText = new char[40]; - for(int i = 0; i < 20; ++i) { + for (int i = 0; i < 20; ++i) { hashText[i << 1] = hex.charAt((hash[i] & 0xF0) >> 4); hashText[(i << 1) + 1] = hex.charAt(hash[i] & 0x0F); } @@ -194,20 +207,20 @@ public class IntegratedSkinService { private CustomSkullData loadCustomSkull(String urlStr) { byte[] data = (new VFile2(skullsDirectory, urlStr)).getAllBytes(); - if(data == null) { + if (data == null) { return new CustomSkullData(urlStr, skullNotFoundTexture); - }else { + } else { return new CustomSkullData(urlStr, data); } } public void flushCache() { long cur = System.currentTimeMillis(); - if(cur - lastFlush > 300000l) { + if (cur - lastFlush > 300000l) { lastFlush = cur; Iterator customSkullsItr = customSkulls.values().iterator(); - while(customSkullsItr.hasNext()) { - if(cur - customSkullsItr.next().lastHit > 900000l) { + while (customSkullsItr.hasNext()) { + if (cur - customSkullsItr.next().lastHit > 900000l) { customSkullsItr.remove(); } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java index ef11493..599dab1 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java @@ -22,9 +22,9 @@ import net.minecraft.network.EnumPacketDirection; import net.minecraft.network.INetHandler; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer; /** @@ -94,7 +94,7 @@ public class IntegratedServerPlayerNetworkManager { : EnumEaglerConnectionState.CLOSED; } - public void closeChannel(IChatComponent reason) { + public void closeChannel(ITextComponent reason) { EaglerIntegratedServerWorker.closeChannel(playerChannel); if (nethandler != null) { nethandler.onDisconnect(reason); @@ -141,7 +141,7 @@ public class IntegratedServerPlayerNetworkManager { } ServerPlatformSingleplayer .sendPacket(new IPCPacketData(playerChannel, kickPacketBAO.toByteArray())); - closeChannel(new ChatComponentText( + closeChannel(new TextComponentString( "Recieved unsuppoorted connection from an Eaglercraft 1.5.2 client!")); firstPacket = false; recievedPacketBufferCounter = 0; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java index 29764cc..0a951da 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java @@ -4,19 +4,26 @@ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; import net.minecraft.network.handshake.INetHandlerHandshakeServer; import net.minecraft.network.handshake.client.C00Handshake; import net.minecraft.server.network.NetHandlerLoginServer; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * Copyright (c) 2023-2024 lax1dude. 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. * @@ -26,14 +33,15 @@ public class NetHandlerHandshakeEagler implements INetHandlerHandshakeServer { private final EaglerMinecraftServer mcServer; private final IntegratedServerPlayerNetworkManager networkManager; - public NetHandlerHandshakeEagler(EaglerMinecraftServer parMinecraftServer, IntegratedServerPlayerNetworkManager parNetworkManager) { + public NetHandlerHandshakeEagler(EaglerMinecraftServer parMinecraftServer, + IntegratedServerPlayerNetworkManager parNetworkManager) { this.mcServer = parMinecraftServer; this.networkManager = parNetworkManager; } @Override - public void onDisconnect(IChatComponent var1) { - + public void onDisconnect(ITextComponent var1) { + } @Override diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java index bf1ebc4..5ae18a1 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java @@ -13,8 +13,8 @@ import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController; import net.minecraft.network.EnumPacketDirection; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * Copyright (c) 2023-2024 lax1dude, hoosiertransfer, ayunami2000. All Rights @@ -62,7 +62,7 @@ public class ClientIntegratedServerNetworkManager extends EaglercraftNetworkMana } @Override - public void closeChannel(IChatComponent reason) { + public void closeChannel(ITextComponent reason) { LANServerController.closeLAN(); SingleplayerServerController.closeLocalPlayerChannel(); if (nethandler != null) { @@ -169,7 +169,7 @@ public class ClientIntegratedServerNetworkManager extends EaglercraftNetworkMana } catch (IOException e) { } clearRecieveQueue(); - doClientDisconnect(new ChatComponentTranslation("disconnect.endOfStream")); + doClientDisconnect(new TextComponentTranslation("disconnect.endOfStream")); return true; } else { return false; diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java index 8bcc2f4..2ac78ba 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/NetHandlerSingleplayerLogin.java @@ -15,19 +15,26 @@ import net.minecraft.network.login.server.S01PacketEncryptionRequest; import net.minecraft.network.login.server.S02PacketLoginSuccess; import net.minecraft.network.login.server.S03PacketEnableCompression; import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * Copyright (c) 2023-2024 lax1dude. 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. * @@ -38,29 +45,32 @@ public class NetHandlerSingleplayerLogin implements INetHandlerLoginClient { private final GuiScreen previousGuiScreen; private final EaglercraftNetworkManager networkManager; - public NetHandlerSingleplayerLogin(EaglercraftNetworkManager parNetworkManager, Minecraft mcIn, GuiScreen parGuiScreen) { + public NetHandlerSingleplayerLogin(EaglercraftNetworkManager parNetworkManager, Minecraft mcIn, + GuiScreen parGuiScreen) { this.networkManager = parNetworkManager; this.mc = mcIn; this.previousGuiScreen = parGuiScreen; } @Override - public void onDisconnect(IChatComponent var1) { + public void onDisconnect(ITextComponent var1) { this.mc.displayGuiScreen(new GuiDisconnected(this.previousGuiScreen, "connect.failed", var1)); } @Override public void handleEncryptionRequest(S01PacketEncryptionRequest var1) { - + } @Override public void handleLoginSuccess(S02PacketLoginSuccess var1) { this.networkManager.setConnectionState(EnumConnectionState.PLAY); - this.networkManager.setNetHandler(new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, var1.getProfile())); + this.networkManager.setNetHandler( + new NetHandlerPlayClient(this.mc, this.previousGuiScreen, this.networkManager, var1.getProfile())); byte[] b = UpdateService.getClientSignatureData(); - if(b != null) { - this.networkManager.sendPacket(new C17PacketCustomPayload("EAG|MyUpdCert-1.8", new PacketBuffer(Unpooled.buffer(b, b.length).writerIndex(b.length)))); + if (b != null) { + this.networkManager.sendPacket(new C17PacketCustomPayload("EAG|MyUpdCert-1.8", + new PacketBuffer(Unpooled.buffer(b, b.length).writerIndex(b.length)))); } } @@ -71,7 +81,7 @@ public class NetHandlerSingleplayerLogin implements INetHandlerLoginClient { @Override public void handleEnableCompression(S03PacketEnableCompression var1) { - + } } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java index c1485cb..aa81b40 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/voice/GuiVoiceMenu.java @@ -17,8 +17,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * Copyright (c) 2022-2024 lax1dude, hoosiertransfer, ayunami2000. All Rights diff --git a/src/main/java/net/minecraft/block/Block.java b/src/main/java/net/minecraft/block/Block.java index f95e143..f6575e0 100644 --- a/src/main/java/net/minecraft/block/Block.java +++ b/src/main/java/net/minecraft/block/Block.java @@ -29,16 +29,16 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ObjectIntIdentityMap; -import net.minecraft.util.RegistryNamespacedDefaultedByKey; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; @@ -693,16 +693,16 @@ public class Block implements ILitBlock { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World world, BlockPos blockpos, Vec3 vec3, Vec3 vec31) { + public RayTraceResult collisionRayTrace(World world, BlockPos blockpos, Vec3d vec3, Vec3d vec31) { this.setBlockBoundsBasedOnState(world, blockpos); vec3 = vec3.addVector((double) (-blockpos.getX()), (double) (-blockpos.getY()), (double) (-blockpos.getZ())); vec31 = vec31.addVector((double) (-blockpos.getX()), (double) (-blockpos.getY()), (double) (-blockpos.getZ())); - Vec3 vec32 = vec3.getIntermediateWithXValue(vec31, this.minX); - Vec3 vec33 = vec3.getIntermediateWithXValue(vec31, this.maxX); - Vec3 vec34 = vec3.getIntermediateWithYValue(vec31, this.minY); - Vec3 vec35 = vec3.getIntermediateWithYValue(vec31, this.maxY); - Vec3 vec36 = vec3.getIntermediateWithZValue(vec31, this.minZ); - Vec3 vec37 = vec3.getIntermediateWithZValue(vec31, this.maxZ); + Vec3d vec32 = vec3.getIntermediateWithXValue(vec31, this.minX); + Vec3d vec33 = vec3.getIntermediateWithXValue(vec31, this.maxX); + Vec3d vec34 = vec3.getIntermediateWithYValue(vec31, this.minY); + Vec3d vec35 = vec3.getIntermediateWithYValue(vec31, this.maxY); + Vec3d vec36 = vec3.getIntermediateWithZValue(vec31, this.minZ); + Vec3d vec37 = vec3.getIntermediateWithZValue(vec31, this.maxZ); if (!this.isVecInsideYZBounds(vec32)) { vec32 = null; } @@ -727,7 +727,7 @@ public class Block implements ILitBlock { vec37 = null; } - Vec3 vec38 = null; + Vec3d vec38 = null; if (vec32 != null && (vec38 == null || vec3.squareDistanceTo(vec32) < vec3.squareDistanceTo(vec38))) { vec38 = vec32; } @@ -780,7 +780,7 @@ public class Block implements ILitBlock { enumfacing = EnumFacing.SOUTH; } - return new MovingObjectPosition( + return new RayTraceResult( vec38.addVector((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ()), enumfacing, blockpos); } @@ -790,7 +790,7 @@ public class Block implements ILitBlock { * + * Checks if a vector is within the Y and Z bounds of the block. */ - private boolean isVecInsideYZBounds(Vec3 point) { + private boolean isVecInsideYZBounds(Vec3d point) { return point == null ? false : point.yCoord >= this.minY && point.yCoord <= this.maxY && point.zCoord >= this.minZ && point.zCoord <= this.maxZ; @@ -800,7 +800,7 @@ public class Block implements ILitBlock { * + * Checks if a vector is within the X and Z bounds of the block. */ - private boolean isVecInsideXZBounds(Vec3 point) { + private boolean isVecInsideXZBounds(Vec3d point) { return point == null ? false : point.xCoord >= this.minX && point.xCoord <= this.maxX && point.zCoord >= this.minZ && point.zCoord <= this.maxZ; @@ -810,7 +810,7 @@ public class Block implements ILitBlock { * + * Checks if a vector is within the X and Y bounds of the block. */ - private boolean isVecInsideXYBounds(Vec3 point) { + private boolean isVecInsideXYBounds(Vec3d point) { return point == null ? false : point.xCoord >= this.minX && point.xCoord <= this.maxX && point.yCoord >= this.minY && point.yCoord <= this.maxY; @@ -868,7 +868,7 @@ public class Block implements ILitBlock { public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn) { } - public Vec3 modifyAcceleration(World worldIn, BlockPos pos, Entity entityIn, Vec3 motion) { + public Vec3d modifyAcceleration(World worldIn, BlockPos pos, Entity entityIn, Vec3d motion) { return motion; } diff --git a/src/main/java/net/minecraft/block/BlockAir.java b/src/main/java/net/minecraft/block/BlockAir.java index dc3cc17..c5a171c 100644 --- a/src/main/java/net/minecraft/block/BlockAir.java +++ b/src/main/java/net/minecraft/block/BlockAir.java @@ -2,8 +2,8 @@ package net.minecraft.block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockAnvil.java b/src/main/java/net/minecraft/block/BlockAnvil.java index 638af3b..d4ab840 100644 --- a/src/main/java/net/minecraft/block/BlockAnvil.java +++ b/src/main/java/net/minecraft/block/BlockAnvil.java @@ -18,10 +18,10 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IBlockAccess; import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; @@ -194,8 +194,8 @@ public class BlockAnvil extends BlockFalling { return false; } - public IChatComponent getDisplayName() { - return new ChatComponentTranslation(Blocks.anvil.getUnlocalizedName() + ".name", new Object[0]); + public ITextComponent getDisplayName() { + return new TextComponentTranslation(Blocks.anvil.getUnlocalizedName() + ".name", new Object[0]); } public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn) { diff --git a/src/main/java/net/minecraft/block/BlockBanner.java b/src/main/java/net/minecraft/block/BlockBanner.java index 95b0301..6c37add 100644 --- a/src/main/java/net/minecraft/block/BlockBanner.java +++ b/src/main/java/net/minecraft/block/BlockBanner.java @@ -15,10 +15,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBanner; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockBarrier.java b/src/main/java/net/minecraft/block/BlockBarrier.java index a19d659..47c44f4 100644 --- a/src/main/java/net/minecraft/block/BlockBarrier.java +++ b/src/main/java/net/minecraft/block/BlockBarrier.java @@ -2,7 +2,7 @@ package net.minecraft.block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockBasePressurePlate.java b/src/main/java/net/minecraft/block/BlockBasePressurePlate.java index ac49a04..4b18667 100644 --- a/src/main/java/net/minecraft/block/BlockBasePressurePlate.java +++ b/src/main/java/net/minecraft/block/BlockBasePressurePlate.java @@ -7,9 +7,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockBeacon.java b/src/main/java/net/minecraft/block/BlockBeacon.java index a3fd909..a8b70e0 100644 --- a/src/main/java/net/minecraft/block/BlockBeacon.java +++ b/src/main/java/net/minecraft/block/BlockBeacon.java @@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBeacon; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/block/BlockBed.java b/src/main/java/net/minecraft/block/BlockBed.java index 0fd9816..d8afc4d 100644 --- a/src/main/java/net/minecraft/block/BlockBed.java +++ b/src/main/java/net/minecraft/block/BlockBed.java @@ -15,11 +15,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -92,7 +92,7 @@ public class BlockBed extends BlockDirectional { blockpos1 = blockpos.up(); } entityplayer.setSpawnPoint(blockpos1.add(0.5F, 0.1F, 0.5F), false); - entityplayer.addChatComponentMessage(new ChatComponentTranslation("tile.bed.setspawn")); + entityplayer.addChatComponentMessage(new TextComponentTranslation("tile.bed.setspawn")); if (entityplayer.isSneaking()) { return true; } @@ -102,7 +102,7 @@ public class BlockBed extends BlockDirectional { EntityPlayer entityplayer1 = this.getPlayerInBed(world, blockpos); if (entityplayer1 != null) { entityplayer - .addChatComponentMessage(new ChatComponentTranslation("tile.bed.occupied", new Object[0])); + .addChatComponentMessage(new TextComponentTranslation("tile.bed.occupied", new Object[0])); return true; } @@ -118,10 +118,10 @@ public class BlockBed extends BlockDirectional { } else { if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_POSSIBLE_NOW) { entityplayer - .addChatComponentMessage(new ChatComponentTranslation("tile.bed.noSleep", new Object[0])); + .addChatComponentMessage(new TextComponentTranslation("tile.bed.noSleep", new Object[0])); } else if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_SAFE) { entityplayer - .addChatComponentMessage(new ChatComponentTranslation("tile.bed.notSafe", new Object[0])); + .addChatComponentMessage(new TextComponentTranslation("tile.bed.notSafe", new Object[0])); } return true; diff --git a/src/main/java/net/minecraft/block/BlockBeetroot.java b/src/main/java/net/minecraft/block/BlockBeetroot.java index 808a602..2196db0 100644 --- a/src/main/java/net/minecraft/block/BlockBeetroot.java +++ b/src/main/java/net/minecraft/block/BlockBeetroot.java @@ -6,7 +6,7 @@ import net.hoosiertransfer.EaglerItems; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockBeetroot extends BlockCrops { @@ -14,20 +14,15 @@ public class BlockBeetroot extends BlockCrops { return 3; } - public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) - { - if (rand.nextInt(3) == 0) - { + public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { + if (rand.nextInt(3) == 0) { this.checkAndDropBlock(worldIn, pos, state); - } - else - { + } else { super.updateTick(worldIn, pos, state, rand); } } - protected int getBonemealAgeIncrease(World worldIn) - { + protected int getBonemealAgeIncrease(World worldIn) { return super.getBonemealAgeIncrease(worldIn) / 3; } diff --git a/src/main/java/net/minecraft/block/BlockBreakable.java b/src/main/java/net/minecraft/block/BlockBreakable.java index c962b4b..980e3a7 100644 --- a/src/main/java/net/minecraft/block/BlockBreakable.java +++ b/src/main/java/net/minecraft/block/BlockBreakable.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/block/BlockBrewingStand.java b/src/main/java/net/minecraft/block/BlockBrewingStand.java index 36de536..8ff6f77 100644 --- a/src/main/java/net/minecraft/block/BlockBrewingStand.java +++ b/src/main/java/net/minecraft/block/BlockBrewingStand.java @@ -21,12 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBrewingStand; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockBush.java b/src/main/java/net/minecraft/block/BlockBush.java index 5e471f9..f4dd6c5 100644 --- a/src/main/java/net/minecraft/block/BlockBush.java +++ b/src/main/java/net/minecraft/block/BlockBush.java @@ -7,9 +7,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockButton.java b/src/main/java/net/minecraft/block/BlockButton.java index 11c9e31..b583478 100644 --- a/src/main/java/net/minecraft/block/BlockButton.java +++ b/src/main/java/net/minecraft/block/BlockButton.java @@ -13,9 +13,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockCactus.java b/src/main/java/net/minecraft/block/BlockCactus.java index adebc5a..2ec67e1 100644 --- a/src/main/java/net/minecraft/block/BlockCactus.java +++ b/src/main/java/net/minecraft/block/BlockCactus.java @@ -10,11 +10,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -122,18 +122,17 @@ public class BlockCactus extends Block { } public boolean canBlockStay(World worldIn, BlockPos pos) { - for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) - { - Material material = worldIn.getBlockState(pos.offset(enumfacing)).getBlock().getMaterial(); + for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) { + Material material = worldIn.getBlockState(pos.offset(enumfacing)).getBlock().getMaterial(); - if (material.isSolid() || material == Material.lava) - { - return false; - } - } + if (material.isSolid() || material == Material.lava) { + return false; + } + } Block block = worldIn.getBlockState(pos.down()).getBlock(); - return block == Blocks.cactus || block == Blocks.sand && !worldIn.getBlockState(pos.up()).getBlock().getMaterial().isLiquid(); + return block == Blocks.cactus + || block == Blocks.sand && !worldIn.getBlockState(pos.up()).getBlock().getMaterial().isLiquid(); } /** diff --git a/src/main/java/net/minecraft/block/BlockCake.java b/src/main/java/net/minecraft/block/BlockCake.java index f011dfb..5e15d03 100644 --- a/src/main/java/net/minecraft/block/BlockCake.java +++ b/src/main/java/net/minecraft/block/BlockCake.java @@ -11,10 +11,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.stats.StatList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockCarpet.java b/src/main/java/net/minecraft/block/BlockCarpet.java index b33f637..01ccedb 100644 --- a/src/main/java/net/minecraft/block/BlockCarpet.java +++ b/src/main/java/net/minecraft/block/BlockCarpet.java @@ -15,8 +15,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockCauldron.java b/src/main/java/net/minecraft/block/BlockCauldron.java index e5ce6c3..ed40e3f 100644 --- a/src/main/java/net/minecraft/block/BlockCauldron.java +++ b/src/main/java/net/minecraft/block/BlockCauldron.java @@ -20,10 +20,10 @@ import net.minecraft.item.ItemBanner; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntityBanner; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -141,28 +141,24 @@ public class BlockCauldron extends Block { return true; } else if (item == Items.bucket) { - if (i == 3 && !world.isRemote) - { - if (!entityplayer.capabilities.isCreativeMode) - { + if (i == 3 && !world.isRemote) { + if (!entityplayer.capabilities.isCreativeMode) { ItemStack heldItem = entityplayer.inventory.getCurrentItem(); --heldItem.stackSize; - - if (heldItem.stackSize == 0) - { + + if (heldItem.stackSize == 0) { entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, - new ItemStack(Items.water_bucket)); - } - else if (!entityplayer.inventory.addItemStackToInventory(new ItemStack(Items.water_bucket))) - { + new ItemStack(Items.water_bucket)); + } else if (!entityplayer.inventory + .addItemStackToInventory(new ItemStack(Items.water_bucket))) { entityplayer.dropPlayerItemWithRandomChoice(new ItemStack(Items.water_bucket), false); } } - + entityplayer.addStat(StatList.CAULDRON_USED, 1); this.setWaterLevel(world, blockpos, iblockstate, 0); } - + return true; } else if (item == Items.glass_bottle) { if (i > 0) { diff --git a/src/main/java/net/minecraft/block/BlockChest.java b/src/main/java/net/minecraft/block/BlockChest.java index a6e05ca..c1d9e9d 100644 --- a/src/main/java/net/minecraft/block/BlockChest.java +++ b/src/main/java/net/minecraft/block/BlockChest.java @@ -20,10 +20,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockChorusFlower.java b/src/main/java/net/minecraft/block/BlockChorusFlower.java index 561cc3f..f4bf1c4 100644 --- a/src/main/java/net/minecraft/block/BlockChorusFlower.java +++ b/src/main/java/net/minecraft/block/BlockChorusFlower.java @@ -17,9 +17,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockChorusFlower extends Block { diff --git a/src/main/java/net/minecraft/block/BlockChorusPlant.java b/src/main/java/net/minecraft/block/BlockChorusPlant.java index 45dffd5..c54468f 100644 --- a/src/main/java/net/minecraft/block/BlockChorusPlant.java +++ b/src/main/java/net/minecraft/block/BlockChorusPlant.java @@ -15,10 +15,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockCocoa.java b/src/main/java/net/minecraft/block/BlockCocoa.java index a86fcf8..41505e0 100644 --- a/src/main/java/net/minecraft/block/BlockCocoa.java +++ b/src/main/java/net/minecraft/block/BlockCocoa.java @@ -13,10 +13,10 @@ import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockCommandBlock.java b/src/main/java/net/minecraft/block/BlockCommandBlock.java index 20c2b7d..1a2eed2 100644 --- a/src/main/java/net/minecraft/block/BlockCommandBlock.java +++ b/src/main/java/net/minecraft/block/BlockCommandBlock.java @@ -18,9 +18,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityCommandBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockCompressedPowered.java b/src/main/java/net/minecraft/block/BlockCompressedPowered.java index 6cd0878..d3dcc40 100644 --- a/src/main/java/net/minecraft/block/BlockCompressedPowered.java +++ b/src/main/java/net/minecraft/block/BlockCompressedPowered.java @@ -3,8 +3,8 @@ package net.minecraft.block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/block/BlockContainer.java b/src/main/java/net/minecraft/block/BlockContainer.java index 8cb93d2..9894a07 100644 --- a/src/main/java/net/minecraft/block/BlockContainer.java +++ b/src/main/java/net/minecraft/block/BlockContainer.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockCrops.java b/src/main/java/net/minecraft/block/BlockCrops.java index 77daaf5..a5f61e9 100644 --- a/src/main/java/net/minecraft/block/BlockCrops.java +++ b/src/main/java/net/minecraft/block/BlockCrops.java @@ -11,8 +11,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -80,28 +80,24 @@ public class BlockCrops extends BlockBush implements IGrowable { } - public IBlockState withAge(int age) - { - return this.getDefaultState().withProperty(AGE, Integer.valueOf(age)); - } + public IBlockState withAge(int age) { + return this.getDefaultState().withProperty(AGE, Integer.valueOf(age)); + } - protected int getAge(IBlockState state) - { - return ((Integer)state.getValue(AGE)).intValue(); - } + protected int getAge(IBlockState state) { + return ((Integer) state.getValue(AGE)).intValue(); + } - public void grow(World worldIn, BlockPos pos, IBlockState state) - { - int i = this.getAge(state) + this.getBonemealAgeIncrease(worldIn); - int j = this.getMaxAge(); + public void grow(World worldIn, BlockPos pos, IBlockState state) { + int i = this.getAge(state) + this.getBonemealAgeIncrease(worldIn); + int j = this.getMaxAge(); - if (i > j) - { - i = j; - } + if (i > j) { + i = j; + } - worldIn.setBlockState(pos, this.withAge(i), 2); - } + worldIn.setBlockState(pos, this.withAge(i), 2); + } protected static float getGrowthChance(Block blockIn, World worldIn, BlockPos pos) { float f = 1.0F; @@ -162,10 +158,9 @@ public class BlockCrops extends BlockBush implements IGrowable { return Items.wheat; } - public int getMaxAge() - { - return 7; - } + public int getMaxAge() { + return 7; + } /** * + @@ -211,19 +206,17 @@ public class BlockCrops extends BlockBush implements IGrowable { return true; } - protected int getBonemealAgeIncrease(World worldIn) - { - return MathHelper.getRandomIntegerInRange(worldIn.rand, 2, 5); - } + protected int getBonemealAgeIncrease(World worldIn) { + return MathHelper.getRandomIntegerInRange(worldIn.rand, 2, 5); + } public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { this.grow(world, blockpos, iblockstate); } - public boolean isMaxAge(IBlockState state) - { - return ((Integer)state.getValue(AGE)).intValue() >= this.getMaxAge(); - } + public boolean isMaxAge(IBlockState state) { + return ((Integer) state.getValue(AGE)).intValue() >= this.getMaxAge(); + } /** * + diff --git a/src/main/java/net/minecraft/block/BlockDaylightDetector.java b/src/main/java/net/minecraft/block/BlockDaylightDetector.java index 20d49a8..76b0322 100644 --- a/src/main/java/net/minecraft/block/BlockDaylightDetector.java +++ b/src/main/java/net/minecraft/block/BlockDaylightDetector.java @@ -15,9 +15,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDaylightDetector; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -74,34 +74,29 @@ public class BlockDaylightDetector extends BlockContainer { return ((Integer) iblockstate.getValue(POWER)).intValue(); } - public void updatePower(World worldIn, BlockPos pos) - { - if (!worldIn.provider.getHasNoSky()) - { - IBlockState iblockstate = worldIn.getBlockState(pos); - int i = worldIn.getLightFor(EnumSkyBlock.SKY, pos) - worldIn.getSkylightSubtracted(); - float f = worldIn.getCelestialAngleRadians(1.0F); + public void updatePower(World worldIn, BlockPos pos) { + if (!worldIn.provider.getHasNoSky()) { + IBlockState iblockstate = worldIn.getBlockState(pos); + int i = worldIn.getLightFor(EnumSkyBlock.SKY, pos) - worldIn.getSkylightSubtracted(); + float f = worldIn.getCelestialAngleRadians(1.0F); - if (this.inverted) - { - i = 15 - i; - } + if (this.inverted) { + i = 15 - i; + } - if (i > 0 && !this.inverted) - { - float f1 = f < (float)Math.PI ? 0.0F : ((float)Math.PI * 2F); - f = f + (f1 - f) * 0.2F; - i = Math.round((float)i * MathHelper.cos(f)); - } + if (i > 0 && !this.inverted) { + float f1 = f < (float) Math.PI ? 0.0F : ((float) Math.PI * 2F); + f = f + (f1 - f) * 0.2F; + i = Math.round((float) i * MathHelper.cos(f)); + } - i = MathHelper.clamp_int(i, 0, 15); + i = MathHelper.clamp_int(i, 0, 15); - if (((Integer)iblockstate.getValue(POWER)).intValue() != i) - { - worldIn.setBlockState(pos, iblockstate.withProperty(POWER, Integer.valueOf(i)), 3); - } - } - } + if (((Integer) iblockstate.getValue(POWER)).intValue() != i) { + worldIn.setBlockState(pos, iblockstate.withProperty(POWER, Integer.valueOf(i)), 3); + } + } + } public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState iblockstate, EntityPlayer entityplayer, EnumFacing enumfacing, float f, float f1, float f2) { diff --git a/src/main/java/net/minecraft/block/BlockDeadBush.java b/src/main/java/net/minecraft/block/BlockDeadBush.java index 4af675b..55241ff 100644 --- a/src/main/java/net/minecraft/block/BlockDeadBush.java +++ b/src/main/java/net/minecraft/block/BlockDeadBush.java @@ -12,7 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -86,12 +86,11 @@ public class BlockDeadBush extends BlockBush { } /** - * Returns the quantity of items to drop on block destruction. - */ - public int quantityDropped(EaglercraftRandom random) - { - return random.nextInt(3); - } + * Returns the quantity of items to drop on block destruction. + */ + public int quantityDropped(EaglercraftRandom random) { + return random.nextInt(3); + } public void harvestBlock(World world, EntityPlayer entityplayer, BlockPos blockpos, IBlockState iblockstate, TileEntity tileentity) { diff --git a/src/main/java/net/minecraft/block/BlockDirt.java b/src/main/java/net/minecraft/block/BlockDirt.java index 202be27..22bc340 100644 --- a/src/main/java/net/minecraft/block/BlockDirt.java +++ b/src/main/java/net/minecraft/block/BlockDirt.java @@ -13,8 +13,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockDispenser.java b/src/main/java/net/minecraft/block/BlockDispenser.java index ff64d9e..727d403 100644 --- a/src/main/java/net/minecraft/block/BlockDispenser.java +++ b/src/main/java/net/minecraft/block/BlockDispenser.java @@ -24,9 +24,9 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; import net.minecraft.tileentity.TileEntityDropper; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.RegistryDefaulted; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.RegistryDefaulted; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockDoor.java b/src/main/java/net/minecraft/block/BlockDoor.java index c31e9e7..496bd9d 100644 --- a/src/main/java/net/minecraft/block/BlockDoor.java +++ b/src/main/java/net/minecraft/block/BlockDoor.java @@ -13,14 +13,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -254,7 +254,7 @@ public class BlockDoor extends Block { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World world, BlockPos blockpos, Vec3 vec3, Vec3 vec31) { + public RayTraceResult collisionRayTrace(World world, BlockPos blockpos, Vec3d vec3, Vec3d vec31) { this.setBlockBoundsBasedOnState(world, blockpos); return super.collisionRayTrace(world, blockpos, vec3, vec31); } diff --git a/src/main/java/net/minecraft/block/BlockDoublePlant.java b/src/main/java/net/minecraft/block/BlockDoublePlant.java index 00aa76d..ad5943f 100644 --- a/src/main/java/net/minecraft/block/BlockDoublePlant.java +++ b/src/main/java/net/minecraft/block/BlockDoublePlant.java @@ -17,9 +17,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeColorHelper; diff --git a/src/main/java/net/minecraft/block/BlockDragonEgg.java b/src/main/java/net/minecraft/block/BlockDragonEgg.java index 439b197..540879d 100644 --- a/src/main/java/net/minecraft/block/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/block/BlockDragonEgg.java @@ -8,9 +8,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockDropper.java b/src/main/java/net/minecraft/block/BlockDropper.java index 20dab5a..3ab2a67 100644 --- a/src/main/java/net/minecraft/block/BlockDropper.java +++ b/src/main/java/net/minecraft/block/BlockDropper.java @@ -8,8 +8,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; import net.minecraft.tileentity.TileEntityDropper; import net.minecraft.tileentity.TileEntityHopper; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockDynamicLiquid.java b/src/main/java/net/minecraft/block/BlockDynamicLiquid.java index 2416f3a..03db9aa 100644 --- a/src/main/java/net/minecraft/block/BlockDynamicLiquid.java +++ b/src/main/java/net/minecraft/block/BlockDynamicLiquid.java @@ -7,8 +7,8 @@ import java.util.Set; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockEnchantmentTable.java b/src/main/java/net/minecraft/block/BlockEnchantmentTable.java index e8ca1dd..df5099b 100644 --- a/src/main/java/net/minecraft/block/BlockEnchantmentTable.java +++ b/src/main/java/net/minecraft/block/BlockEnchantmentTable.java @@ -12,9 +12,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityEnchantmentTable; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockEndPortal.java b/src/main/java/net/minecraft/block/BlockEndPortal.java index 19846ab..421e14c 100644 --- a/src/main/java/net/minecraft/block/BlockEndPortal.java +++ b/src/main/java/net/minecraft/block/BlockEndPortal.java @@ -10,10 +10,10 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityEndPortal; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockEndPortalFrame.java b/src/main/java/net/minecraft/block/BlockEndPortalFrame.java index e662bb6..576cfc9 100644 --- a/src/main/java/net/minecraft/block/BlockEndPortalFrame.java +++ b/src/main/java/net/minecraft/block/BlockEndPortalFrame.java @@ -13,9 +13,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockEndRod.java b/src/main/java/net/minecraft/block/BlockEndRod.java index 223b8f5..750705a 100644 --- a/src/main/java/net/minecraft/block/BlockEndRod.java +++ b/src/main/java/net/minecraft/block/BlockEndRod.java @@ -9,11 +9,11 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -96,13 +96,11 @@ public class BlockEndRod extends Block { double d3 = (double) (0.4F - (rand.nextFloat() + rand.nextFloat()) * 0.4F); if (rand.nextInt(5) == 0) { - worldIn.spawnParticle(EnumParticleTypes.END_ROD, d0 + (double) - enumfacing.getFrontOffsetX() * d3, - d1 + (double) enumfacing.getFrontOffsetY() * d3, d2 + (double) - enumfacing.getFrontOffsetZ() * d3, - rand.nextGaussian() * 0.005D, rand.nextGaussian() * 0.005D, - rand.nextGaussian() * 0.005D, - new int[0]); + worldIn.spawnParticle(EnumParticleTypes.END_ROD, d0 + (double) enumfacing.getFrontOffsetX() * d3, + d1 + (double) enumfacing.getFrontOffsetY() * d3, d2 + (double) enumfacing.getFrontOffsetZ() * d3, + rand.nextGaussian() * 0.005D, rand.nextGaussian() * 0.005D, + rand.nextGaussian() * 0.005D, + new int[0]); } } diff --git a/src/main/java/net/minecraft/block/BlockEnderChest.java b/src/main/java/net/minecraft/block/BlockEnderChest.java index 0ffe3fd..3b66e38 100644 --- a/src/main/java/net/minecraft/block/BlockEnderChest.java +++ b/src/main/java/net/minecraft/block/BlockEnderChest.java @@ -17,9 +17,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityEnderChest; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockEventData.java b/src/main/java/net/minecraft/block/BlockEventData.java index 3573fd3..2eb280b 100644 --- a/src/main/java/net/minecraft/block/BlockEventData.java +++ b/src/main/java/net/minecraft/block/BlockEventData.java @@ -1,6 +1,6 @@ package net.minecraft.block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/block/BlockFalling.java b/src/main/java/net/minecraft/block/BlockFalling.java index c8d4a53..1e6d422 100644 --- a/src/main/java/net/minecraft/block/BlockFalling.java +++ b/src/main/java/net/minecraft/block/BlockFalling.java @@ -6,7 +6,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockFarmland.java b/src/main/java/net/minecraft/block/BlockFarmland.java index 12ddbf2..71a29dc 100644 --- a/src/main/java/net/minecraft/block/BlockFarmland.java +++ b/src/main/java/net/minecraft/block/BlockFarmland.java @@ -13,9 +13,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -92,17 +92,17 @@ public class BlockFarmland extends Block { } /** - * Block's chance to react to a living entity falling on it. - */ - public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) - { - if (!worldIn.isRemote && worldIn.rand.nextFloat() < fallDistance - 0.5F && entityIn instanceof EntityLivingBase && (entityIn instanceof EntityPlayer || worldIn.getGameRules().getBoolean("mobGriefing")) && entityIn.width * entityIn.width * entityIn.height > 0.512F) - { - worldIn.setBlockState(pos, Blocks.dirt.getDefaultState()); - } + * Block's chance to react to a living entity falling on it. + */ + public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) { + if (!worldIn.isRemote && worldIn.rand.nextFloat() < fallDistance - 0.5F && entityIn instanceof EntityLivingBase + && (entityIn instanceof EntityPlayer || worldIn.getGameRules().getBoolean("mobGriefing")) + && entityIn.width * entityIn.width * entityIn.height > 0.512F) { + worldIn.setBlockState(pos, Blocks.dirt.getDefaultState()); + } - super.onFallenUpon(worldIn, pos, entityIn, fallDistance); - } + super.onFallenUpon(worldIn, pos, entityIn, fallDistance); + } private boolean hasCrops(World worldIn, BlockPos pos) { Block block = worldIn.getBlockState(pos.up()).getBlock(); diff --git a/src/main/java/net/minecraft/block/BlockFence.java b/src/main/java/net/minecraft/block/BlockFence.java index ccc5b95..c7073c7 100644 --- a/src/main/java/net/minecraft/block/BlockFence.java +++ b/src/main/java/net/minecraft/block/BlockFence.java @@ -13,9 +13,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemLead; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockFenceGate.java b/src/main/java/net/minecraft/block/BlockFenceGate.java index c5e4c98..fab4f39 100644 --- a/src/main/java/net/minecraft/block/BlockFenceGate.java +++ b/src/main/java/net/minecraft/block/BlockFenceGate.java @@ -9,9 +9,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockFire.java b/src/main/java/net/minecraft/block/BlockFire.java index 2624553..939815e 100644 --- a/src/main/java/net/minecraft/block/BlockFire.java +++ b/src/main/java/net/minecraft/block/BlockFire.java @@ -13,11 +13,11 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.WorldProviderEnd; diff --git a/src/main/java/net/minecraft/block/BlockFlowerPot.java b/src/main/java/net/minecraft/block/BlockFlowerPot.java index 9dcfa21..d5345a3 100644 --- a/src/main/java/net/minecraft/block/BlockFlowerPot.java +++ b/src/main/java/net/minecraft/block/BlockFlowerPot.java @@ -17,11 +17,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFlowerPot; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockFrostedIce.java b/src/main/java/net/minecraft/block/BlockFrostedIce.java index 8f609f9..45c0bc5 100644 --- a/src/main/java/net/minecraft/block/BlockFrostedIce.java +++ b/src/main/java/net/minecraft/block/BlockFrostedIce.java @@ -9,8 +9,8 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class BlockFrostedIce extends BlockIce { diff --git a/src/main/java/net/minecraft/block/BlockFurnace.java b/src/main/java/net/minecraft/block/BlockFurnace.java index 985d623..69a3758 100644 --- a/src/main/java/net/minecraft/block/BlockFurnace.java +++ b/src/main/java/net/minecraft/block/BlockFurnace.java @@ -17,9 +17,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockGlowstone.java b/src/main/java/net/minecraft/block/BlockGlowstone.java index b3a4e6a..6ffa669 100644 --- a/src/main/java/net/minecraft/block/BlockGlowstone.java +++ b/src/main/java/net/minecraft/block/BlockGlowstone.java @@ -8,7 +8,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/block/BlockGrass.java b/src/main/java/net/minecraft/block/BlockGrass.java index e40d4b9..7e1e459 100644 --- a/src/main/java/net/minecraft/block/BlockGrass.java +++ b/src/main/java/net/minecraft/block/BlockGrass.java @@ -10,8 +10,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockGrassPath.java b/src/main/java/net/minecraft/block/BlockGrassPath.java index ff96152..4710bde 100644 --- a/src/main/java/net/minecraft/block/BlockGrassPath.java +++ b/src/main/java/net/minecraft/block/BlockGrassPath.java @@ -9,9 +9,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockHay.java b/src/main/java/net/minecraft/block/BlockHay.java index e964349..20d066a 100644 --- a/src/main/java/net/minecraft/block/BlockHay.java +++ b/src/main/java/net/minecraft/block/BlockHay.java @@ -10,8 +10,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -103,10 +103,9 @@ public class BlockHay extends BlockRotatedPillar { } /** - * Block's chance to react to a living entity falling on it. - */ - public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) - { - entityIn.fall(fallDistance, 0.2F); - } + * Block's chance to react to a living entity falling on it. + */ + public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) { + entityIn.fall(fallDistance, 0.2F); + } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/block/BlockHopper.java b/src/main/java/net/minecraft/block/BlockHopper.java index 24d45c6..b38eddc 100644 --- a/src/main/java/net/minecraft/block/BlockHopper.java +++ b/src/main/java/net/minecraft/block/BlockHopper.java @@ -21,10 +21,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityHopper; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockHugeMushroom.java b/src/main/java/net/minecraft/block/BlockHugeMushroom.java index 738e0d9..386cff7 100644 --- a/src/main/java/net/minecraft/block/BlockHugeMushroom.java +++ b/src/main/java/net/minecraft/block/BlockHugeMushroom.java @@ -10,9 +10,9 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockIce.java b/src/main/java/net/minecraft/block/BlockIce.java index ea08a68..dbdda7c 100644 --- a/src/main/java/net/minecraft/block/BlockIce.java +++ b/src/main/java/net/minecraft/block/BlockIce.java @@ -11,8 +11,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockJukebox.java b/src/main/java/net/minecraft/block/BlockJukebox.java index a9b80d0..999748b 100644 --- a/src/main/java/net/minecraft/block/BlockJukebox.java +++ b/src/main/java/net/minecraft/block/BlockJukebox.java @@ -14,8 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockLadder.java b/src/main/java/net/minecraft/block/BlockLadder.java index f843827..877fd0e 100644 --- a/src/main/java/net/minecraft/block/BlockLadder.java +++ b/src/main/java/net/minecraft/block/BlockLadder.java @@ -7,10 +7,10 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockLeaves.java b/src/main/java/net/minecraft/block/BlockLeaves.java index b2ef762..be496f7 100644 --- a/src/main/java/net/minecraft/block/BlockLeaves.java +++ b/src/main/java/net/minecraft/block/BlockLeaves.java @@ -10,9 +10,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockLeavesBase.java b/src/main/java/net/minecraft/block/BlockLeavesBase.java index 83b20d3..fe80581 100644 --- a/src/main/java/net/minecraft/block/BlockLeavesBase.java +++ b/src/main/java/net/minecraft/block/BlockLeavesBase.java @@ -1,8 +1,8 @@ package net.minecraft.block; import net.minecraft.block.material.Material; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/block/BlockLever.java b/src/main/java/net/minecraft/block/BlockLever.java index b0f84e7..c166dec 100644 --- a/src/main/java/net/minecraft/block/BlockLever.java +++ b/src/main/java/net/minecraft/block/BlockLever.java @@ -9,10 +9,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockLilyPad.java b/src/main/java/net/minecraft/block/BlockLilyPad.java index 71c4383..71a8ecc 100644 --- a/src/main/java/net/minecraft/block/BlockLilyPad.java +++ b/src/main/java/net/minecraft/block/BlockLilyPad.java @@ -8,8 +8,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityBoat; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockLiquid.java b/src/main/java/net/minecraft/block/BlockLiquid.java index a64fef2..e746fc3 100644 --- a/src/main/java/net/minecraft/block/BlockLiquid.java +++ b/src/main/java/net/minecraft/block/BlockLiquid.java @@ -10,13 +10,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeColorHelper; @@ -170,8 +170,8 @@ public abstract class BlockLiquid extends Block { return 0; } - protected Vec3 getFlowVector(IBlockAccess worldIn, BlockPos pos) { - Vec3 vec3 = new Vec3(0.0D, 0.0D, 0.0D); + protected Vec3d getFlowVector(IBlockAccess worldIn, BlockPos pos) { + Vec3d vec3 = new Vec3d(0.0D, 0.0D, 0.0D); int i = this.getEffectiveFlowDecay(worldIn, pos); EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray; @@ -211,7 +211,7 @@ public abstract class BlockLiquid extends Block { return vec3.normalize(); } - public Vec3 modifyAcceleration(World world, BlockPos blockpos, Entity var3, Vec3 vec3) { + public Vec3d modifyAcceleration(World world, BlockPos blockpos, Entity var3, Vec3d vec3) { return vec3.add(this.getFlowVector(world, blockpos)); } @@ -294,7 +294,7 @@ public abstract class BlockLiquid extends Block { } public static double getFlowDirection(IBlockAccess worldIn, BlockPos pos, Material materialIn) { - Vec3 vec3 = getFlowingBlock(materialIn).getFlowVector(worldIn, pos); + Vec3d vec3 = getFlowingBlock(materialIn).getFlowVector(worldIn, pos); return vec3.xCoord == 0.0D && vec3.zCoord == 0.0D ? -1000.0D : MathHelper.func_181159_b(vec3.zCoord, vec3.xCoord) - 1.5707963267948966D; } diff --git a/src/main/java/net/minecraft/block/BlockLog.java b/src/main/java/net/minecraft/block/BlockLog.java index 5e6e7b6..b42f24c 100644 --- a/src/main/java/net/minecraft/block/BlockLog.java +++ b/src/main/java/net/minecraft/block/BlockLog.java @@ -5,9 +5,9 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockMobSpawner.java b/src/main/java/net/minecraft/block/BlockMobSpawner.java index 8f74dba..0962ab2 100644 --- a/src/main/java/net/minecraft/block/BlockMobSpawner.java +++ b/src/main/java/net/minecraft/block/BlockMobSpawner.java @@ -7,8 +7,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockMushroom.java b/src/main/java/net/minecraft/block/BlockMushroom.java index 558866a..1d9944c 100644 --- a/src/main/java/net/minecraft/block/BlockMushroom.java +++ b/src/main/java/net/minecraft/block/BlockMushroom.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; diff --git a/src/main/java/net/minecraft/block/BlockMycelium.java b/src/main/java/net/minecraft/block/BlockMycelium.java index 553d381..d751a00 100644 --- a/src/main/java/net/minecraft/block/BlockMycelium.java +++ b/src/main/java/net/minecraft/block/BlockMycelium.java @@ -11,8 +11,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockNetherWart.java b/src/main/java/net/minecraft/block/BlockNetherWart.java index 40b91a3..8c769b6 100644 --- a/src/main/java/net/minecraft/block/BlockNetherWart.java +++ b/src/main/java/net/minecraft/block/BlockNetherWart.java @@ -13,7 +13,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockNewLeaf.java b/src/main/java/net/minecraft/block/BlockNewLeaf.java index e518b84..b423139 100644 --- a/src/main/java/net/minecraft/block/BlockNewLeaf.java +++ b/src/main/java/net/minecraft/block/BlockNewLeaf.java @@ -15,7 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockNote.java b/src/main/java/net/minecraft/block/BlockNote.java index 656b5ec..cdf4713 100644 --- a/src/main/java/net/minecraft/block/BlockNote.java +++ b/src/main/java/net/minecraft/block/BlockNote.java @@ -11,9 +11,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityNote; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockOldLeaf.java b/src/main/java/net/minecraft/block/BlockOldLeaf.java index 983ecc4..96c9917 100644 --- a/src/main/java/net/minecraft/block/BlockOldLeaf.java +++ b/src/main/java/net/minecraft/block/BlockOldLeaf.java @@ -15,7 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockOre.java b/src/main/java/net/minecraft/block/BlockOre.java index 5d8a4ab..190e938 100644 --- a/src/main/java/net/minecraft/block/BlockOre.java +++ b/src/main/java/net/minecraft/block/BlockOre.java @@ -10,8 +10,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockPane.java b/src/main/java/net/minecraft/block/BlockPane.java index 987ada1..0e969e0 100644 --- a/src/main/java/net/minecraft/block/BlockPane.java +++ b/src/main/java/net/minecraft/block/BlockPane.java @@ -12,10 +12,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockPistonBase.java b/src/main/java/net/minecraft/block/BlockPistonBase.java index df6d74c..98a7271 100644 --- a/src/main/java/net/minecraft/block/BlockPistonBase.java +++ b/src/main/java/net/minecraft/block/BlockPistonBase.java @@ -16,10 +16,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityPiston; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockPistonExtension.java b/src/main/java/net/minecraft/block/BlockPistonExtension.java index f878535..f72d693 100644 --- a/src/main/java/net/minecraft/block/BlockPistonExtension.java +++ b/src/main/java/net/minecraft/block/BlockPistonExtension.java @@ -14,10 +14,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockPistonMoving.java b/src/main/java/net/minecraft/block/BlockPistonMoving.java index ab871ed..af56d6f 100644 --- a/src/main/java/net/minecraft/block/BlockPistonMoving.java +++ b/src/main/java/net/minecraft/block/BlockPistonMoving.java @@ -13,11 +13,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityPiston; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -165,7 +165,7 @@ public class BlockPistonMoving extends BlockContainer { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World var1, BlockPos var2, Vec3 var3, Vec3 var4) { + public RayTraceResult collisionRayTrace(World var1, BlockPos var2, Vec3d var3, Vec3d var4) { return null; } diff --git a/src/main/java/net/minecraft/block/BlockPortal.java b/src/main/java/net/minecraft/block/BlockPortal.java index 553a205..6047e1a 100644 --- a/src/main/java/net/minecraft/block/BlockPortal.java +++ b/src/main/java/net/minecraft/block/BlockPortal.java @@ -14,11 +14,11 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemMonsterPlacer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockPotato.java b/src/main/java/net/minecraft/block/BlockPotato.java index f810cd9..eb6c01a 100644 --- a/src/main/java/net/minecraft/block/BlockPotato.java +++ b/src/main/java/net/minecraft/block/BlockPotato.java @@ -4,7 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -37,25 +37,22 @@ import net.minecraft.world.World; * */ public class BlockPotato extends BlockCrops { - protected Item getSeed() { - return Items.potato; - } + protected Item getSeed() { + return Items.potato; + } - protected Item getCrop() { - return Items.potato; - } + protected Item getCrop() { + return Items.potato; + } - /** + /** * Spawns this Block's drops into the World as EntityItems. */ - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) - { + public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) { super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune); - if (!worldIn.isRemote) - { - if (this.isMaxAge(state) && worldIn.rand.nextInt(50) == 0) - { + if (!worldIn.isRemote) { + if (this.isMaxAge(state) && worldIn.rand.nextInt(50) == 0) { spawnAsEntity(worldIn, pos, new ItemStack(Items.poisonous_potato)); } } diff --git a/src/main/java/net/minecraft/block/BlockPressurePlate.java b/src/main/java/net/minecraft/block/BlockPressurePlate.java index 8e0fc2d..2b6b0a0 100644 --- a/src/main/java/net/minecraft/block/BlockPressurePlate.java +++ b/src/main/java/net/minecraft/block/BlockPressurePlate.java @@ -9,8 +9,8 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java b/src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java index 2a6e21e..14acfd1 100644 --- a/src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java +++ b/src/main/java/net/minecraft/block/BlockPressurePlateWeighted.java @@ -7,8 +7,8 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockPumpkin.java b/src/main/java/net/minecraft/block/BlockPumpkin.java index 93bd282..f029f49 100644 --- a/src/main/java/net/minecraft/block/BlockPumpkin.java +++ b/src/main/java/net/minecraft/block/BlockPumpkin.java @@ -16,9 +16,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockPurpurPillar.java b/src/main/java/net/minecraft/block/BlockPurpurPillar.java index d870a74..fc1c8a0 100644 --- a/src/main/java/net/minecraft/block/BlockPurpurPillar.java +++ b/src/main/java/net/minecraft/block/BlockPurpurPillar.java @@ -4,6 +4,7 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -11,7 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.block.state.BlockState; import net.minecraft.block.properties.IProperty; -import net.minecraft.util.BlockPos; import net.minecraft.creativetab.CreativeTabs; /** diff --git a/src/main/java/net/minecraft/block/BlockPurpurSlab.java b/src/main/java/net/minecraft/block/BlockPurpurSlab.java index f2990e2..2a944eb 100644 --- a/src/main/java/net/minecraft/block/BlockPurpurSlab.java +++ b/src/main/java/net/minecraft/block/BlockPurpurSlab.java @@ -15,8 +15,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockQuartz.java b/src/main/java/net/minecraft/block/BlockQuartz.java index 5ebd146..da5f0d7 100644 --- a/src/main/java/net/minecraft/block/BlockQuartz.java +++ b/src/main/java/net/minecraft/block/BlockQuartz.java @@ -12,9 +12,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockRail.java b/src/main/java/net/minecraft/block/BlockRail.java index 33736c5..375abf4 100644 --- a/src/main/java/net/minecraft/block/BlockRail.java +++ b/src/main/java/net/minecraft/block/BlockRail.java @@ -4,7 +4,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockRailBase.java b/src/main/java/net/minecraft/block/BlockRailBase.java index 1b3e059..e7ce3cb 100644 --- a/src/main/java/net/minecraft/block/BlockRailBase.java +++ b/src/main/java/net/minecraft/block/BlockRailBase.java @@ -9,13 +9,13 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -86,7 +86,7 @@ public abstract class BlockRailBase extends Block { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end) { + public RayTraceResult collisionRayTrace(World worldIn, BlockPos pos, Vec3d start, Vec3d end) { this.setBlockBoundsBasedOnState(worldIn, pos); return super.collisionRayTrace(worldIn, pos, start, end); } diff --git a/src/main/java/net/minecraft/block/BlockRailDetector.java b/src/main/java/net/minecraft/block/BlockRailDetector.java index f9dbc52..58c1fac 100644 --- a/src/main/java/net/minecraft/block/BlockRailDetector.java +++ b/src/main/java/net/minecraft/block/BlockRailDetector.java @@ -15,10 +15,10 @@ import net.minecraft.entity.EntityMinecartCommandBlock; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockRailPowered.java b/src/main/java/net/minecraft/block/BlockRailPowered.java index b0fa622..763eb2b 100644 --- a/src/main/java/net/minecraft/block/BlockRailPowered.java +++ b/src/main/java/net/minecraft/block/BlockRailPowered.java @@ -7,7 +7,7 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockRedstoneComparator.java b/src/main/java/net/minecraft/block/BlockRedstoneComparator.java index 71d6a37..f93da79 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneComparator.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneComparator.java @@ -20,11 +20,11 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityComparator; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockRedstoneDiode.java b/src/main/java/net/minecraft/block/BlockRedstoneDiode.java index e3bcee3..27b0e19 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneDiode.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneDiode.java @@ -6,9 +6,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -181,8 +181,10 @@ public abstract class BlockRedstoneDiode extends BlockDirectional { IBlockState iblockstate = worldIn.getBlockState(pos); Block block = iblockstate.getBlock(); return this.canPowerSide(block) - ? (block == Blocks.redstone_block ? 15 : block == Blocks.redstone_wire ? ((Integer) iblockstate.getValue(BlockRedstoneWire.POWER)).intValue() - : worldIn.getStrongPower(pos, side)) + ? (block == Blocks.redstone_block ? 15 + : block == Blocks.redstone_wire + ? ((Integer) iblockstate.getValue(BlockRedstoneWire.POWER)).intValue() + : worldIn.getStrongPower(pos, side)) : 0; } diff --git a/src/main/java/net/minecraft/block/BlockRedstoneLight.java b/src/main/java/net/minecraft/block/BlockRedstoneLight.java index 3026393..45c6852 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneLight.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneLight.java @@ -7,7 +7,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockRedstoneOre.java b/src/main/java/net/minecraft/block/BlockRedstoneOre.java index c16fb2e..5690808 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneOre.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneOre.java @@ -10,9 +10,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockRedstoneRepeater.java b/src/main/java/net/minecraft/block/BlockRedstoneRepeater.java index 9f26bef..6e16ab4 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneRepeater.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneRepeater.java @@ -11,10 +11,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockRedstoneTorch.java b/src/main/java/net/minecraft/block/BlockRedstoneTorch.java index 03c174b..fe573d8 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneTorch.java @@ -11,9 +11,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockRedstoneWire.java b/src/main/java/net/minecraft/block/BlockRedstoneWire.java index 1297c85..c283e7c 100644 --- a/src/main/java/net/minecraft/block/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/block/BlockRedstoneWire.java @@ -17,13 +17,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockReed.java b/src/main/java/net/minecraft/block/BlockReed.java index df6a50b..8e5be3b 100644 --- a/src/main/java/net/minecraft/block/BlockReed.java +++ b/src/main/java/net/minecraft/block/BlockReed.java @@ -11,10 +11,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockRotatedPillar.java b/src/main/java/net/minecraft/block/BlockRotatedPillar.java index bae735b..c02d640 100644 --- a/src/main/java/net/minecraft/block/BlockRotatedPillar.java +++ b/src/main/java/net/minecraft/block/BlockRotatedPillar.java @@ -4,6 +4,7 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -11,7 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.block.state.BlockState; import net.minecraft.block.properties.IProperty; -import net.minecraft.util.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/block/BlockSapling.java b/src/main/java/net/minecraft/block/BlockSapling.java index bd0aaa3..286697f 100644 --- a/src/main/java/net/minecraft/block/BlockSapling.java +++ b/src/main/java/net/minecraft/block/BlockSapling.java @@ -12,8 +12,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigTree; import net.minecraft.world.gen.feature.WorldGenCanopyTree; diff --git a/src/main/java/net/minecraft/block/BlockSeaLantern.java b/src/main/java/net/minecraft/block/BlockSeaLantern.java index 294a71a..5a7cf53 100644 --- a/src/main/java/net/minecraft/block/BlockSeaLantern.java +++ b/src/main/java/net/minecraft/block/BlockSeaLantern.java @@ -8,7 +8,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/block/BlockSign.java b/src/main/java/net/minecraft/block/BlockSign.java index 233e978..900a579 100644 --- a/src/main/java/net/minecraft/block/BlockSign.java +++ b/src/main/java/net/minecraft/block/BlockSign.java @@ -9,9 +9,9 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockSilverfish.java b/src/main/java/net/minecraft/block/BlockSilverfish.java index bb1826b..360fbbc 100644 --- a/src/main/java/net/minecraft/block/BlockSilverfish.java +++ b/src/main/java/net/minecraft/block/BlockSilverfish.java @@ -13,8 +13,8 @@ import net.minecraft.entity.monster.EntitySilverfish; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockSkull.java b/src/main/java/net/minecraft/block/BlockSkull.java index d1a271f..875e40b 100644 --- a/src/main/java/net/minecraft/block/BlockSkull.java +++ b/src/main/java/net/minecraft/block/BlockSkull.java @@ -28,11 +28,11 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.stats.AchievementList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockSlab.java b/src/main/java/net/minecraft/block/BlockSlab.java index b4f1fff..09f589f 100644 --- a/src/main/java/net/minecraft/block/BlockSlab.java +++ b/src/main/java/net/minecraft/block/BlockSlab.java @@ -16,10 +16,10 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockSlime.java b/src/main/java/net/minecraft/block/BlockSlime.java index f235d31..0579559 100644 --- a/src/main/java/net/minecraft/block/BlockSlime.java +++ b/src/main/java/net/minecraft/block/BlockSlime.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockSnow.java b/src/main/java/net/minecraft/block/BlockSnow.java index 220fc32..95fdd40 100644 --- a/src/main/java/net/minecraft/block/BlockSnow.java +++ b/src/main/java/net/minecraft/block/BlockSnow.java @@ -15,9 +15,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockSnowBlock.java b/src/main/java/net/minecraft/block/BlockSnowBlock.java index ba876c0..8cd9e2f 100644 --- a/src/main/java/net/minecraft/block/BlockSnowBlock.java +++ b/src/main/java/net/minecraft/block/BlockSnowBlock.java @@ -7,7 +7,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockSoulSand.java b/src/main/java/net/minecraft/block/BlockSoulSand.java index 47a026c..e77838e 100644 --- a/src/main/java/net/minecraft/block/BlockSoulSand.java +++ b/src/main/java/net/minecraft/block/BlockSoulSand.java @@ -5,8 +5,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockSourceImpl.java b/src/main/java/net/minecraft/block/BlockSourceImpl.java index 8be1ec0..752d59e 100644 --- a/src/main/java/net/minecraft/block/BlockSourceImpl.java +++ b/src/main/java/net/minecraft/block/BlockSourceImpl.java @@ -3,7 +3,7 @@ package net.minecraft.block; import net.minecraft.block.state.IBlockState; import net.minecraft.dispenser.IBlockSource; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockSponge.java b/src/main/java/net/minecraft/block/BlockSponge.java index c2d5be3..18ab06c 100644 --- a/src/main/java/net/minecraft/block/BlockSponge.java +++ b/src/main/java/net/minecraft/block/BlockSponge.java @@ -16,11 +16,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.util.Tuple; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStainedGlass.java b/src/main/java/net/minecraft/block/BlockStainedGlass.java index 52e9699..62e7537 100644 --- a/src/main/java/net/minecraft/block/BlockStainedGlass.java +++ b/src/main/java/net/minecraft/block/BlockStainedGlass.java @@ -13,8 +13,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStainedGlassPane.java b/src/main/java/net/minecraft/block/BlockStainedGlassPane.java index 0e1c1ae..7347c2e 100644 --- a/src/main/java/net/minecraft/block/BlockStainedGlassPane.java +++ b/src/main/java/net/minecraft/block/BlockStainedGlassPane.java @@ -12,8 +12,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStairs.java b/src/main/java/net/minecraft/block/BlockStairs.java index b7a6ab5..97bf45d 100644 --- a/src/main/java/net/minecraft/block/BlockStairs.java +++ b/src/main/java/net/minecraft/block/BlockStairs.java @@ -17,13 +17,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -505,7 +505,7 @@ public class BlockStairs extends Block { return this.modelBlock.getSelectedBoundingBox(world, blockpos); } - public Vec3 modifyAcceleration(World world, BlockPos blockpos, Entity entity, Vec3 vec3) { + public Vec3d modifyAcceleration(World world, BlockPos blockpos, Entity entity, Vec3d vec3) { return this.modelBlock.modifyAcceleration(world, blockpos, entity, vec3); } @@ -598,8 +598,8 @@ public class BlockStairs extends Block { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World world, BlockPos blockpos, Vec3 vec3, Vec3 vec31) { - MovingObjectPosition[] amovingobjectposition = new MovingObjectPosition[8]; + public RayTraceResult collisionRayTrace(World world, BlockPos blockpos, Vec3d vec3, Vec3d vec31) { + RayTraceResult[] amovingobjectposition = new RayTraceResult[8]; IBlockState iblockstate = world.getBlockState(blockpos); int i = ((EnumFacing) iblockstate.getValue(FACING)).getHorizontalIndex(); boolean flag = iblockstate.getValue(HALF) == BlockStairs.EnumHalf.TOP; @@ -617,11 +617,11 @@ public class BlockStairs extends Block { amovingobjectposition[aint[l]] = null; } - MovingObjectPosition movingobjectposition1 = null; + RayTraceResult movingobjectposition1 = null; double d1 = 0.0D; for (int l = 0; l < amovingobjectposition.length; ++l) { - MovingObjectPosition movingobjectposition = amovingobjectposition[l]; + RayTraceResult movingobjectposition = amovingobjectposition[l]; if (movingobjectposition != null) { double d0 = movingobjectposition.hitVec.squareDistanceTo(vec31); if (d0 > d1) { diff --git a/src/main/java/net/minecraft/block/BlockStandingSign.java b/src/main/java/net/minecraft/block/BlockStandingSign.java index 55bdfe0..a793d10 100644 --- a/src/main/java/net/minecraft/block/BlockStandingSign.java +++ b/src/main/java/net/minecraft/block/BlockStandingSign.java @@ -4,7 +4,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStaticLiquid.java b/src/main/java/net/minecraft/block/BlockStaticLiquid.java index 44cb6d7..00e079a 100644 --- a/src/main/java/net/minecraft/block/BlockStaticLiquid.java +++ b/src/main/java/net/minecraft/block/BlockStaticLiquid.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStem.java b/src/main/java/net/minecraft/block/BlockStem.java index b042868..87fd832 100644 --- a/src/main/java/net/minecraft/block/BlockStem.java +++ b/src/main/java/net/minecraft/block/BlockStem.java @@ -15,9 +15,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockStoneSlab.java b/src/main/java/net/minecraft/block/BlockStoneSlab.java index 77299da..3144807 100644 --- a/src/main/java/net/minecraft/block/BlockStoneSlab.java +++ b/src/main/java/net/minecraft/block/BlockStoneSlab.java @@ -14,8 +14,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockStoneSlabNew.java b/src/main/java/net/minecraft/block/BlockStoneSlabNew.java index 5b32a1f..43f1967 100644 --- a/src/main/java/net/minecraft/block/BlockStoneSlabNew.java +++ b/src/main/java/net/minecraft/block/BlockStoneSlabNew.java @@ -14,9 +14,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockTNT.java b/src/main/java/net/minecraft/block/BlockTNT.java index 5942989..0aff8f0 100644 --- a/src/main/java/net/minecraft/block/BlockTNT.java +++ b/src/main/java/net/minecraft/block/BlockTNT.java @@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockTallGrass.java b/src/main/java/net/minecraft/block/BlockTallGrass.java index d0d4b9b..d7c99fa 100644 --- a/src/main/java/net/minecraft/block/BlockTallGrass.java +++ b/src/main/java/net/minecraft/block/BlockTallGrass.java @@ -16,8 +16,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockTorch.java b/src/main/java/net/minecraft/block/BlockTorch.java index 92cbb0e..2764f69 100644 --- a/src/main/java/net/minecraft/block/BlockTorch.java +++ b/src/main/java/net/minecraft/block/BlockTorch.java @@ -12,13 +12,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -184,7 +184,7 @@ public class BlockTorch extends Block { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World world, BlockPos blockpos, Vec3 vec3, Vec3 vec31) { + public RayTraceResult collisionRayTrace(World world, BlockPos blockpos, Vec3d vec3, Vec3d vec31) { EnumFacing enumfacing = (EnumFacing) world.getBlockState(blockpos).getValue(FACING); float f = 0.15F; if (enumfacing == EnumFacing.EAST) { diff --git a/src/main/java/net/minecraft/block/BlockTrapDoor.java b/src/main/java/net/minecraft/block/BlockTrapDoor.java index 8f3127a..73b87ac 100644 --- a/src/main/java/net/minecraft/block/BlockTrapDoor.java +++ b/src/main/java/net/minecraft/block/BlockTrapDoor.java @@ -11,13 +11,13 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -183,7 +183,7 @@ public class BlockTrapDoor extends Block { * Ray traces through the blocks collision from start vector to * end vector returning a ray trace hit. */ - public MovingObjectPosition collisionRayTrace(World world, BlockPos blockpos, Vec3 vec3, Vec3 vec31) { + public RayTraceResult collisionRayTrace(World world, BlockPos blockpos, Vec3d vec3, Vec3d vec31) { this.setBlockBoundsBasedOnState(world, blockpos); return super.collisionRayTrace(world, blockpos, vec3, vec31); } diff --git a/src/main/java/net/minecraft/block/BlockTripWire.java b/src/main/java/net/minecraft/block/BlockTripWire.java index 2a9614a..58cf596 100644 --- a/src/main/java/net/minecraft/block/BlockTripWire.java +++ b/src/main/java/net/minecraft/block/BlockTripWire.java @@ -13,10 +13,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockTripWireHook.java b/src/main/java/net/minecraft/block/BlockTripWireHook.java index 55d0fc0..320be30 100644 --- a/src/main/java/net/minecraft/block/BlockTripWireHook.java +++ b/src/main/java/net/minecraft/block/BlockTripWireHook.java @@ -14,10 +14,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockVine.java b/src/main/java/net/minecraft/block/BlockVine.java index 73ba858..305278b 100644 --- a/src/main/java/net/minecraft/block/BlockVine.java +++ b/src/main/java/net/minecraft/block/BlockVine.java @@ -16,10 +16,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockWall.java b/src/main/java/net/minecraft/block/BlockWall.java index a082c69..2aeecde 100644 --- a/src/main/java/net/minecraft/block/BlockWall.java +++ b/src/main/java/net/minecraft/block/BlockWall.java @@ -12,11 +12,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockWallSign.java b/src/main/java/net/minecraft/block/BlockWallSign.java index fb06eac..fda1433 100644 --- a/src/main/java/net/minecraft/block/BlockWallSign.java +++ b/src/main/java/net/minecraft/block/BlockWallSign.java @@ -4,8 +4,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/block/BlockWeb.java b/src/main/java/net/minecraft/block/BlockWeb.java index d9961c9..c86942c 100644 --- a/src/main/java/net/minecraft/block/BlockWeb.java +++ b/src/main/java/net/minecraft/block/BlockWeb.java @@ -12,9 +12,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -96,13 +96,10 @@ public class BlockWeb extends Block { public void harvestBlock(World world, EntityPlayer entityplayer, BlockPos blockpos, IBlockState iblockstate, TileEntity tileentity) { ItemStack stack = entityplayer.inventory.getCurrentItem(); - if (!world.isRemote && stack != null && stack.getItem() == Items.shears) - { + if (!world.isRemote && stack != null && stack.getItem() == Items.shears) { entityplayer.triggerAchievement(StatList.mineBlockStatArray[Block.getIdFromBlock(this)]); spawnAsEntity(world, blockpos, new ItemStack(Item.getItemFromBlock(this), 1)); - } - else - { + } else { super.harvestBlock(world, entityplayer, blockpos, iblockstate, tileentity); } } diff --git a/src/main/java/net/minecraft/block/BlockWoodSlab.java b/src/main/java/net/minecraft/block/BlockWoodSlab.java index b428119..616d376 100644 --- a/src/main/java/net/minecraft/block/BlockWoodSlab.java +++ b/src/main/java/net/minecraft/block/BlockWoodSlab.java @@ -13,7 +13,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/BlockWorkbench.java b/src/main/java/net/minecraft/block/BlockWorkbench.java index 8ea7b5c..b91c5c4 100644 --- a/src/main/java/net/minecraft/block/BlockWorkbench.java +++ b/src/main/java/net/minecraft/block/BlockWorkbench.java @@ -9,10 +9,10 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerWorkbench; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; @@ -79,8 +79,8 @@ public class BlockWorkbench extends Block { return false; } - public IChatComponent getDisplayName() { - return new ChatComponentTranslation(Blocks.crafting_table.getUnlocalizedName() + ".name", new Object[0]); + public ITextComponent getDisplayName() { + return new TextComponentTranslation(Blocks.crafting_table.getUnlocalizedName() + ".name", new Object[0]); } public Container createContainer(InventoryPlayer inventoryplayer, EntityPlayer var2) { diff --git a/src/main/java/net/minecraft/block/IGrowable.java b/src/main/java/net/minecraft/block/IGrowable.java index d501fc9..78d8c28 100644 --- a/src/main/java/net/minecraft/block/IGrowable.java +++ b/src/main/java/net/minecraft/block/IGrowable.java @@ -3,7 +3,7 @@ package net.minecraft.block; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java b/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java index 1f5ec0c..879ff41 100644 --- a/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java +++ b/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java @@ -9,8 +9,8 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/state/BlockState.java b/src/main/java/net/minecraft/block/state/BlockState.java index 666c2f9..e19d05b 100644 --- a/src/main/java/net/minecraft/block/state/BlockState.java +++ b/src/main/java/net/minecraft/block/state/BlockState.java @@ -25,10 +25,10 @@ import net.hoosiertransfer.Alfheim.ILightInfoProvider; import net.hoosiertransfer.Alfheim.ILitBlock; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Cartesian; import net.minecraft.util.EnumFacing; import net.minecraft.util.MapPopulator; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Cartesian; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/net/minecraft/block/state/BlockWorldState.java b/src/main/java/net/minecraft/block/state/BlockWorldState.java index a5be855..4a1507e 100644 --- a/src/main/java/net/minecraft/block/state/BlockWorldState.java +++ b/src/main/java/net/minecraft/block/state/BlockWorldState.java @@ -3,7 +3,7 @@ package net.minecraft.block.state; import com.google.common.base.Predicate; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/block/state/IBlockState.java b/src/main/java/net/minecraft/block/state/IBlockState.java index 44ef1c4..d4aafa1 100644 --- a/src/main/java/net/minecraft/block/state/IBlockState.java +++ b/src/main/java/net/minecraft/block/state/IBlockState.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java b/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java index 166efbb..20c169f 100644 --- a/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java +++ b/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java @@ -6,9 +6,9 @@ import com.google.common.base.Predicate; import net.lax1dude.eaglercraft.v1_8.cache.EaglerCacheProvider; import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; import net.minecraft.block.state.BlockWorldState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index afd326c..832dbf0 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -146,7 +146,6 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.event.ClickEvent; import net.minecraft.init.Bootstrap; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -161,18 +160,12 @@ import net.minecraft.stats.AchievementList; import net.minecraft.stats.IStatStringFormat; import net.minecraft.stats.StatFileWriter; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.FrameTimer; import net.minecraft.util.IThreadListener; -import net.minecraft.util.MathHelper; import net.minecraft.util.MinecraftError; import net.minecraft.util.MouseHelper; import net.minecraft.util.MovementInputFromOptions; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraft.util.ScreenShotHelper; @@ -180,6 +173,13 @@ import net.minecraft.util.Session; import net.minecraft.util.StringTranslate; import net.minecraft.util.Timer; import net.minecraft.util.Util; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.Style; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.WorldProviderEnd; import net.minecraft.world.WorldProviderHell; @@ -255,7 +255,7 @@ public class Minecraft implements IThreadListener { public GuiAchievement guiAchievement; public GuiIngame ingameGUI; public boolean skipRenderWorld; - public MovingObjectPosition objectMouseOver; + public RayTraceResult objectMouseOver; public GameSettings gameSettings; public MouseHelper mouseHelper; private final String launchedVersion; @@ -1174,7 +1174,7 @@ public class Minecraft implements IThreadListener { if (this.leftClickCounter <= 0 && !this.thePlayer.isUsingItem()) { if (leftClick && this.objectMouseOver != null - && this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + && this.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = this.objectMouseOver.getBlockPos(); if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air && this.playerController.onPlayerDamageBlock(blockpos, this.objectMouseOver.sideHit)) { @@ -1213,7 +1213,7 @@ public class Minecraft implements IThreadListener { this.leftClickCounter = 10; } - this.thePlayer.resetCooldown(); + this.thePlayer.resetCooldown(); } } @@ -1325,7 +1325,7 @@ public class Minecraft implements IThreadListener { && this.currentScreen != null && this.currentScreen.doesGuiPauseGame(); if (isLANOpen && !isHostingLAN) { - ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("lanServer.relayDisconnected")); + ingameGUI.getChatGUI().printChatMessage(new TextComponentTranslation("lanServer.relayDisconnected")); } isLANOpen = isHostingLAN; @@ -1779,26 +1779,26 @@ public class Minecraft implements IThreadListener { && EaglerXBungeeVersion.isUpdateToPluginAvailable(pluginBrand, pluginVersion)) { String pfx = EnumChatFormatting.GOLD + "[EagX]" + EnumChatFormatting.AQUA; ingameGUI.getChatGUI().printChatMessage( - new ChatComponentText(pfx + " ---------------------------------------")); + new TextComponentString(pfx + " ---------------------------------------")); ingameGUI.getChatGUI().printChatMessage( - new ChatComponentText(pfx + " This server appears to be using version " + new TextComponentString(pfx + " This server appears to be using version " + EnumChatFormatting.YELLOW + pluginVersion)); ingameGUI.getChatGUI().printChatMessage( - new ChatComponentText(pfx + " of the EaglerXBungee plugin which is outdated")); - ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(pfx)); + new TextComponentString(pfx + " of the EaglerXBungee plugin which is outdated")); + ingameGUI.getChatGUI().printChatMessage(new TextComponentString(pfx)); ingameGUI.getChatGUI() - .printChatMessage(new ChatComponentText(pfx + " If you are the admin update to " + .printChatMessage(new TextComponentString(pfx + " If you are the admin update to " + EnumChatFormatting.YELLOW + EaglerXBungeeVersion.getPluginVersion() + EnumChatFormatting.AQUA + " or newer")); - ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(pfx)); - ingameGUI.getChatGUI().printChatMessage((new ChatComponentText(pfx + " Click: ")) - .appendSibling((new ChatComponentText("" + EnumChatFormatting.GREEN + ingameGUI.getChatGUI().printChatMessage(new TextComponentString(pfx)); + ingameGUI.getChatGUI().printChatMessage((new TextComponentString(pfx + " Click: ")) + .appendSibling((new TextComponentString("" + EnumChatFormatting.GREEN + EnumChatFormatting.UNDERLINE + EaglerXBungeeVersion.getPluginButton())) - .setChatStyle((new ChatStyle()).setChatClickEvent( + .setChatStyle((new Style()).setChatClickEvent( new ClickEvent(ClickEvent.Action.EAGLER_PLUGIN_DOWNLOAD, "plugin_download.zip"))))); ingameGUI.getChatGUI().printChatMessage( - new ChatComponentText(pfx + " ---------------------------------------")); + new TextComponentString(pfx + " ---------------------------------------")); } } } @@ -1980,7 +1980,7 @@ public class Minecraft implements IThreadListener { boolean flag1 = false; TileEntity tileentity = null; Object object; - if (this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (this.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = this.objectMouseOver.getBlockPos(); Block block = this.theWorld.getBlockState(blockpos).getBlock(); if (block.getMaterial() == Material.air) { @@ -2002,7 +2002,7 @@ public class Minecraft implements IThreadListener { i = block1.getDamageValue(this.theWorld, blockpos); flag1 = ((Item) object).getHasSubtypes(); } else { - if (this.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY + if (this.objectMouseOver.typeOfHit != RayTraceResult.MovingObjectType.ENTITY || this.objectMouseOver.entityHit == null || !flag) { return; } @@ -2373,10 +2373,9 @@ public class Minecraft implements IThreadListener { return modelManager; } - public float getRenderPartialTicks() - { - return this.timer.renderPartialTicks; - } + public float getRenderPartialTicks() { + return this.timer.renderPartialTicks; + } /** * + diff --git a/src/main/java/net/minecraft/client/audio/ElytraSound.java b/src/main/java/net/minecraft/client/audio/ElytraSound.java index e8a5396..06d9783 100644 --- a/src/main/java/net/minecraft/client/audio/ElytraSound.java +++ b/src/main/java/net/minecraft/client/audio/ElytraSound.java @@ -1,8 +1,8 @@ package net.minecraft.client.audio; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; public class ElytraSound extends MovingSound { private final EntityPlayerSP player; diff --git a/src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java b/src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java index bf35531..e363d28 100644 --- a/src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java +++ b/src/main/java/net/minecraft/client/audio/MovingSoundMinecart.java @@ -2,8 +2,8 @@ package net.minecraft.client.audio; import net.hoosiertransfer.Config; import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java b/src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java index fdafe87..2a42480 100644 --- a/src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java +++ b/src/main/java/net/minecraft/client/audio/MovingSoundMinecartRiding.java @@ -3,8 +3,8 @@ package net.minecraft.client.audio; import net.hoosiertransfer.Config; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/audio/MusicTicker.java b/src/main/java/net/minecraft/client/audio/MusicTicker.java index cd4b341..9d770b8 100644 --- a/src/main/java/net/minecraft/client/audio/MusicTicker.java +++ b/src/main/java/net/minecraft/client/audio/MusicTicker.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.client.Minecraft; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/audio/SoundRegistry.java b/src/main/java/net/minecraft/client/audio/SoundRegistry.java index 36ce8f3..d7f9848 100644 --- a/src/main/java/net/minecraft/client/audio/SoundRegistry.java +++ b/src/main/java/net/minecraft/client/audio/SoundRegistry.java @@ -4,8 +4,8 @@ import java.util.Map; import com.google.common.collect.Maps; -import net.minecraft.util.RegistrySimple; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.RegistrySimple; /** * + diff --git a/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java b/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java index 9d36fee..d5c1062 100644 --- a/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java +++ b/src/main/java/net/minecraft/client/entity/EntityOtherPlayerMP.java @@ -3,10 +3,10 @@ package net.minecraft.client.entity; import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -158,7 +158,7 @@ public class EntityOtherPlayerMP extends AbstractClientPlayer { * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(ichatcomponent); } diff --git a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java index a2ff7df..2f238cb 100644 --- a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java +++ b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java @@ -49,13 +49,13 @@ import net.minecraft.stats.StatBase; import net.minecraft.stats.StatFileWriter; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IChatComponent; import net.minecraft.util.MovementInput; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; @@ -398,7 +398,7 @@ public class EntityPlayerSP extends AbstractClientPlayer { return this.statWriter; } - public void addChatComponentMessage(IChatComponent chatComponent) { + public void addChatComponentMessage(ITextComponent chatComponent) { this.mc.ingameGUI.getChatGUI().printChatMessage(chatComponent); } @@ -487,7 +487,7 @@ public class EntityPlayerSP extends AbstractClientPlayer { * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { this.mc.ingameGUI.getChatGUI().printChatMessage(ichatcomponent); } diff --git a/src/main/java/net/minecraft/client/gui/ChatLine.java b/src/main/java/net/minecraft/client/gui/ChatLine.java index 9d23cc1..19bed5f 100644 --- a/src/main/java/net/minecraft/client/gui/ChatLine.java +++ b/src/main/java/net/minecraft/client/gui/ChatLine.java @@ -1,6 +1,6 @@ package net.minecraft.client.gui; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -33,16 +33,16 @@ import net.minecraft.util.IChatComponent; */ public class ChatLine { private final int updateCounterCreated; - private final IChatComponent lineString; + private final ITextComponent lineString; private final int chatLineID; - public ChatLine(int parInt1, IChatComponent parIChatComponent, int parInt2) { + public ChatLine(int parInt1, ITextComponent parIChatComponent, int parInt2) { this.lineString = parIChatComponent; this.updateCounterCreated = parInt1; this.chatLineID = parInt2; } - public IChatComponent getChatComponent() { + public ITextComponent getChatComponent() { return this.lineString; } diff --git a/src/main/java/net/minecraft/client/gui/GuiChat.java b/src/main/java/net/minecraft/client/gui/GuiChat.java index 8f3d0eb..9111317 100644 --- a/src/main/java/net/minecraft/client/gui/GuiChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiChat.java @@ -17,14 +17,14 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.network.play.client.C14PacketTabComplete; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITabCompleter; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.TabCompleter; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.RayTraceResult.MovingObjectType; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -200,7 +200,7 @@ public class GuiChat extends GuiScreen implements ITabCompleter { */ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { if (parInt3 == 0) { - IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY()); + ITextComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY()); if (this.handleComponentClick(ichatcomponent)) { return; } @@ -266,7 +266,7 @@ public class GuiChat extends GuiScreen implements ITabCompleter { this.mc.fontRendererObj.drawStringWithShadow("Password Hidden", 2, this.height - 25, 16770425); } GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); - IChatComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY()); + ITextComponent ichatcomponent = this.mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY()); if (ichatcomponent != null && ichatcomponent.getChatStyle().getChatHoverEvent() != null) { this.handleComponentHover(ichatcomponent, i, j); } @@ -317,7 +317,7 @@ public class GuiChat extends GuiScreen implements ITabCompleter { } this.clientInstance.ingameGUI.getChatGUI() - .printChatMessageWithOptionalDeletion(new ChatComponentText(stringbuilder.toString()), 1); + .printChatMessageWithOptionalDeletion(new TextComponentString(stringbuilder.toString()), 1); } } @@ -326,7 +326,7 @@ public class GuiChat extends GuiScreen implements ITabCompleter { BlockPos blockpos = null; if (this.clientInstance.objectMouseOver != null - && this.clientInstance.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + && this.clientInstance.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { blockpos = this.clientInstance.objectMouseOver.getBlockPos(); } diff --git a/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java b/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java index 6947712..5bd5772 100644 --- a/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java +++ b/src/main/java/net/minecraft/client/gui/GuiCommandBlock.java @@ -14,10 +14,10 @@ import net.minecraft.command.server.CommandBlockBaseLogic; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.tileentity.TileEntityCommandBlock; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITabCompleter; import net.minecraft.util.TabCompleter; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; /** * + @@ -165,7 +165,7 @@ public class GuiCommandBlock extends GuiScreen implements ITabCompleter { this.mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload("MC|AutoCmd", packetbuffer)); if (!commandblockbaselogic.shouldTrackOutput()) { - commandblockbaselogic.setLastOutput((IChatComponent) null); + commandblockbaselogic.setLastOutput((ITextComponent) null); } this.mc.displayGuiScreen((GuiScreen) null); diff --git a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java b/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java index 0cc58f3..8e73776 100644 --- a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java +++ b/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java @@ -11,7 +11,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.ChunkProviderSettings; diff --git a/src/main/java/net/minecraft/client/gui/GuiDisconnected.java b/src/main/java/net/minecraft/client/gui/GuiDisconnected.java index 877a025..6ac46d3 100644 --- a/src/main/java/net/minecraft/client/gui/GuiDisconnected.java +++ b/src/main/java/net/minecraft/client/gui/GuiDisconnected.java @@ -9,8 +9,8 @@ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenIntegratedServerBusy; import net.lax1dude.eaglercraft.v1_8.sp.ipc.IPCPacket15Crashed; import net.minecraft.client.resources.I18n; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -43,7 +43,7 @@ import net.minecraft.util.IChatComponent; */ public class GuiDisconnected extends GuiScreen { private String reason; - private IChatComponent message; + private ITextComponent message; private List multilineMessage; private final GuiScreen parentScreen; private int field_175353_i; @@ -51,7 +51,7 @@ public class GuiDisconnected extends GuiScreen { @JSBody(params = {}, script = "window.onbeforeunload = null; location.reload();") public static native void reloadPage(); - public GuiDisconnected(GuiScreen screen, String reasonLocalizationKey, IChatComponent chatComp) { + public GuiDisconnected(GuiScreen screen, String reasonLocalizationKey, ITextComponent chatComp) { this.parentScreen = screen; this.reason = I18n.format(reasonLocalizationKey, new Object[0]); this.message = chatComp; @@ -130,6 +130,6 @@ public class GuiDisconnected extends GuiScreen { } public static GuiScreen createRateLimitKick(GuiScreen prev) { - return new GuiDisconnected(prev, "connect.failed", new ChatComponentTranslation("disconnect.tooManyRequests")); + return new GuiDisconnected(prev, "connect.failed", new TextComponentTranslation("disconnect.tooManyRequests")); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/client/gui/GuiEnchantment.java b/src/main/java/net/minecraft/client/gui/GuiEnchantment.java index 33c6468..64ba0b5 100644 --- a/src/main/java/net/minecraft/client/gui/GuiEnchantment.java +++ b/src/main/java/net/minecraft/client/gui/GuiEnchantment.java @@ -21,8 +21,8 @@ import net.minecraft.inventory.ContainerEnchantment; import net.minecraft.item.ItemStack; import net.minecraft.util.EnchantmentNameParts; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IWorldNameable; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java index 20498dc..459c075 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java @@ -39,14 +39,14 @@ import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.FoodStats; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.border.WorldBorder; /** @@ -170,10 +170,10 @@ public class GuiIngame extends Gui { this.renderTooltip(scaledresolution, partialTicks); } - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(icons); - GlStateManager.enableBlend(); - this.renderAttackIndicator(partialTicks, scaledresolution); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(icons); + GlStateManager.enableBlend(); + this.renderAttackIndicator(partialTicks, scaledresolution); GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0); this.mc.mcProfiler.startSection("bossHealth"); this.renderBossHealth(); @@ -332,64 +332,58 @@ public class GuiIngame extends Gui { GlStateManager.enableAlpha(); } - private void renderAttackIndicator(float p_184045_1_, ScaledResolution p_184045_2_) - { - GameSettings gamesettings = this.mc.gameSettings; + private void renderAttackIndicator(float p_184045_1_, ScaledResolution p_184045_2_) { + GameSettings gamesettings = this.mc.gameSettings; - if (gamesettings.thirdPersonView == 0) - { - if (this.mc.playerController.isSpectator() && this.mc.pointedEntity == null) - { - MovingObjectPosition raytraceresult = this.mc.objectMouseOver; + if (gamesettings.thirdPersonView == 0) { + if (this.mc.playerController.isSpectator() && this.mc.pointedEntity == null) { + RayTraceResult raytraceresult = this.mc.objectMouseOver; - if (raytraceresult == null || raytraceresult.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) - { - return; - } + if (raytraceresult == null || raytraceresult.typeOfHit != RayTraceResult.MovingObjectType.BLOCK) { + return; + } - BlockPos blockpos = raytraceresult.getBlockPos(); + BlockPos blockpos = raytraceresult.getBlockPos(); - if (!this.mc.theWorld.getBlockState(blockpos).getBlock().hasTileEntity() || !(this.mc.theWorld.getTileEntity(blockpos) instanceof IInventory)) - { - return; - } - } + if (!this.mc.theWorld.getBlockState(blockpos).getBlock().hasTileEntity() + || !(this.mc.theWorld.getTileEntity(blockpos) instanceof IInventory)) { + return; + } + } - int l = p_184045_2_.getScaledWidth(); - int i1 = p_184045_2_.getScaledHeight(); + int l = p_184045_2_.getScaledWidth(); + int i1 = p_184045_2_.getScaledHeight(); - if (gamesettings.showDebugInfo && !gamesettings.hideGUI && !this.mc.thePlayer.hasReducedDebug() && !gamesettings.reducedDebugInfo) - { - // GlStateManager.pushMatrix(); - // GlStateManager.translate((float)(l / 2), (float)(i1 / 2), this.zLevel); - // Entity entity = this.mc.getRenderViewEntity(); - // GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * p_184045_1_, -1.0F, 0.0F, 0.0F); - // GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * p_184045_1_, 0.0F, 1.0F, 0.0F); - // GlStateManager.scale(-1.0F, -1.0F, -1.0F); - // OpenGlHelper.renderDirections(10); - // GlStateManager.popMatrix(); - } - else - { - GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_ONE, GL_ZERO); - GlStateManager.enableAlpha(); - // this.drawTexturedModalRect(l / 2 - 7, i1 / 2 - 7, 0, 0, 16, 16); + if (gamesettings.showDebugInfo && !gamesettings.hideGUI && !this.mc.thePlayer.hasReducedDebug() + && !gamesettings.reducedDebugInfo) { + // GlStateManager.pushMatrix(); + // GlStateManager.translate((float)(l / 2), (float)(i1 / 2), this.zLevel); + // Entity entity = this.mc.getRenderViewEntity(); + // GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - + // entity.prevRotationPitch) * p_184045_1_, -1.0F, 0.0F, 0.0F); + // GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - + // entity.prevRotationYaw) * p_184045_1_, 0.0F, 1.0F, 0.0F); + // GlStateManager.scale(-1.0F, -1.0F, -1.0F); + // OpenGlHelper.renderDirections(10); + // GlStateManager.popMatrix(); + } else { + GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_ONE, GL_ZERO); + GlStateManager.enableAlpha(); + // this.drawTexturedModalRect(l / 2 - 7, i1 / 2 - 7, 0, 0, 16, 16); - if (this.mc.gameSettings.attackIndicator == 1) - { - float f = this.mc.thePlayer.getCooledAttackStrength(0.0F); - if (f < 1.0F) - { - int i = i1 / 2 - 7 + 16; - int j = l / 2 - 7; - int k = (int)(f * 17.0F); - this.drawTexturedModalRect(j, i, 36, 94, 16, 4); - this.drawTexturedModalRect(j, i, 52, 94, k, 4); - } - } - } - } - } + if (this.mc.gameSettings.attackIndicator == 1) { + float f = this.mc.thePlayer.getCooledAttackStrength(0.0F); + if (f < 1.0F) { + int i = i1 / 2 - 7 + 16; + int j = l / 2 - 7; + int k = (int) (f * 17.0F); + this.drawTexturedModalRect(j, i, 36, 94, 16, 4); + this.drawTexturedModalRect(j, i, 52, 94, k, 4); + } + } + } + } + } public void renderGameOverlayCrosshairs(int scaledResWidth, int scaledResHeight) { if (this.showCrosshair()) { @@ -425,22 +419,20 @@ public class GuiIngame extends Gui { this.renderHotbarItem(j, k, l, partialTicks, entityplayer); } - if (this.mc.gameSettings.attackIndicator == 2) - { - float f1 = this.mc.thePlayer.getCooledAttackStrength(0.0F); + if (this.mc.gameSettings.attackIndicator == 2) { + float f1 = this.mc.thePlayer.getCooledAttackStrength(0.0F); - if (f1 < 1.0F) - { - int i2 = sr.getScaledHeight() - 20; - int j2 = i + 91 + 6; + if (f1 < 1.0F) { + int i2 = sr.getScaledHeight() - 20; + int j2 = i + 91 + 6; - this.mc.getTextureManager().bindTexture(icons); - int k1 = (int)(f1 * 19.0F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.drawTexturedModalRect(j2, i2, 0, 94, 18, 18); - this.drawTexturedModalRect(j2, i2 + 18 - k1, 18, 112 - k1, 18, k1); - } - } + this.mc.getTextureManager().bindTexture(icons); + int k1 = (int) (f1 * 19.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + this.drawTexturedModalRect(j2, i2, 0, 94, 18, 18); + this.drawTexturedModalRect(j2, i2 + 18 - k1, 18, 112 - k1, 18, k1); + } + } RenderHelper.disableStandardItemLighting(); GlStateManager.disableRescaleNormal(); @@ -552,7 +544,7 @@ public class GuiIngame extends Gui { return true; } else { if (this.mc.objectMouseOver != null - && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + && this.mc.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = this.mc.objectMouseOver.getBlockPos(); if (this.mc.theWorld.getTileEntity(blockpos) instanceof IInventory) { return true; @@ -1127,7 +1119,7 @@ public class GuiIngame extends Gui { } } - public void setRecordPlaying(IChatComponent parIChatComponent, boolean parFlag) { + public void setRecordPlaying(ITextComponent parIChatComponent, boolean parFlag) { this.setRecordPlaying(parIChatComponent.getUnformattedText(), parFlag); } diff --git a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java b/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java index 5d42e81..0cd27d4 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java @@ -16,9 +16,9 @@ import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.client.gui.achievement.GuiStats; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.resources.I18n; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; /** * + @@ -250,7 +250,7 @@ public class GuiIngameMenu extends GuiScreen { LANServerController.cleanupLAN(); SingleplayerServerController.configureLAN(this.mc.theWorld.getWorldInfo().getGameType(), false); } - this.mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(I18n.format("lanServer.closed"))); + this.mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(I18n.format("lanServer.closed"))); this.lanButton.displayString = I18n.format("menu.openToLan"); } diff --git a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java index 16cda39..be7fab3 100644 --- a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java +++ b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java @@ -44,8 +44,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.storage.ISaveFormat; /** diff --git a/src/main/java/net/minecraft/client/gui/GuiMerchant.java b/src/main/java/net/minecraft/client/gui/GuiMerchant.java index 1967d33..8abdad5 100644 --- a/src/main/java/net/minecraft/client/gui/GuiMerchant.java +++ b/src/main/java/net/minecraft/client/gui/GuiMerchant.java @@ -16,8 +16,8 @@ import net.minecraft.inventory.ContainerMerchant; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.World; @@ -63,7 +63,7 @@ public class GuiMerchant extends GuiContainer { private GuiMerchant.MerchantButton nextButton; private GuiMerchant.MerchantButton previousButton; private int selectedMerchantRecipe; - private IChatComponent chatComponent; + private ITextComponent chatComponent; public GuiMerchant(InventoryPlayer parInventoryPlayer, IMerchant parIMerchant, World worldIn) { super(new ContainerMerchant(parInventoryPlayer, parIMerchant, worldIn)); diff --git a/src/main/java/net/minecraft/client/gui/GuiNewChat.java b/src/main/java/net/minecraft/client/gui/GuiNewChat.java index 399bf8c..3e6c6ba 100644 --- a/src/main/java/net/minecraft/client/gui/GuiNewChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiNewChat.java @@ -10,9 +10,9 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -144,7 +144,7 @@ public class GuiNewChat extends Gui { this.sentMessages.clear(); } - public void printChatMessage(IChatComponent parIChatComponent) { + public void printChatMessage(ITextComponent parIChatComponent) { this.printChatMessageWithOptionalDeletion(parIChatComponent, 0); } @@ -153,12 +153,12 @@ public class GuiNewChat extends Gui { * prints the ChatComponent to Chat. If the ID is not 0, deletes * an existing Chat Line of that ID from the GUI */ - public void printChatMessageWithOptionalDeletion(IChatComponent parIChatComponent, int parInt1) { + public void printChatMessageWithOptionalDeletion(ITextComponent parIChatComponent, int parInt1) { this.setChatLine(parIChatComponent, parInt1, this.mc.ingameGUI.getUpdateCounter(), false); logger.info("[CHAT] " + parIChatComponent.getUnformattedText()); } - private void setChatLine(IChatComponent parIChatComponent, int parInt1, int parInt2, boolean parFlag) { + private void setChatLine(ITextComponent parIChatComponent, int parInt1, int parInt2, boolean parFlag) { if (parInt1 != 0) { this.deleteChatLine(parInt1); } @@ -173,7 +173,7 @@ public class GuiNewChat extends Gui { this.scroll(1); } - this.field_146253_i.add(0, new ChatLine(parInt2, (IChatComponent) list.get(j), parInt1)); + this.field_146253_i.add(0, new ChatLine(parInt2, (ITextComponent) list.get(j), parInt1)); } while (this.field_146253_i.size() > 100) { @@ -255,7 +255,7 @@ public class GuiNewChat extends Gui { * + * Gets the chat component under the mouse */ - public IChatComponent getChatComponent(int parInt1, int parInt2) { + public ITextComponent getChatComponent(int parInt1, int parInt2) { if (!this.getChatOpen()) { return null; } else { @@ -275,10 +275,11 @@ public class GuiNewChat extends Gui { ChatLine chatline = (ChatLine) this.field_146253_i.get(i1); int j1 = 0; - for (IChatComponent ichatcomponent : chatline.getChatComponent()) { - if (ichatcomponent instanceof ChatComponentText) { + for (ITextComponent ichatcomponent : chatline.getChatComponent()) { + if (ichatcomponent instanceof TextComponentString) { j1 += this.mc.fontRendererObj.getStringWidth(GuiUtilRenderComponents.func_178909_a( - ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue(), false)); + ((TextComponentString) ichatcomponent).getChatComponentText_TextValue(), + false)); if (j1 > j) { return ichatcomponent; } diff --git a/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java b/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java index e5f51bb..2860ee5 100644 --- a/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java +++ b/src/main/java/net/minecraft/client/gui/GuiOptionSlider.java @@ -3,7 +3,7 @@ package net.minecraft.client.gui; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/GuiOptions.java b/src/main/java/net/minecraft/client/gui/GuiOptions.java index 4bc4e88..701f45b 100644 --- a/src/main/java/net/minecraft/client/gui/GuiOptions.java +++ b/src/main/java/net/minecraft/client/gui/GuiOptions.java @@ -14,10 +14,10 @@ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.EnumDifficulty; /** @@ -149,11 +149,11 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback { } public String func_175355_a(EnumDifficulty parEnumDifficulty) { - ChatComponentText chatcomponenttext = new ChatComponentText(""); - chatcomponenttext.appendSibling(new ChatComponentTranslation("options.difficulty", new Object[0])); + TextComponentString chatcomponenttext = new TextComponentString(""); + chatcomponenttext.appendSibling(new TextComponentTranslation("options.difficulty", new Object[0])); chatcomponenttext.appendText(": "); chatcomponenttext.appendSibling( - new ChatComponentTranslation(parEnumDifficulty.getDifficultyResourceKey(), new Object[0])); + new TextComponentTranslation(parEnumDifficulty.getDifficultyResourceKey(), new Object[0])); return chatcomponenttext.getUnformattedText(); } @@ -194,10 +194,10 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback { if (parGuiButton.id == 109) { this.mc.displayGuiScreen( new GuiYesNo(this, - (new ChatComponentTranslation("difficulty.lock.title", new Object[0])) + (new TextComponentTranslation("difficulty.lock.title", new Object[0])) .getFormattedText(), - (new ChatComponentTranslation("difficulty.lock.question", - new Object[] { new ChatComponentTranslation(this.mc.theWorld.getWorldInfo() + (new TextComponentTranslation("difficulty.lock.question", + new Object[] { new TextComponentTranslation(this.mc.theWorld.getWorldInfo() .getDifficulty().getDifficultyResourceKey(), new Object[0]) })) .getFormattedText(), 109)); diff --git a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java b/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java index 557c8a0..e51c2f2 100644 --- a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java +++ b/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java @@ -32,12 +32,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.FrameTimer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.biome.BiomeGenBase; @@ -422,7 +422,7 @@ public class GuiOverlayDebug extends Gui { } if (this.mc.objectMouseOver != null - && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK + && this.mc.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && this.mc.objectMouseOver.getBlockPos() != null) { BlockPos blockpos1 = this.mc.objectMouseOver.getBlockPos(); arraylist.add(HString.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(blockpos1.getX()), @@ -476,7 +476,7 @@ public class GuiOverlayDebug extends Gui { return arraylist; } else { if (this.mc.objectMouseOver != null - && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK + && this.mc.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && this.mc.objectMouseOver.getBlockPos() != null) { BlockPos blockpos = this.mc.objectMouseOver.getBlockPos(); IBlockState iblockstate = this.mc.theWorld.getBlockState(blockpos); diff --git a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java b/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java index c5b3d19..cfced86 100644 --- a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java +++ b/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java @@ -20,8 +20,8 @@ import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldSettings; /** @@ -58,8 +58,8 @@ public class GuiPlayerTabOverlay extends Gui { .from(new GuiPlayerTabOverlay.PlayerComparator()); private final Minecraft mc; private final GuiIngame guiIngame; - private IChatComponent footer; - private IChatComponent header; + private ITextComponent footer; + private ITextComponent header; private long lastTimeOpened; private boolean isBeingRendered; @@ -348,11 +348,11 @@ public class GuiPlayerTabOverlay extends Gui { } - public void setFooter(IChatComponent footerIn) { + public void setFooter(ITextComponent footerIn) { this.footer = footerIn; } - public void setHeader(IChatComponent headerIn) { + public void setHeader(ITextComponent headerIn) { this.header = headerIn; } diff --git a/src/main/java/net/minecraft/client/gui/GuiScreen.java b/src/main/java/net/minecraft/client/gui/GuiScreen.java index 860d858..6eb640d 100644 --- a/src/main/java/net/minecraft/client/gui/GuiScreen.java +++ b/src/main/java/net/minecraft/client/gui/GuiScreen.java @@ -29,8 +29,6 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; -import net.minecraft.event.ClickEvent; -import net.minecraft.event.HoverEvent; import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; @@ -38,9 +36,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.event.HoverEvent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -289,7 +289,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback { * + * Draws the hover event specified by the given chat component */ - protected void handleComponentHover(IChatComponent parIChatComponent, int parInt1, int parInt2) { + protected void handleComponentHover(ITextComponent parIChatComponent, int parInt1, int parInt2) { if (parIChatComponent != null && parIChatComponent.getChatStyle().getChatHoverEvent() != null) { HoverEvent hoverevent = parIChatComponent.getChatStyle().getChatHoverEvent(); if (hoverevent.getAction() == HoverEvent.Action.SHOW_ITEM) { @@ -340,8 +340,8 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback { } else if (hoverevent.getAction() == HoverEvent.Action.SHOW_ACHIEVEMENT) { StatBase statbase = StatList.getOneShotStat(hoverevent.getValue().getUnformattedText()); if (statbase != null) { - IChatComponent ichatcomponent = statbase.getStatName(); - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + ITextComponent ichatcomponent = statbase.getStatName(); + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "stats.tooltip.type." + (statbase.isAchievement() ? "achievement" : "statistic"), new Object[0]); chatcomponenttranslation.getChatStyle().setItalic(Boolean.valueOf(true)); @@ -375,7 +375,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback { * Executes the click event specified by the given chat * component */ - protected boolean handleComponentClick(IChatComponent parIChatComponent) { + protected boolean handleComponentClick(ITextComponent parIChatComponent) { if (parIChatComponent == null) { return false; } else { diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenBook.java b/src/main/java/net/minecraft/client/gui/GuiScreenBook.java index dfc7a19..c5123f3 100644 --- a/src/main/java/net/minecraft/client/gui/GuiScreenBook.java +++ b/src/main/java/net/minecraft/client/gui/GuiScreenBook.java @@ -14,7 +14,6 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.event.ClickEvent; import net.minecraft.init.Items; import net.minecraft.item.ItemEditableBook; import net.minecraft.item.ItemStack; @@ -24,10 +23,11 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -73,7 +73,7 @@ public class GuiScreenBook extends GuiScreen { private int currPage; private NBTTagList bookPages; private String bookTitle = ""; - private List field_175386_A; + private List field_175386_A; private int field_175387_B = -1; private GuiScreenBook.NextPageButton buttonNextPage; private GuiScreenBook.NextPageButton buttonPreviousPage; @@ -195,8 +195,8 @@ public class GuiScreenBook extends GuiScreen { for (int i = 0; i < this.bookPages.tagCount(); ++i) { String s1 = this.bookPages.getStringTagAt(i); - ChatComponentText chatcomponenttext = new ChatComponentText(s1); - s1 = IChatComponent.Serializer.componentToJson(chatcomponenttext); + TextComponentString chatcomponenttext = new TextComponentString(s1); + s1 = ITextComponent.Serializer.componentToJson(chatcomponenttext); this.bookPages.set(i, new NBTTagString(s1)); } @@ -420,7 +420,7 @@ public class GuiScreenBook extends GuiScreen { } else if (this.field_175387_B != this.currPage) { if (ItemEditableBook.validBookTagContents(this.bookObj.getTagCompound())) { try { - IChatComponent ichatcomponent = IChatComponent.Serializer.jsonToComponent(s5); + ITextComponent ichatcomponent = ITextComponent.Serializer.jsonToComponent(s5); this.field_175386_A = ichatcomponent != null ? GuiUtilRenderComponents.func_178908_a(ichatcomponent, 116, this.fontRendererObj, true, true) @@ -429,7 +429,7 @@ public class GuiScreenBook extends GuiScreen { this.field_175386_A = null; } } else { - ChatComponentText chatcomponenttext = new ChatComponentText( + TextComponentString chatcomponenttext = new TextComponentString( EnumChatFormatting.DARK_RED.toString() + "* Invalid book tag *"); this.field_175386_A = Lists.newArrayList(chatcomponenttext); } @@ -445,12 +445,12 @@ public class GuiScreenBook extends GuiScreen { int l1 = Math.min(128 / this.fontRendererObj.FONT_HEIGHT, this.field_175386_A.size()); for (int i2 = 0; i2 < l1; ++i2) { - IChatComponent ichatcomponent2 = (IChatComponent) this.field_175386_A.get(i2); + ITextComponent ichatcomponent2 = (ITextComponent) this.field_175386_A.get(i2); this.fontRendererObj.drawString(ichatcomponent2.getUnformattedText(), k + 36, b0 + 16 + 16 + i2 * this.fontRendererObj.FONT_HEIGHT, 0); } - IChatComponent ichatcomponent1 = this.func_175385_b(i, j); + ITextComponent ichatcomponent1 = this.func_175385_b(i, j); if (ichatcomponent1 != null) { this.handleComponentHover(ichatcomponent1, i, j); } @@ -467,7 +467,7 @@ public class GuiScreenBook extends GuiScreen { */ protected void mouseClicked(int parInt1, int parInt2, int parInt3) { if (parInt3 == 0) { - IChatComponent ichatcomponent = this.func_175385_b(parInt1, parInt2); + ITextComponent ichatcomponent = this.func_175385_b(parInt1, parInt2); if (this.handleComponentClick(ichatcomponent)) { return; } @@ -481,7 +481,7 @@ public class GuiScreenBook extends GuiScreen { * Executes the click event specified by the given chat * component */ - protected boolean handleComponentClick(IChatComponent ichatcomponent) { + protected boolean handleComponentClick(ITextComponent ichatcomponent) { ClickEvent clickevent = ichatcomponent == null ? null : ichatcomponent.getChatStyle().getChatClickEvent(); if (clickevent == null) { return false; @@ -510,7 +510,7 @@ public class GuiScreenBook extends GuiScreen { } } - public IChatComponent func_175385_b(int parInt1, int parInt2) { + public ITextComponent func_175385_b(int parInt1, int parInt2) { if (this.field_175386_A == null) { return null; } else { @@ -521,13 +521,13 @@ public class GuiScreenBook extends GuiScreen { if (i <= 116 && j < this.mc.fontRendererObj.FONT_HEIGHT * k + k) { int l = j / this.mc.fontRendererObj.FONT_HEIGHT; if (l >= 0 && l < this.field_175386_A.size()) { - IChatComponent ichatcomponent = (IChatComponent) this.field_175386_A.get(l); + ITextComponent ichatcomponent = (ITextComponent) this.field_175386_A.get(l); int i1 = 0; - for (IChatComponent ichatcomponent1 : ichatcomponent) { - if (ichatcomponent1 instanceof ChatComponentText) { + for (ITextComponent ichatcomponent1 : ichatcomponent) { + if (ichatcomponent1 instanceof TextComponentString) { i1 += this.mc.fontRendererObj.getStringWidth( - ((ChatComponentText) ichatcomponent1).getChatComponentText_TextValue()); + ((TextComponentString) ichatcomponent1).getChatComponentText_TextValue()); if (i1 > i) { return ichatcomponent1; } diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java b/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java index 5b4f552..3da7d8d 100644 --- a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java +++ b/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java @@ -7,8 +7,8 @@ import net.minecraft.client.audio.SoundCategory; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/GuiSlot.java b/src/main/java/net/minecraft/client/gui/GuiSlot.java index 7597ed4..d909a15 100644 --- a/src/main/java/net/minecraft/client/gui/GuiSlot.java +++ b/src/main/java/net/minecraft/client/gui/GuiSlot.java @@ -11,7 +11,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/GuiSpectator.java b/src/main/java/net/minecraft/client/gui/GuiSpectator.java index ac051f7..fcfa1c7 100644 --- a/src/main/java/net/minecraft/client/gui/GuiSpectator.java +++ b/src/main/java/net/minecraft/client/gui/GuiSpectator.java @@ -10,8 +10,8 @@ import net.minecraft.client.gui.spectator.SpectatorMenu; import net.minecraft.client.gui.spectator.categories.SpectatorDetails; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.settings.GameSettings; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/GuiTextField.java b/src/main/java/net/minecraft/client/gui/GuiTextField.java index 215cfbe..672473c 100644 --- a/src/main/java/net/minecraft/client/gui/GuiTextField.java +++ b/src/main/java/net/minecraft/client/gui/GuiTextField.java @@ -10,7 +10,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.client.Minecraft; /** diff --git a/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java b/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java index 071a5bd..8267319 100644 --- a/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java +++ b/src/main/java/net/minecraft/client/gui/GuiUtilRenderComponents.java @@ -6,9 +6,9 @@ import java.util.List; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -46,22 +46,22 @@ public class GuiUtilRenderComponents { : parString1; } - public static List func_178908_a(IChatComponent parIChatComponent, int parInt1, + public static List func_178908_a(ITextComponent parIChatComponent, int parInt1, FontRenderer parFontRenderer, boolean parFlag, boolean parFlag2) { int i = 0; - ChatComponentText chatcomponenttext = new ChatComponentText(""); + TextComponentString chatcomponenttext = new TextComponentString(""); ArrayList arraylist = Lists.newArrayList(); ArrayList arraylist1 = Lists.newArrayList(parIChatComponent); for (int j = 0; j < arraylist1.size(); ++j) { - IChatComponent ichatcomponent = (IChatComponent) arraylist1.get(j); + ITextComponent ichatcomponent = (ITextComponent) arraylist1.get(j); String s = ichatcomponent.getUnformattedTextForChat(); boolean flag = false; if (s.contains("\n")) { int k = s.indexOf(10); String s1 = s.substring(k + 1); s = s.substring(0, k + 1); - ChatComponentText chatcomponenttext1 = new ChatComponentText(s1); + TextComponentString chatcomponenttext1 = new TextComponentString(s1); chatcomponenttext1.setChatStyle(ichatcomponent.getChatStyle().createShallowCopy()); arraylist1.add(j + 1, chatcomponenttext1); flag = true; @@ -70,7 +70,7 @@ public class GuiUtilRenderComponents { String s4 = func_178909_a(ichatcomponent.getChatStyle().getFormattingCode() + s, parFlag2); String s5 = s4.endsWith("\n") ? s4.substring(0, s4.length() - 1) : s4; int i1 = parFontRenderer.getStringWidth(s5); - ChatComponentText chatcomponenttext2 = new ChatComponentText(s5); + TextComponentString chatcomponenttext2 = new TextComponentString(s5); chatcomponenttext2.setChatStyle(ichatcomponent.getChatStyle().createShallowCopy()); if (i + i1 > parInt1) { String s2 = parFontRenderer.trimStringToWidth(s4, parInt1 - i, false); @@ -89,13 +89,13 @@ public class GuiUtilRenderComponents { s3 = s4; } - ChatComponentText chatcomponenttext3 = new ChatComponentText(s3); + TextComponentString chatcomponenttext3 = new TextComponentString(s3); chatcomponenttext3.setChatStyle(ichatcomponent.getChatStyle().createShallowCopy()); arraylist1.add(j + 1, chatcomponenttext3); } i1 = parFontRenderer.getStringWidth(s2); - chatcomponenttext2 = new ChatComponentText(s2); + chatcomponenttext2 = new TextComponentString(s2); chatcomponenttext2.setChatStyle(ichatcomponent.getChatStyle().createShallowCopy()); flag = true; } @@ -110,7 +110,7 @@ public class GuiUtilRenderComponents { if (flag) { arraylist.add(chatcomponenttext); i = 0; - chatcomponenttext = new ChatComponentText(""); + chatcomponenttext = new TextComponentString(""); } } diff --git a/src/main/java/net/minecraft/client/gui/MapItemRenderer.java b/src/main/java/net/minecraft/client/gui/MapItemRenderer.java index aaf4031..76be7c9 100644 --- a/src/main/java/net/minecraft/client/gui/MapItemRenderer.java +++ b/src/main/java/net/minecraft/client/gui/MapItemRenderer.java @@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec4b; +import net.minecraft.util.math.Vec4b; import net.minecraft.world.storage.MapData; /** diff --git a/src/main/java/net/minecraft/client/gui/ScaledResolution.java b/src/main/java/net/minecraft/client/gui/ScaledResolution.java index f4988b3..39d4218 100644 --- a/src/main/java/net/minecraft/client/gui/ScaledResolution.java +++ b/src/main/java/net/minecraft/client/gui/ScaledResolution.java @@ -1,7 +1,7 @@ package net.minecraft.client.gui; import net.minecraft.client.Minecraft; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java b/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java index 59bed45..9e3fe61 100644 --- a/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java +++ b/src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java @@ -21,9 +21,9 @@ import net.minecraft.network.play.client.C16PacketClientStatus; import net.minecraft.stats.Achievement; import net.minecraft.stats.AchievementList; import net.minecraft.stats.StatFileWriter; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -459,14 +459,14 @@ public class GuiAchievements extends GuiScreen implements IProgressMeter { } else if (l6 == 3) { s = I18n.format("achievement.unknown", new Object[0]); int j7 = Math.max(this.fontRendererObj.getStringWidth(s), 120); - String s2 = (new ChatComponentTranslation("achievement.requires", + String s2 = (new TextComponentTranslation("achievement.requires", new Object[] { achievement.parentAchievement.getStatName() })).getUnformattedText(); int l3 = this.fontRendererObj.splitStringWidth(s2, j7); this.drawGradientRect(l5 - 3, j6 - 3, l5 + j7 + 3, j6 + l3 + 12 + 3, -1073741824, -1073741824); this.fontRendererObj.drawSplitString(s2, l5, j6 + 12, j7, -9416624); } else if (l6 < 3) { int k7 = Math.max(this.fontRendererObj.getStringWidth(s), 120); - String s3 = (new ChatComponentTranslation("achievement.requires", + String s3 = (new TextComponentTranslation("achievement.requires", new Object[] { achievement.parentAchievement.getStatName() })).getUnformattedText(); int i8 = this.fontRendererObj.splitStringWidth(s3, k7); this.drawGradientRect(l5 - 3, j6 - 3, l5 + k7 + 3, j6 + i8 + 12 + 3, -1073741824, -1073741824); diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java b/src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java index 200bf50..4344de1 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiBrewingStand.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerBrewingStand; import net.minecraft.inventory.IInventory; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + @@ -37,35 +37,36 @@ import net.minecraft.util.ResourceLocation; * */ public class GuiBrewingStand extends GuiContainer { - private static final ResourceLocation brewingStandGuiTextures = new ResourceLocation( - "textures/gui/container/brewing_stand.png"); - private static final int[] BUBBLELENGTHS = new int[] {29, 24, 20, 16, 11, 6, 0}; - private final InventoryPlayer playerInventory; - private IInventory tileBrewingStand; + private static final ResourceLocation brewingStandGuiTextures = new ResourceLocation( + "textures/gui/container/brewing_stand.png"); + private static final int[] BUBBLELENGTHS = new int[] { 29, 24, 20, 16, 11, 6, 0 }; + private final InventoryPlayer playerInventory; + private IInventory tileBrewingStand; - public GuiBrewingStand(InventoryPlayer playerInv, IInventory parIInventory) { - super(new ContainerBrewingStand(playerInv, parIInventory)); - this.playerInventory = playerInv; - this.tileBrewingStand = parIInventory; - } - - /** - * + - * Draw the foreground layer for the GuiContainer (everything in - * front of the items). Args : mouseX, mouseY - */ - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - String s = this.tileBrewingStand.getDisplayName().getUnformattedText(); - this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); - this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, this.ySize - 96 + 2, 4210752); + public GuiBrewingStand(InventoryPlayer playerInv, IInventory parIInventory) { + super(new ContainerBrewingStand(playerInv, parIInventory)); + this.playerInventory = playerInv; + this.tileBrewingStand = parIInventory; } - /** - * + - * Args : renderPartialTicks, mouseX, mouseY - */ - protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + /** + * + + * Draw the foreground layer for the GuiContainer (everything in + * front of the items). Args : mouseX, mouseY + */ + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + String s = this.tileBrewingStand.getDisplayName().getUnformattedText(); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, + this.ySize - 96 + 2, 4210752); + } + + /** + * + + * Args : renderPartialTicks, mouseX, mouseY + */ + protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(brewingStandGuiTextures); int i = (this.width - this.xSize) / 2; int j = (this.height - this.ySize) / 2; @@ -73,29 +74,25 @@ public class GuiBrewingStand extends GuiContainer { int k = this.tileBrewingStand.getField(1); int l = MathHelper.clamp_int((18 * k + 20 - 1) / 20, 0, 18); - if (l > 0) - { + if (l > 0) { this.drawTexturedModalRect(i + 60, j + 44, 176, 29, l, 4); } int i1 = this.tileBrewingStand.getField(0); - if (i1 > 0) - { - int j1 = (int)(28.0F * (1.0F - (float)i1 / 400.0F)); + if (i1 > 0) { + int j1 = (int) (28.0F * (1.0F - (float) i1 / 400.0F)); - if (j1 > 0) - { + if (j1 > 0) { this.drawTexturedModalRect(i + 97, j + 16, 176, 0, 9, j1); } j1 = BUBBLELENGTHS[i1 / 2 % 7]; - if (j1 > 0) - { + if (j1 > 0) { this.drawTexturedModalRect(i + 63, j + 14 + 29 - j1, 185, 29 - j1, 12, j1); } } - } + } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java index 660151a..376d233 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java @@ -18,8 +18,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java index a65faab..293d6e0 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java @@ -32,8 +32,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java b/src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java index d862813..46d48a6 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiCrafting.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java b/src/main/java/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java index c772378..1f6db13 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java @@ -13,11 +13,11 @@ import net.minecraft.client.resources.I18n; import net.minecraft.command.server.CommandBlockBaseLogic; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITabCompleter; import net.minecraft.util.StatCollector; import net.minecraft.util.TabCompleter; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; public class GuiEditCommandBlockMinecart extends GuiScreen implements ITabCompleter { private GuiTextField commandField; @@ -97,7 +97,7 @@ public class GuiEditCommandBlockMinecart extends GuiScreen implements ITabComple this.mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload("MC|AdvCmd", packetbuffer)); if (!this.commandBlockLogic.shouldTrackOutput()) { - this.commandBlockLogic.setLastOutput((IChatComponent) null); + this.commandBlockLogic.setLastOutput((ITextComponent) null); } this.mc.displayGuiScreen((GuiScreen) null); diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java b/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java index a746dd0..8f92c0a 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiEditSign.java @@ -12,7 +12,7 @@ import net.minecraft.init.Blocks; import net.minecraft.network.play.client.C12PacketUpdateSign; import net.minecraft.tileentity.TileEntitySign; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; /** * + @@ -132,7 +132,7 @@ public class GuiEditSign extends GuiScreen { s = s + parChar1; } - this.tileSign.signText[this.editLine] = new ChatComponentText(s); + this.tileSign.signText[this.editLine] = new TextComponentString(s); if (parInt1 == 1) { this.actionPerformed(this.doneBtn); } diff --git a/src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java b/src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java index 5b44930..a998488 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java +++ b/src/main/java/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java @@ -6,8 +6,8 @@ import com.google.common.collect.Lists; import net.minecraft.client.gui.spectator.categories.TeleportToPlayer; import net.minecraft.client.gui.spectator.categories.TeleportToTeam; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -50,7 +50,7 @@ public class BaseSpectatorGroup implements ISpectatorMenuView { return this.field_178671_a; } - public IChatComponent func_178670_b() { - return new ChatComponentText("Press a key to select a command, and again to use it."); + public ITextComponent func_178670_b() { + return new TextComponentString("Press a key to select a command, and again to use it."); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java b/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java index 1d6a804..ffcce0c 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java +++ b/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java @@ -1,6 +1,6 @@ package net.minecraft.client.gui.spectator; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -34,7 +34,7 @@ import net.minecraft.util.IChatComponent; public interface ISpectatorMenuObject { void func_178661_a(SpectatorMenu var1); - IChatComponent getSpectatorName(); + ITextComponent getSpectatorName(); void func_178663_a(float var1, int var2); diff --git a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java b/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java index c4608f6..13b44ba 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java +++ b/src/main/java/net/minecraft/client/gui/spectator/ISpectatorMenuView.java @@ -2,7 +2,7 @@ package net.minecraft.client.gui.spectator; import java.util.List; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -36,5 +36,5 @@ import net.minecraft.util.IChatComponent; public interface ISpectatorMenuView { List func_178669_a(); - IChatComponent func_178670_b(); + ITextComponent func_178670_b(); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java b/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java index c4cde0d..e8b27cd 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java +++ b/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.network.play.client.C18PacketSpectate; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -48,8 +48,8 @@ public class PlayerMenuObject implements ISpectatorMenuObject { Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C18PacketSpectate(this.profile.getId())); } - public IChatComponent getSpectatorName() { - return new ChatComponentText(this.profile.getName()); + public ITextComponent getSpectatorName() { + return new TextComponentString(this.profile.getName()); } public void func_178663_a(float alpha, int parInt1) { diff --git a/src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java b/src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java index e61a0c6..6f4bf29 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java +++ b/src/main/java/net/minecraft/client/gui/spectator/SpectatorMenu.java @@ -10,8 +10,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiSpectator; import net.minecraft.client.gui.spectator.categories.SpectatorDetails; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -51,8 +51,8 @@ public class SpectatorMenu { public void func_178661_a(SpectatorMenu var1) { } - public IChatComponent getSpectatorName() { - return new ChatComponentText(""); + public ITextComponent getSpectatorName() { + return new TextComponentString(""); } public void func_178663_a(float var1, int var2) { @@ -140,8 +140,8 @@ public class SpectatorMenu { spectatormenu.func_178641_d(); } - public IChatComponent getSpectatorName() { - return new ChatComponentText("Close menu"); + public ITextComponent getSpectatorName() { + return new TextComponentString("Close menu"); } public void func_178663_a(float var1, int var2) { @@ -167,9 +167,9 @@ public class SpectatorMenu { spectatormenu.field_178658_j = this.field_178666_a; } - public IChatComponent getSpectatorName() { - return this.field_178666_a < 0 ? new ChatComponentText("Previous Page") - : new ChatComponentText("Next Page"); + public ITextComponent getSpectatorName() { + return this.field_178666_a < 0 ? new TextComponentString("Previous Page") + : new TextComponentString("Next Page"); } public void func_178663_a(float var1, int var2) { diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java index 1bcceca..f8caa5a 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java +++ b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java @@ -16,8 +16,8 @@ import net.minecraft.client.gui.spectator.ISpectatorMenuView; import net.minecraft.client.gui.spectator.PlayerMenuObject; import net.minecraft.client.gui.spectator.SpectatorMenu; import net.minecraft.client.network.NetworkPlayerInfo; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldSettings; /** @@ -80,16 +80,16 @@ public class TeleportToPlayer implements ISpectatorMenuView, ISpectatorMenuObjec return this.field_178673_b; } - public IChatComponent func_178670_b() { - return new ChatComponentText("Select a player to teleport to"); + public ITextComponent func_178670_b() { + return new TextComponentString("Select a player to teleport to"); } public void func_178661_a(SpectatorMenu spectatormenu) { spectatormenu.func_178647_a(this); } - public IChatComponent getSpectatorName() { - return new ChatComponentText("Teleport to player"); + public ITextComponent getSpectatorName() { + return new TextComponentString("Teleport to player"); } public void func_178663_a(float var1, int var2) { diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java index ae64432..daa4b72 100644 --- a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java +++ b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java @@ -14,10 +14,10 @@ import net.minecraft.client.gui.spectator.SpectatorMenu; import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.scoreboard.ScorePlayerTeam; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -64,16 +64,16 @@ public class TeleportToTeam implements ISpectatorMenuView, ISpectatorMenuObject return this.field_178672_a; } - public IChatComponent func_178670_b() { - return new ChatComponentText("Select a team to teleport to"); + public ITextComponent func_178670_b() { + return new TextComponentString("Select a team to teleport to"); } public void func_178661_a(SpectatorMenu spectatormenu) { spectatormenu.func_178647_a(this); } - public IChatComponent getSpectatorName() { - return new ChatComponentText("Teleport to team member"); + public ITextComponent getSpectatorName() { + return new TextComponentString("Teleport to team member"); } public void func_178663_a(float var1, int var2) { @@ -127,8 +127,8 @@ public class TeleportToTeam implements ISpectatorMenuView, ISpectatorMenuObject spectatormenu.func_178647_a(new TeleportToPlayer(this.field_178675_d)); } - public IChatComponent getSpectatorName() { - return new ChatComponentText(this.field_178676_b.getTeamName()); + public ITextComponent getSpectatorName() { + return new TextComponentString(this.field_178676_b.getTeamName()); } public void func_178663_a(float f, int i) { diff --git a/src/main/java/net/minecraft/client/model/ModelBat.java b/src/main/java/net/minecraft/client/model/ModelBat.java index 50fe545..b164a34 100644 --- a/src/main/java/net/minecraft/client/model/ModelBat.java +++ b/src/main/java/net/minecraft/client/model/ModelBat.java @@ -2,7 +2,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityBat; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelBiped.java b/src/main/java/net/minecraft/client/model/ModelBiped.java index 8b9eb30..9eb6f3e 100644 --- a/src/main/java/net/minecraft/client/model/ModelBiped.java +++ b/src/main/java/net/minecraft/client/model/ModelBiped.java @@ -3,7 +3,7 @@ package net.minecraft.client.model; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelBlaze.java b/src/main/java/net/minecraft/client/model/ModelBlaze.java index 52d7ec2..d71e621 100644 --- a/src/main/java/net/minecraft/client/model/ModelBlaze.java +++ b/src/main/java/net/minecraft/client/model/ModelBlaze.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelBook.java b/src/main/java/net/minecraft/client/model/ModelBook.java index e7542ba..0b330cc 100644 --- a/src/main/java/net/minecraft/client/model/ModelBook.java +++ b/src/main/java/net/minecraft/client/model/ModelBook.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelChicken.java b/src/main/java/net/minecraft/client/model/ModelChicken.java index 3224a9e..22b9502 100644 --- a/src/main/java/net/minecraft/client/model/ModelChicken.java +++ b/src/main/java/net/minecraft/client/model/ModelChicken.java @@ -2,7 +2,7 @@ package net.minecraft.client.model; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelCreeper.java b/src/main/java/net/minecraft/client/model/ModelCreeper.java index 78c013b..cb401ef 100644 --- a/src/main/java/net/minecraft/client/model/ModelCreeper.java +++ b/src/main/java/net/minecraft/client/model/ModelCreeper.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelElytra.java b/src/main/java/net/minecraft/client/model/ModelElytra.java index 4cd77c8..4ad3928 100644 --- a/src/main/java/net/minecraft/client/model/ModelElytra.java +++ b/src/main/java/net/minecraft/client/model/ModelElytra.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; public class ModelElytra extends ModelBase { private ModelRenderer rightWing; @@ -37,7 +37,7 @@ public class ModelElytra extends ModelBase { float f4 = 1.0F; if (entityIn.motionY < 0.0D) { - Vec3 vec3d = new Vec3(entityIn.motionX, entityIn.motionY, entityIn.motionZ).normalize(); + Vec3d vec3d = new Vec3d(entityIn.motionX, entityIn.motionY, entityIn.motionZ).normalize(); f4 = 1.0F - (float) Math.pow(-vec3d.yCoord, 1.5D); } diff --git a/src/main/java/net/minecraft/client/model/ModelEnderMite.java b/src/main/java/net/minecraft/client/model/ModelEnderMite.java index 7ce5f3c..a80d88a 100644 --- a/src/main/java/net/minecraft/client/model/ModelEnderMite.java +++ b/src/main/java/net/minecraft/client/model/ModelEnderMite.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelGhast.java b/src/main/java/net/minecraft/client/model/ModelGhast.java index c4caa14..3be957a 100644 --- a/src/main/java/net/minecraft/client/model/ModelGhast.java +++ b/src/main/java/net/minecraft/client/model/ModelGhast.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelGuardian.java b/src/main/java/net/minecraft/client/model/ModelGuardian.java index 53bc5c0..ac3310b 100644 --- a/src/main/java/net/minecraft/client/model/ModelGuardian.java +++ b/src/main/java/net/minecraft/client/model/ModelGuardian.java @@ -3,8 +3,8 @@ package net.minecraft.client.model; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityGuardian; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -128,8 +128,8 @@ public class ModelGuardian extends ModelBase { } if (object != null) { - Vec3 vec3 = ((Entity) object).getPositionEyes(0.0F); - Vec3 vec31 = entity.getPositionEyes(0.0F); + Vec3d vec3 = ((Entity) object).getPositionEyes(0.0F); + Vec3d vec31 = entity.getPositionEyes(0.0F); double d0 = vec3.yCoord - vec31.yCoord; if (d0 > 0.0D) { this.guardianEye.rotationPointY = 0.0F; @@ -137,9 +137,9 @@ public class ModelGuardian extends ModelBase { this.guardianEye.rotationPointY = 1.0F; } - Vec3 vec32 = entity.getLook(0.0F); - vec32 = new Vec3(vec32.xCoord, 0.0D, vec32.zCoord); - Vec3 vec33 = (new Vec3(vec31.xCoord - vec3.xCoord, 0.0D, vec31.zCoord - vec3.zCoord)).normalize() + Vec3d vec32 = entity.getLook(0.0F); + vec32 = new Vec3d(vec32.xCoord, 0.0D, vec32.zCoord); + Vec3d vec33 = (new Vec3d(vec31.xCoord - vec3.xCoord, 0.0D, vec31.zCoord - vec3.zCoord)).normalize() .rotateYaw(1.5707964F); double d1 = vec32.dotProduct(vec33); this.guardianEye.rotationPointX = MathHelper.sqrt_float((float) Math.abs(d1)) * 2.0F diff --git a/src/main/java/net/minecraft/client/model/ModelHorse.java b/src/main/java/net/minecraft/client/model/ModelHorse.java index 7be5700..6861782 100644 --- a/src/main/java/net/minecraft/client/model/ModelHorse.java +++ b/src/main/java/net/minecraft/client/model/ModelHorse.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelOcelot.java b/src/main/java/net/minecraft/client/model/ModelOcelot.java index d057e55..2acfdc9 100644 --- a/src/main/java/net/minecraft/client/model/ModelOcelot.java +++ b/src/main/java/net/minecraft/client/model/ModelOcelot.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelQuadruped.java b/src/main/java/net/minecraft/client/model/ModelQuadruped.java index be74259..2a00ba3 100644 --- a/src/main/java/net/minecraft/client/model/ModelQuadruped.java +++ b/src/main/java/net/minecraft/client/model/ModelQuadruped.java @@ -2,7 +2,7 @@ package net.minecraft.client.model; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelRabbit.java b/src/main/java/net/minecraft/client/model/ModelRabbit.java index 4274717..f75eeed 100644 --- a/src/main/java/net/minecraft/client/model/ModelRabbit.java +++ b/src/main/java/net/minecraft/client/model/ModelRabbit.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityRabbit; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelSilverfish.java b/src/main/java/net/minecraft/client/model/ModelSilverfish.java index f2a9aa6..ac44b54 100644 --- a/src/main/java/net/minecraft/client/model/ModelSilverfish.java +++ b/src/main/java/net/minecraft/client/model/ModelSilverfish.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelSnowMan.java b/src/main/java/net/minecraft/client/model/ModelSnowMan.java index 89e25b7..24b103b 100644 --- a/src/main/java/net/minecraft/client/model/ModelSnowMan.java +++ b/src/main/java/net/minecraft/client/model/ModelSnowMan.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelSpider.java b/src/main/java/net/minecraft/client/model/ModelSpider.java index 57a2fdd..ceff851 100644 --- a/src/main/java/net/minecraft/client/model/ModelSpider.java +++ b/src/main/java/net/minecraft/client/model/ModelSpider.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelVillager.java b/src/main/java/net/minecraft/client/model/ModelVillager.java index 5f5dc30..2249486 100644 --- a/src/main/java/net/minecraft/client/model/ModelVillager.java +++ b/src/main/java/net/minecraft/client/model/ModelVillager.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelWitch.java b/src/main/java/net/minecraft/client/model/ModelWitch.java index 3682a15..0089223 100644 --- a/src/main/java/net/minecraft/client/model/ModelWitch.java +++ b/src/main/java/net/minecraft/client/model/ModelWitch.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelWither.java b/src/main/java/net/minecraft/client/model/ModelWither.java index 7ec30e0..af477ff 100644 --- a/src/main/java/net/minecraft/client/model/ModelWither.java +++ b/src/main/java/net/minecraft/client/model/ModelWither.java @@ -3,7 +3,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityWither; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelWolf.java b/src/main/java/net/minecraft/client/model/ModelWolf.java index 68f0e39..cb54972 100644 --- a/src/main/java/net/minecraft/client/model/ModelWolf.java +++ b/src/main/java/net/minecraft/client/model/ModelWolf.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelZombie.java b/src/main/java/net/minecraft/client/model/ModelZombie.java index d561583..b4616f3 100644 --- a/src/main/java/net/minecraft/client/model/ModelZombie.java +++ b/src/main/java/net/minecraft/client/model/ModelZombie.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/ModelZombieVillager.java b/src/main/java/net/minecraft/client/model/ModelZombieVillager.java index 01346ef..9522093 100644 --- a/src/main/java/net/minecraft/client/model/ModelZombieVillager.java +++ b/src/main/java/net/minecraft/client/model/ModelZombieVillager.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/model/PositionTextureVertex.java b/src/main/java/net/minecraft/client/model/PositionTextureVertex.java index 82f40dd..afb3652 100644 --- a/src/main/java/net/minecraft/client/model/PositionTextureVertex.java +++ b/src/main/java/net/minecraft/client/model/PositionTextureVertex.java @@ -1,6 +1,6 @@ package net.minecraft.client.model; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -32,12 +32,12 @@ import net.minecraft.util.Vec3; * */ public class PositionTextureVertex { - public Vec3 vector3D; + public Vec3d vector3D; public float texturePositionX; public float texturePositionY; public PositionTextureVertex(float parFloat1, float parFloat2, float parFloat3, float parFloat4, float parFloat5) { - this(new Vec3((double) parFloat1, (double) parFloat2, (double) parFloat3), parFloat4, parFloat5); + this(new Vec3d((double) parFloat1, (double) parFloat2, (double) parFloat3), parFloat4, parFloat5); } public PositionTextureVertex setTexturePosition(float parFloat1, float parFloat2) { @@ -51,7 +51,7 @@ public class PositionTextureVertex { this.texturePositionY = texturePositionYIn; } - public PositionTextureVertex(Vec3 vector3DIn, float texturePositionXIn, float texturePositionYIn) { + public PositionTextureVertex(Vec3d vector3DIn, float texturePositionXIn, float texturePositionYIn) { this.vector3D = vector3DIn; this.texturePositionX = texturePositionXIn; this.texturePositionY = texturePositionYIn; diff --git a/src/main/java/net/minecraft/client/model/TexturedQuad.java b/src/main/java/net/minecraft/client/model/TexturedQuad.java index f060f51..d15ed9e 100644 --- a/src/main/java/net/minecraft/client/model/TexturedQuad.java +++ b/src/main/java/net/minecraft/client/model/TexturedQuad.java @@ -4,7 +4,7 @@ import net.hoosiertransfer.Config; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -77,9 +77,9 @@ public class TexturedQuad { * reused later. */ public void draw(WorldRenderer renderer, float scale) { - Vec3 vec3 = this.vertexPositions[1].vector3D.subtractReverse(this.vertexPositions[0].vector3D); - Vec3 vec31 = this.vertexPositions[1].vector3D.subtractReverse(this.vertexPositions[2].vector3D); - Vec3 vec32 = vec31.crossProduct(vec3).normalize(); + Vec3d vec3 = this.vertexPositions[1].vector3D.subtractReverse(this.vertexPositions[0].vector3D); + Vec3d vec31 = this.vertexPositions[1].vector3D.subtractReverse(this.vertexPositions[2].vector3D); + Vec3d vec32 = vec31.crossProduct(vec3).normalize(); float f = (float) vec32.xCoord; float f1 = (float) vec32.yCoord; float f2 = (float) vec32.zCoord; diff --git a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java b/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java index 3a1487a..bf93cb0 100644 --- a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java +++ b/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java @@ -7,9 +7,9 @@ import com.google.common.collect.Lists; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.LongHashMap; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java b/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java index 4f98526..22aedaa 100644 --- a/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java +++ b/src/main/java/net/minecraft/client/multiplayer/GuiConnecting.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.resources.I18n; import net.minecraft.network.EnumConnectionState; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; /** * + @@ -159,8 +159,9 @@ public class GuiConnecting extends GuiScreen { logger.info("Handshake Failure"); mc.getSession().reset(); mc.displayGuiScreen( - new GuiDisconnected(previousGuiScreen, "connect.failed", new ChatComponentText( - "Handshake Failure\n\nAre you sure this is an eagler 1.8 server?"))); + new GuiDisconnected(previousGuiScreen, "connect.failed", + new TextComponentString( + "Handshake Failure\n\nAre you sure this is an eagler 1.8 server?"))); } if (!PlatformNetworking.playConnectionState().isClosed()) { PlatformNetworking.playDisconnect(); @@ -182,7 +183,7 @@ public class GuiConnecting extends GuiScreen { mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen)); } else { mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed", - new ChatComponentText("Connection Refused"))); + new TextComponentString("Connection Refused"))); } } } @@ -195,7 +196,7 @@ public class GuiConnecting extends GuiScreen { mc.displayGuiScreen(GuiDisconnected.createRateLimitKick(previousGuiScreen)); } else { mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed", - new ChatComponentText("Connection Refused"))); + new TextComponentString("Connection Refused"))); } } } @@ -237,7 +238,7 @@ public class GuiConnecting extends GuiScreen { if (parGuiButton.id == 0) { this.cancel = true; if (this.networkManager != null) { - this.networkManager.closeChannel(new ChatComponentText("Aborted")); + this.networkManager.closeChannel(new TextComponentString("Aborted")); } this.mc.displayGuiScreen(new GuiMainMenu()); diff --git a/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java b/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java index aa3697f..b6a1886 100644 --- a/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java +++ b/src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java @@ -24,12 +24,12 @@ import net.minecraft.network.play.client.C0EPacketClickWindow; import net.minecraft.network.play.client.C10PacketCreativeInventoryAction; import net.minecraft.network.play.client.C11PacketEnchantItem; import net.minecraft.stats.StatFileWriter; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraft.world.WorldSettings; @@ -258,7 +258,7 @@ public class PlayerControllerMP { this.isHittingBlock = false; this.curBlockDamageMP = 0.0F; this.mc.theWorld.sendBlockBreakProgress(this.mc.thePlayer.getEntityId(), this.currentBlock, -1); - this.mc.thePlayer.resetCooldown(); + this.mc.thePlayer.resetCooldown(); } } @@ -329,7 +329,7 @@ public class PlayerControllerMP { EaglercraftNetworkManager.logger.fatal(ex); EaglercraftNetworkManager.logger.fatal("Disconnecting..."); this.netClientHandler.getNetworkManager() - .closeChannel(new ChatComponentText("Exception thrown: " + ex.toString())); + .closeChannel(new TextComponentString("Exception thrown: " + ex.toString())); } this.netClientHandler.getSkinCache().flush(); this.netClientHandler.getCapeCache().flush(); @@ -366,7 +366,7 @@ public class PlayerControllerMP { } public boolean onPlayerRightClick(EntityPlayerSP player, WorldClient worldIn, ItemStack heldStack, BlockPos hitPos, - EnumFacing side, Vec3 hitVec) { + EnumFacing side, Vec3d hitVec) { this.syncCurrentPlayItem(); float f = (float) (hitVec.xCoord - (double) hitPos.getX()); float f1 = (float) (hitVec.yCoord - (double) hitPos.getY()); @@ -454,7 +454,7 @@ public class PlayerControllerMP { this.netClientHandler.addToSendQueue(new C02PacketUseEntity(targetEntity, C02PacketUseEntity.Action.ATTACK)); if (this.currentGameType != WorldSettings.GameType.SPECTATOR) { playerIn.attackTargetEntityWithCurrentItem(targetEntity); - playerIn.resetCooldown(); + playerIn.resetCooldown(); } } @@ -470,9 +470,9 @@ public class PlayerControllerMP { } public boolean func_178894_a(EntityPlayer parEntityPlayer, Entity parEntity, - MovingObjectPosition parMovingObjectPosition) { + RayTraceResult parMovingObjectPosition) { this.syncCurrentPlayItem(); - Vec3 vec3 = new Vec3(parMovingObjectPosition.hitVec.xCoord - parEntity.posX, + Vec3d vec3 = new Vec3d(parMovingObjectPosition.hitVec.xCoord - parEntity.posX, parMovingObjectPosition.hitVec.yCoord - parEntity.posY, parMovingObjectPosition.hitVec.zCoord - parEntity.posZ); this.netClientHandler.addToSendQueue(new C02PacketUseEntity(parEntity, vec3)); diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerData.java b/src/main/java/net/minecraft/client/multiplayer/ServerData.java index 424788f..ab6e277 100644 --- a/src/main/java/net/minecraft/client/multiplayer/ServerData.java +++ b/src/main/java/net/minecraft/client/multiplayer/ServerData.java @@ -12,9 +12,9 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.profile.EaglerSkinTexture; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -170,13 +170,13 @@ public class ServerData { public static final ServerResourceMode[] _VALUES = values(); - private final IChatComponent motd; + private final ITextComponent motd; private ServerResourceMode(String parString2) { - this.motd = new ChatComponentTranslation("addServer.resourcePack." + parString2, new Object[0]); + this.motd = new TextComponentTranslation("addServer.resourcePack." + parString2, new Object[0]); } - public IChatComponent getMotd() { + public ITextComponent getMotd() { return this.motd; } } diff --git a/src/main/java/net/minecraft/client/multiplayer/WorldClient.java b/src/main/java/net/minecraft/client/multiplayer/WorldClient.java index 211e373..99f11c7 100644 --- a/src/main/java/net/minecraft/client/multiplayer/WorldClient.java +++ b/src/main/java/net/minecraft/client/multiplayer/WorldClient.java @@ -22,10 +22,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.profiler.Profiler; import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; @@ -289,7 +289,7 @@ public class WorldClient extends World { * If on MP, sends a quitting packet. */ public void sendQuittingDisconnectingPacket() { - this.sendQueue.getNetworkManager().closeChannel(new ChatComponentText("Quitting")); + this.sendQueue.getNetworkManager().closeChannel(new TextComponentString("Quitting")); } /** diff --git a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java index 458eec5..3e21bd2 100644 --- a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java +++ b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java @@ -203,16 +203,16 @@ import net.minecraft.tileentity.TileEntityFlowerPot; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.tileentity.TileEntitySign; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITabCompleter; -import net.minecraft.util.MathHelper; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.Explosion; import net.minecraft.world.WorldProviderSurface; @@ -770,7 +770,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient { * Invoked when disconnecting, the parameter is a ChatComponent * describing the reason for termination */ - public void onDisconnect(IChatComponent ichatcomponent) { + public void onDisconnect(ITextComponent ichatcomponent) { VoiceClientController.handleServerDisconnect(); Minecraft.getMinecraft().getRenderManager() .setEnableFNAWSkins(this.gameController.gameSettings.enableFNAWSkins); @@ -1155,7 +1155,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient { } if (!flag && this.gameController.thePlayer != null) { - this.gameController.thePlayer.addChatMessage(new ChatComponentText("Unable to locate sign at " + this.gameController.thePlayer.addChatMessage(new TextComponentString("Unable to locate sign at " + packetIn.getPos().getX() + ", " + packetIn.getPos().getY() + ", " + packetIn.getPos().getZ())); } @@ -1268,7 +1268,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient { if (i >= 0 && i < S2BPacketChangeGameState.MESSAGE_NAMES.length && S2BPacketChangeGameState.MESSAGE_NAMES[i] != null) { entityplayersp.addChatComponentMessage( - new ChatComponentTranslation(S2BPacketChangeGameState.MESSAGE_NAMES[i], new Object[0])); + new TextComponentTranslation(S2BPacketChangeGameState.MESSAGE_NAMES[i], new Object[0])); } if (i == 1) { diff --git a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java b/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java index 52a9cd5..d2d2c2c 100644 --- a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java +++ b/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.profile.SkinModel; import net.minecraft.client.Minecraft; import net.minecraft.network.play.server.S38PacketPlayerListItem; import net.minecraft.scoreboard.ScorePlayerTeam; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldSettings; /** @@ -43,7 +43,7 @@ public class NetworkPlayerInfo { private WorldSettings.GameType gameType; private int responseTime; private String skinType; - private IChatComponent displayName; + private ITextComponent displayName; private int field_178873_i = 0; private int field_178870_j = 0; private long field_178871_k = 0L; @@ -112,11 +112,11 @@ public class NetworkPlayerInfo { return Minecraft.getMinecraft().theWorld.getScoreboard().getPlayersTeam(this.getGameProfile().getName()); } - public void setDisplayName(IChatComponent displayNameIn) { + public void setDisplayName(ITextComponent displayNameIn) { this.displayName = displayNameIn; } - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return this.displayName; } diff --git a/src/main/java/net/minecraft/client/particle/EffectRenderer.java b/src/main/java/net/minecraft/client/particle/EffectRenderer.java index cbe77f5..09ea2d7 100644 --- a/src/main/java/net/minecraft/client/particle/EffectRenderer.java +++ b/src/main/java/net/minecraft/client/particle/EffectRenderer.java @@ -31,12 +31,12 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.hoosiertransfer.Config; @@ -151,7 +151,8 @@ public class EffectRenderer { this.registerParticle(EnumParticleTypes.MOB_APPEARANCE.getParticleID(), new MobAppearance.Factory()); this.registerParticle(EnumParticleTypes.DRAGON_BREATH.getParticleID(), new ParticleDragonBreath.Factory()); this.registerParticle(EnumParticleTypes.END_ROD.getParticleID(), new ParticleEndRod.Factory()); - this.registerParticle(EnumParticleTypes.DAMAGE_INDICATOR.getParticleID(), new EntityCrit2FX.DamageIndicatorFactory()); + this.registerParticle(EnumParticleTypes.DAMAGE_INDICATOR.getParticleID(), + new EntityCrit2FX.DamageIndicatorFactory()); this.registerParticle(EnumParticleTypes.SWEEP_ATTACK.getParticleID(), new ParticleSweepAttack.Factory()); } diff --git a/src/main/java/net/minecraft/client/particle/EntityBreakingFX.java b/src/main/java/net/minecraft/client/particle/EntityBreakingFX.java index 2aa3661..ba81d70 100644 --- a/src/main/java/net/minecraft/client/particle/EntityBreakingFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityBreakingFX.java @@ -7,7 +7,7 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityBubbleFX.java b/src/main/java/net/minecraft/client/particle/EntityBubbleFX.java index 0671a32..0bd5c9f 100644 --- a/src/main/java/net/minecraft/client/particle/EntityBubbleFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityBubbleFX.java @@ -1,7 +1,7 @@ package net.minecraft.client.particle; import net.minecraft.block.material.Material; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityCloudFX.java b/src/main/java/net/minecraft/client/particle/EntityCloudFX.java index b40c236..6bfed9d 100644 --- a/src/main/java/net/minecraft/client/particle/EntityCloudFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityCloudFX.java @@ -3,7 +3,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityCrit2FX.java b/src/main/java/net/minecraft/client/particle/EntityCrit2FX.java index 773d534..39ec2e1 100644 --- a/src/main/java/net/minecraft/client/particle/EntityCrit2FX.java +++ b/src/main/java/net/minecraft/client/particle/EntityCrit2FX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -101,16 +101,16 @@ public class EntityCrit2FX extends EntityFX { } - public static class DamageIndicatorFactory implements IParticleFactory - { - public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) - { - EntityFX particle = new EntityCrit2FX(worldIn, xCoordIn, yCoordIn, zCoordIn, xSpeedIn, ySpeedIn + 1.0D, zSpeedIn, 1.0F); - particle.setMaxAge(20); - particle.setParticleTextureIndex(67); - return particle; - } - } + public static class DamageIndicatorFactory implements IParticleFactory { + public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, + double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) { + EntityFX particle = new EntityCrit2FX(worldIn, xCoordIn, yCoordIn, zCoordIn, xSpeedIn, ySpeedIn + 1.0D, + zSpeedIn, 1.0F); + particle.setMaxAge(20); + particle.setParticleTextureIndex(67); + return particle; + } + } public static class Factory implements IParticleFactory { public EntityFX getEntityFX(int var1, World world, double d0, double d1, double d2, double d3, double d4, diff --git a/src/main/java/net/minecraft/client/particle/EntityDiggingFX.java b/src/main/java/net/minecraft/client/particle/EntityDiggingFX.java index c1a82b1..82127ac 100644 --- a/src/main/java/net/minecraft/client/particle/EntityDiggingFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityDiggingFX.java @@ -7,9 +7,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java b/src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java index 307a1b6..cecb96c 100644 --- a/src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityDropParticleFX.java @@ -3,9 +3,9 @@ package net.minecraft.client.particle; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityFX.java b/src/main/java/net/minecraft/client/particle/EntityFX.java index 985bcf3..6ac5fd5 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityFX.java @@ -6,7 +6,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -135,10 +135,9 @@ public class EntityFX extends Entity { return this.particleAlpha; } - public void setMaxAge(int p_187114_1_) - { - this.particleMaxAge = p_187114_1_; - } + public void setMaxAge(int p_187114_1_) { + this.particleMaxAge = p_187114_1_; + } /** * + diff --git a/src/main/java/net/minecraft/client/particle/EntityFirework.java b/src/main/java/net/minecraft/client/particle/EntityFirework.java index 69da10f..718d357 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFirework.java +++ b/src/main/java/net/minecraft/client/particle/EntityFirework.java @@ -7,8 +7,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemDye; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityFlameFX.java b/src/main/java/net/minecraft/client/particle/EntityFlameFX.java index 6cd44d4..a34194b 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFlameFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityFlameFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityFootStepFX.java b/src/main/java/net/minecraft/client/particle/EntityFootStepFX.java index af85bbc..0136aba 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFootStepFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityFootStepFX.java @@ -9,8 +9,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityHeartFX.java b/src/main/java/net/minecraft/client/particle/EntityHeartFX.java index a33dddc..e700dd1 100644 --- a/src/main/java/net/minecraft/client/particle/EntityHeartFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityHeartFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityLavaFX.java b/src/main/java/net/minecraft/client/particle/EntityLavaFX.java index 9e2e7b0..4784122 100644 --- a/src/main/java/net/minecraft/client/particle/EntityLavaFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityLavaFX.java @@ -3,7 +3,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityNoteFX.java b/src/main/java/net/minecraft/client/particle/EntityNoteFX.java index be14170..4e1bab2 100644 --- a/src/main/java/net/minecraft/client/particle/EntityNoteFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityNoteFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityRainFX.java b/src/main/java/net/minecraft/client/particle/EntityRainFX.java index 9d66562..953a425 100644 --- a/src/main/java/net/minecraft/client/particle/EntityRainFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityRainFX.java @@ -4,8 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntityReddustFX.java b/src/main/java/net/minecraft/client/particle/EntityReddustFX.java index 080cfff..f8132c3 100644 --- a/src/main/java/net/minecraft/client/particle/EntityReddustFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityReddustFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntitySmokeFX.java b/src/main/java/net/minecraft/client/particle/EntitySmokeFX.java index d1179c0..57b3a28 100644 --- a/src/main/java/net/minecraft/client/particle/EntitySmokeFX.java +++ b/src/main/java/net/minecraft/client/particle/EntitySmokeFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java b/src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java index 98287f1..fdffe86 100644 --- a/src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java +++ b/src/main/java/net/minecraft/client/particle/EntitySnowShovelFX.java @@ -2,7 +2,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java b/src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java index 46b880a..789e9e7 100644 --- a/src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java +++ b/src/main/java/net/minecraft/client/particle/EntitySpellParticleFX.java @@ -3,7 +3,7 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/EntitySuspendFX.java b/src/main/java/net/minecraft/client/particle/EntitySuspendFX.java index 8bae9bd..1d603ef 100644 --- a/src/main/java/net/minecraft/client/particle/EntitySuspendFX.java +++ b/src/main/java/net/minecraft/client/particle/EntitySuspendFX.java @@ -1,7 +1,7 @@ package net.minecraft.client.particle; import net.minecraft.block.material.Material; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/MobAppearance.java b/src/main/java/net/minecraft/client/particle/MobAppearance.java index 0574fa4..fcf266f 100644 --- a/src/main/java/net/minecraft/client/particle/MobAppearance.java +++ b/src/main/java/net/minecraft/client/particle/MobAppearance.java @@ -10,7 +10,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityGuardian; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/particle/ParticleDragonBreath.java b/src/main/java/net/minecraft/client/particle/ParticleDragonBreath.java index 98be6a0..e576d35 100644 --- a/src/main/java/net/minecraft/client/particle/ParticleDragonBreath.java +++ b/src/main/java/net/minecraft/client/particle/ParticleDragonBreath.java @@ -2,16 +2,15 @@ package net.minecraft.client.particle; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -public class ParticleDragonBreath extends EntityFX -{ +public class ParticleDragonBreath extends EntityFX { private final float oSize; private boolean hasHitGround; - protected ParticleDragonBreath(World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) - { + protected ParticleDragonBreath(World worldIn, double x, double y, double z, double xSpeed, double ySpeed, + double zSpeed) { super(worldIn, x, y, z, xSpeed, ySpeed, zSpeed); this.motionX = xSpeed; this.motionY = ySpeed; @@ -21,39 +20,32 @@ public class ParticleDragonBreath extends EntityFX this.particleBlue = MathHelper.randomFloatClamp(this.rand, 0.8235294F, 0.9764706F); this.particleScale *= 0.75F; this.oSize = this.particleScale; - this.particleMaxAge = (int)(20.0D / ((double)this.rand.nextFloat() * 0.8D + 0.2D)); + this.particleMaxAge = (int) (20.0D / ((double) this.rand.nextFloat() * 0.8D + 0.2D)); this.hasHitGround = false; } - public void onUpdate() - { + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; - if (this.particleAge++ >= this.particleMaxAge) - { + if (this.particleAge++ >= this.particleMaxAge) { this.setDead(); - } - else - { + } else { this.setParticleTextureIndex(3 * this.particleAge / this.particleMaxAge + 5); - if (this.isCollided) - { + if (this.isCollided) { this.motionY = 0.0D; this.hasHitGround = true; } - if (this.hasHitGround) - { + if (this.hasHitGround) { this.motionY += 0.002D; } this.moveEntity(this.motionX, this.motionY, this.motionZ); - if (this.posY == this.prevPosY) - { + if (this.posY == this.prevPosY) { this.motionX *= 1.1D; this.motionZ *= 1.1D; } @@ -61,8 +53,7 @@ public class ParticleDragonBreath extends EntityFX this.motionX *= 0.9599999785423279D; this.motionZ *= 0.9599999785423279D; - if (this.hasHitGround) - { + if (this.hasHitGround) { this.motionY *= 0.9599999785423279D; } } @@ -71,16 +62,17 @@ public class ParticleDragonBreath extends EntityFX /** * Renders the particle */ - public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) - { - this.particleScale = this.oSize * MathHelper.clamp_float(((float)this.particleAge + partialTicks) / (float)this.particleMaxAge * 32.0F, 0.0F, 1.0F); - super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); + public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, + float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + this.particleScale = this.oSize * MathHelper.clamp_float( + ((float) this.particleAge + partialTicks) / (float) this.particleMaxAge * 32.0F, 0.0F, 1.0F); + super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, + rotationXZ); } - public static class Factory implements IParticleFactory - { - public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) - { + public static class Factory implements IParticleFactory { + public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, + double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) { return new ParticleDragonBreath(worldIn, xCoordIn, yCoordIn, zCoordIn, xSpeedIn, ySpeedIn, zSpeedIn); } } diff --git a/src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java b/src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java index 738c423..47b4b13 100644 --- a/src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java +++ b/src/main/java/net/minecraft/client/player/inventory/ContainerLocalMenu.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryBasic; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.ILockableContainer; import net.minecraft.world.LockCode; @@ -45,7 +45,7 @@ public class ContainerLocalMenu extends InventoryBasic implements ILockableConta private String guiID; private Map field_174895_b = Maps.newHashMap(); - public ContainerLocalMenu(String id, IChatComponent title, int slotCount) { + public ContainerLocalMenu(String id, ITextComponent title, int slotCount) { super(title, slotCount); this.guiID = id; } diff --git a/src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java b/src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java index fc93f8a..5690b74 100644 --- a/src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java +++ b/src/main/java/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java @@ -3,7 +3,7 @@ package net.minecraft.client.player.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IInteractionObject; /** @@ -37,9 +37,9 @@ import net.minecraft.world.IInteractionObject; */ public class LocalBlockIntercommunication implements IInteractionObject { private String guiID; - private IChatComponent displayName; + private ITextComponent displayName; - public LocalBlockIntercommunication(String guiIdIn, IChatComponent displayNameIn) { + public LocalBlockIntercommunication(String guiIdIn, ITextComponent displayNameIn) { this.guiID = guiIdIn; this.displayName = displayNameIn; } @@ -74,7 +74,7 @@ public class LocalBlockIntercommunication implements IInteractionObject { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return this.displayName; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java index 0c323ff..23d97cc 100644 --- a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java +++ b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java @@ -9,9 +9,9 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -64,7 +64,7 @@ public class ActiveRenderInfo { * The computed view object coordinates */ private static final float[] OBJECTCOORDS = new float[3]; - private static Vec3 position = new Vec3(0.0D, 0.0D, 0.0D); + private static Vec3d position = new Vec3d(0.0D, 0.0D, 0.0D); private static float rotationX; private static float rotationXZ; private static float rotationZ; @@ -83,7 +83,7 @@ public class ActiveRenderInfo { float f = (float) ((VIEWPORT[0] + VIEWPORT[2]) / 2); float f1 = (float) ((VIEWPORT[1] + VIEWPORT[3]) / 2); GlStateManager.gluUnProject(f, f1, 0.0F, MODELVIEW, PROJECTION, VIEWPORT, OBJECTCOORDS); - position = new Vec3((double) OBJECTCOORDS[0], (double) OBJECTCOORDS[1], (double) OBJECTCOORDS[2]); + position = new Vec3d((double) OBJECTCOORDS[0], (double) OBJECTCOORDS[1], (double) OBJECTCOORDS[2]); int i = parFlag ? 1 : 0; float f2 = entityplayerIn.rotationPitch; float f3 = entityplayerIn.rotationYaw; @@ -94,18 +94,18 @@ public class ActiveRenderInfo { rotationXZ = MathHelper.cos(f2 * 3.1415927F / 180.0F); } - public static Vec3 projectViewFromEntity(Entity parEntity, double parDouble1) { + public static Vec3d projectViewFromEntity(Entity parEntity, double parDouble1) { double d0 = parEntity.prevPosX + (parEntity.posX - parEntity.prevPosX) * parDouble1; double d1 = parEntity.prevPosY + (parEntity.posY - parEntity.prevPosY) * parDouble1 + parEntity.getEyeHeight(); double d2 = parEntity.prevPosZ + (parEntity.posZ - parEntity.prevPosZ) * parDouble1; double d3 = d0 + position.xCoord; double d4 = d1 + position.yCoord; double d5 = d2 + position.zCoord; - return new Vec3(d3, d4, d5); + return new Vec3d(d3, d4, d5); } public static Block getBlockAtEntityViewpoint(World worldIn, Entity parEntity, float parFloat1) { - Vec3 vec3 = projectViewFromEntity(parEntity, (double) parFloat1); + Vec3d vec3 = projectViewFromEntity(parEntity, (double) parFloat1); BlockPos blockpos = new BlockPos(vec3); IBlockState iblockstate = worldIn.getBlockState(blockpos); Block block = iblockstate.getBlock(); @@ -125,7 +125,7 @@ public class ActiveRenderInfo { return block; } - public static Vec3 getPosition() { + public static Vec3d getPosition() { return position; } diff --git a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java index 4fb9bb8..7d293c5 100644 --- a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java @@ -11,9 +11,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java b/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java index 2607a92..a9e28cd 100644 --- a/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java @@ -19,11 +19,11 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java b/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java index d25f073..9334914 100644 --- a/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java +++ b/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java @@ -12,9 +12,9 @@ import net.minecraft.client.resources.model.WeightedBakedModel; import net.minecraft.client.settings.GameSettings; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java b/src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java index 8ea0513..6a9cc37 100644 --- a/src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java +++ b/src/main/java/net/minecraft/client/renderer/ChunkRenderContainer.java @@ -8,9 +8,9 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager; import net.minecraft.client.renderer.chunk.RenderChunk; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java b/src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java index ca0d6e4..ac8fa34 100644 --- a/src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java +++ b/src/main/java/net/minecraft/client/renderer/DestroyBlockProgress.java @@ -1,6 +1,6 @@ package net.minecraft.client.renderer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java index 451e0ae..1f4103f 100644 --- a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java @@ -73,19 +73,19 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; import net.minecraft.util.MouseFilter; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.WorldSettings; import net.minecraft.world.biome.BiomeGenBase; @@ -316,7 +316,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { double d0 = (double) this.mc.playerController.getBlockReachDistance(); this.mc.objectMouseOver = entity.rayTrace(d0, partialTicks); double d1 = d0; - Vec3 vec3 = entity.getPositionEyes(partialTicks); + Vec3d vec3 = entity.getPositionEyes(partialTicks); boolean flag = false; boolean flag1 = true; if (this.mc.playerController.extendedReach()) { @@ -334,10 +334,10 @@ public class EntityRenderer implements IResourceManagerReloadListener { d1 = this.mc.objectMouseOver.hitVec.distanceTo(vec3); } - Vec3 vec31 = entity.getLook(partialTicks); - Vec3 vec32 = vec3.addVector(vec31.xCoord * d0, vec31.yCoord * d0, vec31.zCoord * d0); + Vec3d vec31 = entity.getLook(partialTicks); + Vec3d vec32 = vec3.addVector(vec31.xCoord * d0, vec31.yCoord * d0, vec31.zCoord * d0); this.pointedEntity = null; - Vec3 vec33 = null; + Vec3d vec33 = null; float f = 1.0F; List list = this.mc.theWorld.getEntitiesInAABBexcluding(entity, entity.getEntityBoundingBox().addCoord(vec31.xCoord * d0, vec31.yCoord * d0, vec31.zCoord * d0) @@ -354,7 +354,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { float f1 = entity1.getCollisionBorderSize(); AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double) f1, (double) f1, (double) f1); - MovingObjectPosition movingobjectposition = axisalignedbb.calculateIntercept(vec3, vec32); + RayTraceResult movingobjectposition = axisalignedbb.calculateIntercept(vec3, vec32); if (axisalignedbb.isVecInside(vec3)) { if (d2 >= 0.0D) { this.pointedEntity = entity1; @@ -380,12 +380,12 @@ public class EntityRenderer implements IResourceManagerReloadListener { if (this.pointedEntity != null && flag && vec3.distanceTo(vec33) > 3.0D) { this.pointedEntity = null; - this.mc.objectMouseOver = new MovingObjectPosition(MovingObjectPosition.MovingObjectType.MISS, + this.mc.objectMouseOver = new RayTraceResult(RayTraceResult.MovingObjectType.MISS, vec33, (EnumFacing) null, new BlockPos(vec33)); } if (this.pointedEntity != null && (d2 < d1 || this.mc.objectMouseOver == null)) { - this.mc.objectMouseOver = new MovingObjectPosition(this.pointedEntity, vec33); + this.mc.objectMouseOver = new RayTraceResult(this.pointedEntity, vec33); if (this.pointedEntity instanceof EntityLivingBase || this.pointedEntity instanceof EntityItemFrame) { this.mc.pointedEntity = this.pointedEntity; @@ -549,11 +549,11 @@ public class EntityRenderer implements IResourceManagerReloadListener { f3 = f3 * 0.1F; f4 = f4 * 0.1F; f5 = f5 * 0.1F; - MovingObjectPosition movingobjectposition = this.mc.theWorld - .rayTraceBlocks(new Vec3(d0 + (double) f3, d1 + (double) f4, d2 + (double) f5), new Vec3( + RayTraceResult movingobjectposition = this.mc.theWorld + .rayTraceBlocks(new Vec3d(d0 + (double) f3, d1 + (double) f4, d2 + (double) f5), new Vec3d( d0 - d4 + (double) f3 + (double) f5, d1 - d6 + (double) f4, d2 - d5 + (double) f5)); if (movingobjectposition != null) { - double d7 = movingobjectposition.hitVec.distanceTo(new Vec3(d0, d1, d2)); + double d7 = movingobjectposition.hitVec.distanceTo(new Vec3d(d0, d1, d2)); if (d7 < d3) { d3 = d7; } @@ -1061,7 +1061,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { if (flag && !((EntityPlayer) entity).capabilities.allowEdit) { ItemStack itemstack = ((EntityPlayer) entity).getCurrentEquippedItem(); if (this.mc.objectMouseOver != null - && this.mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + && this.mc.objectMouseOver.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = this.mc.objectMouseOver.getBlockPos(); Block block = this.mc.theWorld.getBlockState(blockpos).getBlock(); if (this.mc.playerController.getCurrentGameType() == WorldSettings.GameType.SPECTATOR) { @@ -1694,19 +1694,19 @@ public class EntityRenderer implements IResourceManagerReloadListener { Entity entity = this.mc.getRenderViewEntity(); float f = 0.25F + 0.75F * (float) this.mc.gameSettings.renderDistanceChunks / 32.0F; f = 1.0F - (float) Math.pow((double) f, 0.25D); - Vec3 vec3 = worldclient.getSkyColor(this.mc.getRenderViewEntity(), partialTicks); + Vec3d vec3 = worldclient.getSkyColor(this.mc.getRenderViewEntity(), partialTicks); float f1 = (float) vec3.xCoord; float f2 = (float) vec3.yCoord; float f3 = (float) vec3.zCoord; - Vec3 vec31 = worldclient.getFogColor(partialTicks); + Vec3d vec31 = worldclient.getFogColor(partialTicks); this.fogColorRed = (float) vec31.xCoord; this.fogColorGreen = (float) vec31.yCoord; this.fogColorBlue = (float) vec31.zCoord; if (this.mc.gameSettings.renderDistanceChunks >= 4) { double d0 = -1.0D; - Vec3 vec32 = MathHelper.sin(worldclient.getCelestialAngleRadians(partialTicks)) > 0.0F - ? new Vec3(d0, 0.0D, 0.0D) - : new Vec3(1.0D, 0.0D, 0.0D); + Vec3d vec32 = MathHelper.sin(worldclient.getCelestialAngleRadians(partialTicks)) > 0.0F + ? new Vec3d(d0, 0.0D, 0.0D) + : new Vec3d(1.0D, 0.0D, 0.0D); float f5 = (float) entity.getLook(partialTicks).dotProduct(vec32); if (f5 < 0.0F) { f5 = 0.0F; @@ -1746,7 +1746,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { Block block = ActiveRenderInfo.getBlockAtEntityViewpoint(this.mc.theWorld, entity, partialTicks); if (this.cloudFog) { - Vec3 vec33 = worldclient.getCloudColour(partialTicks); + Vec3d vec33 = worldclient.getCloudColour(partialTicks); this.fogColorRed = (float) vec33.xCoord; this.fogColorGreen = (float) vec33.yCoord; this.fogColorBlue = (float) vec33.zCoord; diff --git a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java index 8ddc1f1..9957ecf 100644 --- a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java @@ -27,10 +27,10 @@ import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.storage.MapData; /** @@ -540,7 +540,9 @@ public class ItemRenderer { float cooledAttackStength = entityplayersp.getCooledAttackStrength(1.0F); this.equippedProgress += MathHelper - .clamp_float((com.google.common.base.Objects.equal(this.itemToRender, itemstack) ? cooledAttackStength * cooledAttackStength * cooledAttackStength : 0.0F) + .clamp_float((com.google.common.base.Objects.equal(this.itemToRender, itemstack) + ? cooledAttackStength * cooledAttackStength * cooledAttackStength + : 0.0F) - this.equippedProgress, -0.4F, 0.4F); float f = 0.4F; diff --git a/src/main/java/net/minecraft/client/renderer/RegionRenderCache.java b/src/main/java/net/minecraft/client/renderer/RegionRenderCache.java index 62a34c1..278d86b 100644 --- a/src/main/java/net/minecraft/client/renderer/RegionRenderCache.java +++ b/src/main/java/net/minecraft/client/renderer/RegionRenderCache.java @@ -5,8 +5,8 @@ import java.util.Arrays; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.ChunkCache; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java index 7afc4e9..4e04dff 100644 --- a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java +++ b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java @@ -78,22 +78,21 @@ import net.minecraft.item.ItemDye; import net.minecraft.item.ItemRecord; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ClassInheritanceMultiMap; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; import net.minecraft.util.Matrix4f; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; -import net.minecraft.util.Vector3d; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IWorldAccess; import net.minecraft.world.border.WorldBorder; import net.minecraft.world.chunk.Chunk; @@ -463,9 +462,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene EaglerDeferredPipeline.isSuspended = true; } if (flag && !EaglerDeferredPipeline.isSuspended) { - ChatComponentText shaderF4Msg = new ChatComponentText("[EaglercraftX] "); + TextComponentString shaderF4Msg = new TextComponentString("[EaglercraftX] "); shaderF4Msg.getChatStyle().setColor(EnumChatFormatting.GOLD); - ChatComponentTranslation shaderF4Msg2 = new ChatComponentTranslation("shaders.debugMenuTip", + TextComponentTranslation shaderF4Msg2 = new TextComponentTranslation("shaders.debugMenuTip", Keyboard.getKeyName(mc.gameSettings.keyBindFunction.getKeyCode())); shaderF4Msg2.getChatStyle().setColor(EnumChatFormatting.AQUA); shaderF4Msg.appendSibling(shaderF4Msg2); @@ -1335,7 +1334,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene this.renderSkyEnd(); } else if (this.mc.theWorld.provider.isSurfaceWorld()) { GlStateManager.disableTexture2D(); - Vec3 vec3 = this.theWorld.getSkyColor(this.mc.getRenderViewEntity(), partialTicks); + Vec3d vec3 = this.theWorld.getSkyColor(this.mc.getRenderViewEntity(), partialTicks); float f = (float) vec3.xCoord; float f1 = (float) vec3.yCoord; float f2 = (float) vec3.zCoord; @@ -1511,7 +1510,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene this.renderEngine.bindTexture(locationCloudsPng); GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0); - Vec3 vec3 = this.theWorld.getCloudColour(partialTicks); + Vec3d vec3 = this.theWorld.getCloudColour(partialTicks); float f1 = (float) vec3.xCoord; float f2 = (float) vec3.yCoord; float f3 = (float) vec3.zCoord; @@ -1603,7 +1602,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene this.renderEngine.bindTexture(locationCloudsPng); GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0); - Vec3 vec3 = this.theWorld.getCloudColour(partialTicks); + Vec3d vec3 = this.theWorld.getCloudColour(partialTicks); float f4 = (float) vec3.xCoord; float f5 = (float) vec3.yCoord; float f6 = (float) vec3.zCoord; @@ -2048,10 +2047,10 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene * Draws the selection box for the player. Args: entityPlayer, * rayTraceHit, i, itemStack, partialTickTime */ - public void drawSelectionBox(EntityPlayer player, MovingObjectPosition movingObjectPositionIn, int partialTicks, + public void drawSelectionBox(EntityPlayer player, RayTraceResult movingObjectPositionIn, int partialTicks, float parFloat1) { if (partialTicks == 0 && movingObjectPositionIn != null - && movingObjectPositionIn.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + && movingObjectPositionIn.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0); GlStateManager.color(0.0F, 0.0F, 0.0F, 0.4F); diff --git a/src/main/java/net/minecraft/client/renderer/RenderHelper.java b/src/main/java/net/minecraft/client/renderer/RenderHelper.java index 7cd8213..287a5e8 100644 --- a/src/main/java/net/minecraft/client/renderer/RenderHelper.java +++ b/src/main/java/net/minecraft/client/renderer/RenderHelper.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -41,8 +41,8 @@ public class RenderHelper { * Float buffer used to set OpenGL material colors */ private static FloatBuffer colorBuffer = GLAllocation.createDirectFloatBuffer(16); - private static final Vec3 LIGHT0_POS = (new Vec3(0.20000000298023224D, 1.0D, -0.699999988079071D)).normalize(); - private static final Vec3 LIGHT1_POS = (new Vec3(-0.20000000298023224D, 1.0D, 0.699999988079071D)).normalize(); + private static final Vec3d LIGHT0_POS = (new Vec3d(0.20000000298023224D, 1.0D, -0.699999988079071D)).normalize(); + private static final Vec3d LIGHT1_POS = (new Vec3d(-0.20000000298023224D, 1.0D, 0.699999988079071D)).normalize(); /** * + diff --git a/src/main/java/net/minecraft/util/Vector3d.java b/src/main/java/net/minecraft/client/renderer/Vector3d.java similarity index 97% rename from src/main/java/net/minecraft/util/Vector3d.java rename to src/main/java/net/minecraft/client/renderer/Vector3d.java index b66831e..7056f96 100644 --- a/src/main/java/net/minecraft/util/Vector3d.java +++ b/src/main/java/net/minecraft/client/renderer/Vector3d.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.client.renderer; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/ViewFrustum.java b/src/main/java/net/minecraft/client/renderer/ViewFrustum.java index 2ad1000..4d023c6 100644 --- a/src/main/java/net/minecraft/client/renderer/ViewFrustum.java +++ b/src/main/java/net/minecraft/client/renderer/ViewFrustum.java @@ -2,8 +2,8 @@ package net.minecraft.client.renderer; import net.minecraft.client.renderer.chunk.IRenderChunkFactory; import net.minecraft.client.renderer.chunk.RenderChunk; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java b/src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java index 354d1e8..6ecd24b 100644 --- a/src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java +++ b/src/main/java/net/minecraft/client/renderer/block/model/BlockPart.java @@ -14,7 +14,7 @@ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java b/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java index ed4df0d..6e0763a 100644 --- a/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java +++ b/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java @@ -9,8 +9,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EnumFaceDirection; import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java b/src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java index b1da3a3..a37e5de 100644 --- a/src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java +++ b/src/main/java/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java b/src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java index abd9730..1d38ac8 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java @@ -1,7 +1,7 @@ package net.minecraft.client.renderer.chunk; import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java b/src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java index b8760fa..e20935b 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/ListChunkFactory.java @@ -1,7 +1,7 @@ package net.minecraft.client.renderer.chunk; import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java b/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java index cf92503..6e4e51a 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java @@ -3,8 +3,8 @@ package net.minecraft.client.renderer.chunk; import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java b/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java index 3f74bca..af9ff84 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java @@ -24,10 +24,10 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java index d0d4268..d955a66 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java @@ -7,9 +7,9 @@ import java.util.Set; import com.google.common.collect.Lists; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IntegerCache; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java b/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java index a08b02e..18ef222 100644 --- a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java +++ b/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java @@ -3,7 +3,7 @@ package net.minecraft.client.renderer.culling; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/culling/Frustum.java b/src/main/java/net/minecraft/client/renderer/culling/Frustum.java index 5117202..32fed2e 100644 --- a/src/main/java/net/minecraft/client/renderer/culling/Frustum.java +++ b/src/main/java/net/minecraft/client/renderer/culling/Frustum.java @@ -1,6 +1,6 @@ package net.minecraft.client.renderer.culling; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/culling/ICamera.java b/src/main/java/net/minecraft/client/renderer/culling/ICamera.java index 03096ee..404863f 100644 --- a/src/main/java/net/minecraft/client/renderer/culling/ICamera.java +++ b/src/main/java/net/minecraft/client/renderer/culling/ICamera.java @@ -1,6 +1,6 @@ package net.minecraft.client.renderer.culling; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java b/src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java index 5cfc5be..971e0e4 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/entity/ArmorStandRenderer.java @@ -7,8 +7,8 @@ import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.client.renderer.entity.layers.LayerCustomHead; import net.minecraft.client.renderer.entity.layers.LayerHeldItem; import net.minecraft.entity.item.EntityArmorStand; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + @@ -74,16 +74,14 @@ public class ArmorStandRenderer extends RendererLivingEntity { return (ModelArmorStand) super.getMainModel(); } - protected void rotateCorpse(EntityArmorStand entityLiving, float p_77043_2_, float p_77043_3_, float partialTicks) - { - GlStateManager.rotate(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F); - float f = (float)(entityLiving.worldObj.getTotalWorldTime() - entityLiving.punchCooldown) + partialTicks; + protected void rotateCorpse(EntityArmorStand entityLiving, float p_77043_2_, float p_77043_3_, float partialTicks) { + GlStateManager.rotate(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F); + float f = (float) (entityLiving.worldObj.getTotalWorldTime() - entityLiving.punchCooldown) + partialTicks; - if (f < 5.0F) - { - GlStateManager.rotate(MathHelper.sin(f / 1.5F * (float)Math.PI) * 3.0F, 0.0F, 1.0F, 0.0F); - } - } + if (f < 5.0F) { + GlStateManager.rotate(MathHelper.sin(f / 1.5F * (float) Math.PI) * 3.0F, 0.0F, 1.0F, 0.0F); + } + } protected boolean canRenderName(EntityArmorStand entityarmorstand) { return entityarmorstand.getAlwaysRenderNameTag(); diff --git a/src/main/java/net/minecraft/client/renderer/entity/Render.java b/src/main/java/net/minecraft/client/renderer/entity/Render.java index 4aa5001..d758e48 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/Render.java +++ b/src/main/java/net/minecraft/client/renderer/entity/Render.java @@ -22,10 +22,10 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java b/src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java index fb0c329..52674a1 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderArrow.java @@ -6,8 +6,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBat.java b/src/main/java/net/minecraft/client/renderer/entity/RenderBat.java index a0acfa8..810172b 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderBat.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderBat.java @@ -3,8 +3,8 @@ package net.minecraft.client.renderer.entity; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.model.ModelBat; import net.minecraft.entity.passive.EntityBat; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java b/src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java index 3ab7401..5e7f475 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderBoat.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBoat; import net.minecraft.entity.item.EntityBoat; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java b/src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java index aae6298..f2f03f0 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderChicken.java @@ -2,8 +2,8 @@ package net.minecraft.client.renderer.entity; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java b/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java index 90a9152..c35e019 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; import net.minecraft.client.model.ModelCreeper; import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java b/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java index 8d9d7aa..ecaba4c 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderDragon.java @@ -13,8 +13,8 @@ import net.minecraft.client.renderer.entity.layers.LayerEnderDragonEyes; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java index 9598e6e..fe70939 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java @@ -12,8 +12,8 @@ import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java b/src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java index af7f80c..ebcf0c3 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderFallingBlock.java @@ -14,8 +14,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.item.EntityFallingBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java b/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java index 83c99b6..7031fd9 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderFish.java @@ -6,9 +6,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.projectile.EntityFishHook; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -86,7 +86,7 @@ public class RenderFish extends Render { if (entityfishhook.angler != null) { float f9 = entityfishhook.angler.getSwingProgress(f1); float f10 = MathHelper.sin(MathHelper.sqrt_float(f9) * 3.1415927F); - Vec3 vec3 = new Vec3(-0.36D, 0.03D, 0.35D); + Vec3d vec3 = new Vec3d(-0.36D, 0.03D, 0.35D); vec3 = vec3.rotatePitch(-(entityfishhook.angler.prevRotationPitch + (entityfishhook.angler.rotationPitch - entityfishhook.angler.prevRotationPitch) * f1) * 3.1415927F / 180.0F); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java b/src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java index 5a4c90d..f477eba 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderGuardian.java @@ -12,9 +12,9 @@ import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityGuardian; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Vec3d; /** * + @@ -65,8 +65,8 @@ public class RenderGuardian extends RenderLiving { if (entityguardian.hasTargetedEntity()) { EntityLivingBase entitylivingbase = entityguardian.getTargetedEntity(); if (entitylivingbase != null) { - Vec3 vec3 = this.func_177110_a(entitylivingbase, (double) entitylivingbase.height * 0.5D, 1.0F); - Vec3 vec31 = this.func_177110_a(entityguardian, (double) entityguardian.getEyeHeight(), 1.0F); + Vec3d vec3 = this.func_177110_a(entitylivingbase, (double) entitylivingbase.height * 0.5D, 1.0F); + Vec3d vec31 = this.func_177110_a(entityguardian, (double) entityguardian.getEyeHeight(), 1.0F); if (icamera.isBoundingBoxInFrustum(AxisAlignedBB.fromBounds(vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord, vec3.zCoord))) { return true; @@ -78,14 +78,14 @@ public class RenderGuardian extends RenderLiving { } } - private Vec3 func_177110_a(EntityLivingBase entityLivingBaseIn, double parDouble1, float parFloat1) { + private Vec3d func_177110_a(EntityLivingBase entityLivingBaseIn, double parDouble1, float parFloat1) { double d0 = entityLivingBaseIn.lastTickPosX + (entityLivingBaseIn.posX - entityLivingBaseIn.lastTickPosX) * (double) parFloat1; double d1 = parDouble1 + entityLivingBaseIn.lastTickPosY + (entityLivingBaseIn.posY - entityLivingBaseIn.lastTickPosY) * (double) parFloat1; double d2 = entityLivingBaseIn.lastTickPosZ + (entityLivingBaseIn.posZ - entityLivingBaseIn.lastTickPosZ) * (double) parFloat1; - return new Vec3(d0, d1, d2); + return new Vec3d(d0, d1, d2); } /** @@ -125,9 +125,9 @@ public class RenderGuardian extends RenderLiving { float f6 = entityguardian.getEyeHeight(); GlStateManager.pushMatrix(); GlStateManager.translate((float) d0, (float) d1 + f6, (float) d2); - Vec3 vec3 = this.func_177110_a(entitylivingbase, (double) entitylivingbase.height * 0.5D, f1); - Vec3 vec31 = this.func_177110_a(entityguardian, (double) f6, f1); - Vec3 vec32 = vec3.subtract(vec31); + Vec3d vec3 = this.func_177110_a(entitylivingbase, (double) entitylivingbase.height * 0.5D, f1); + Vec3d vec31 = this.func_177110_a(entityguardian, (double) f6, f1); + Vec3d vec32 = vec3.subtract(vec31); double d3 = vec32.lengthVector() + 1.0D; vec32 = vec32.normalize(); float f7 = (float) Math.acos(vec32.yCoord); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java b/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java index 2fa30e1..1f083fc 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java @@ -70,10 +70,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java b/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java index e677084..5f6e43a 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java @@ -103,11 +103,11 @@ import net.minecraft.entity.projectile.EntitySnowball; import net.minecraft.entity.projectile.EntityWitherSkull; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ReportedException; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -502,7 +502,7 @@ public class RenderManager { Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - Vec3 vec3 = entityIn.getLook(parFloat2); + Vec3d vec3 = entityIn.getLook(parFloat2); worldrenderer.begin(3, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(parDouble1, parDouble2 + (double) entityIn.getEyeHeight(), parDouble3).color(0, 0, 255, 255) .endVertex(); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java b/src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java index 8c09027..be1238d 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderMinecart.java @@ -7,9 +7,9 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelMinecart; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -76,12 +76,12 @@ public class RenderMinecart extends Render { double d4 = entityminecart.lastTickPosY + (entityminecart.posY - entityminecart.lastTickPosY) * (double) f1; double d5 = entityminecart.lastTickPosZ + (entityminecart.posZ - entityminecart.lastTickPosZ) * (double) f1; double d6 = 0.30000001192092896D; - Vec3 vec3 = entityminecart.func_70489_a(d3, d4, d5); + Vec3d vec3 = entityminecart.func_70489_a(d3, d4, d5); float f5 = entityminecart.prevRotationPitch + (entityminecart.rotationPitch - entityminecart.prevRotationPitch) * f1; if (vec3 != null) { - Vec3 vec31 = entityminecart.func_70495_a(d3, d4, d5, d6); - Vec3 vec32 = entityminecart.func_70495_a(d3, d4, d5, -d6); + Vec3d vec31 = entityminecart.func_70495_a(d3, d4, d5, d6); + Vec3d vec32 = entityminecart.func_70495_a(d3, d4, d5, -d6); if (vec31 == null) { vec31 = vec3; } @@ -93,7 +93,7 @@ public class RenderMinecart extends Render { d0 += vec3.xCoord - d3; d1 += (vec31.yCoord + vec32.yCoord) / 2.0D - d4; d2 += vec3.zCoord - d5; - Vec3 vec33 = vec32.addVector(-vec31.xCoord, -vec31.yCoord, -vec31.zCoord); + Vec3d vec33 = vec32.addVector(-vec31.xCoord, -vec31.yCoord, -vec31.zCoord); if (vec33.lengthVector() != 0.0D) { vec33 = vec33.normalize(); f = (float) (Math.atan2(vec33.zCoord, vec33.xCoord) * 180.0D / 3.141592653589793D); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java b/src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java index 7e1e282..6823b18 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderPainting.java @@ -6,10 +6,10 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityPainting; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java b/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java index b74cd9b..da9ff06 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java @@ -20,9 +20,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -234,7 +234,7 @@ public class RenderPlayer extends RendererLivingEntity { float r = (float) abstractclientplayer.getTicksElytraFlying() + f2; float r1 = MathHelper.clamp_float(r * r / 100.0F, 0.0F, 1.0F); GlStateManager.rotate(r1 * (-90.0F - abstractclientplayer.rotationPitch), 1.0F, 0.0F, 0.0F); - Vec3 vec3d = abstractclientplayer.getLook(f2); + Vec3d vec3d = abstractclientplayer.getLook(f2); double d0 = abstractclientplayer.motionX * abstractclientplayer.motionX + abstractclientplayer.motionZ * abstractclientplayer.motionZ; double d1 = vec3d.xCoord * vec3d.xCoord + vec3d.zCoord * vec3d.zCoord; diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java b/src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java index 2a1de5a..d174411 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderTNTPrimed.java @@ -9,8 +9,8 @@ import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java b/src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java index 237f99c..d19b5ec 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderTntMinecart.java @@ -8,7 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.entity.item.EntityMinecartTNT; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java b/src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java index 91b1b85..22669fb 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderXPOrb.java @@ -6,8 +6,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java index 5850ae3..f38303e 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java @@ -36,9 +36,9 @@ import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Team; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java index 0e67789..ffdd2f2 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java @@ -8,7 +8,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java index 4263306..20bc5ae 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java @@ -6,7 +6,7 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerElytra.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerElytra.java index 3ba0d81..7be2061 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerElytra.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerElytra.java @@ -13,8 +13,8 @@ import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; public class LayerElytra implements LayerRenderer { private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("textures/entity/elytra.png"); diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java index 0114c76..4f99ddf 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java @@ -10,8 +10,8 @@ import net.minecraft.client.model.ModelWither; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java b/src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java index cc245f5..f71685a 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java +++ b/src/main/java/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java @@ -10,8 +10,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData; import net.minecraft.block.material.MapColor; import net.minecraft.client.resources.IResourceManager; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java b/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java index e8f0633..673cecf 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java +++ b/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java @@ -12,8 +12,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import net.minecraft.client.renderer.StitcherException; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureClock.java b/src/main/java/net/minecraft/client/renderer/texture/TextureClock.java index 0d0d681..d307d76 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/TextureClock.java +++ b/src/main/java/net/minecraft/client/renderer/texture/TextureClock.java @@ -3,7 +3,7 @@ package net.minecraft.client.renderer.texture; import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL; import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; import net.minecraft.client.Minecraft; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java b/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java index ddc1e0a..95493fe 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java +++ b/src/main/java/net/minecraft/client/renderer/texture/TextureCompass.java @@ -3,8 +3,8 @@ package net.minecraft.client.renderer.texture; import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL; import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; import net.minecraft.client.Minecraft; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java index d48901a..95fb516 100644 --- a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java +++ b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java @@ -32,9 +32,9 @@ import net.minecraft.client.resources.data.AnimationMetadataSection; import net.minecraft.client.resources.data.TextureMetadataSection; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*; diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java b/src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java index 6c23b51..ae8ba83 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java @@ -7,9 +7,9 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderDragon; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityEnderCrystal; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java b/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java index 3f21f53..ddc9a5d 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java @@ -27,8 +27,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemSkull; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.storage.MapData; /** diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java index a28b447..00fb726 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java @@ -14,9 +14,9 @@ import net.minecraft.client.model.ModelBanner; import net.minecraft.client.renderer.texture.LayeredColorMaskTexture; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntityBanner; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java index 023d4ad..5f79aca 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java @@ -14,8 +14,8 @@ import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntityBeacon; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java index 481fe51..7af2e8e 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.model.ModelBook; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntityEnchantmentTable; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java index 05d5ec3..c3c1aef 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java @@ -19,7 +19,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntityPiston; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java index 471a4cc..e2d4b71 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java @@ -24,8 +24,8 @@ import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.tileentity.TileEntityPiston; import net.minecraft.tileentity.TileEntitySign; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.BlockPos; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java index 8e1f36b..cc87763 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java @@ -17,8 +17,8 @@ import net.minecraft.client.gui.GuiUtilRenderComponents; import net.minecraft.client.model.ModelSign; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -118,9 +118,9 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer 0 ? ((IChatComponent) list.get(0)).getFormattedText() : ""; + String s = list != null && list.size() > 0 ? ((ITextComponent) list.get(0)).getFormattedText() : ""; if (j == tileentitysign.lineBeingEdited) { s = "> " + s + " <"; fontrenderer.drawString(s, -fontrenderer.getStringWidth(s) / 2, diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java b/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java index 974aa87..21fa4c0 100644 --- a/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java +++ b/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java @@ -12,9 +12,9 @@ import net.minecraft.client.gui.GuiListExtended; import net.minecraft.client.gui.GuiScreenResourcePacks; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -48,11 +48,11 @@ import net.minecraft.util.ResourceLocation; public abstract class ResourcePackListEntry implements GuiListExtended.IGuiListEntry { private static final ResourceLocation RESOURCE_PACKS_TEXTURE = new ResourceLocation( "textures/gui/resource_packs.png"); - private static final IChatComponent field_183020_d = new ChatComponentTranslation("resourcePack.incompatible", + private static final ITextComponent field_183020_d = new TextComponentTranslation("resourcePack.incompatible", new Object[0]); - private static final IChatComponent field_183021_e = new ChatComponentTranslation("resourcePack.incompatible.old", + private static final ITextComponent field_183021_e = new TextComponentTranslation("resourcePack.incompatible.old", new Object[0]); - private static final IChatComponent field_183022_f = new ChatComponentTranslation("resourcePack.incompatible.new", + private static final ITextComponent field_183022_f = new TextComponentTranslation("resourcePack.incompatible.new", new Object[0]); protected final Minecraft mc; protected final GuiScreenResourcePacks resourcePacksGUI; diff --git a/src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java b/src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java index 544d3a6..53df88a 100644 --- a/src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java +++ b/src/main/java/net/minecraft/client/resources/data/IMetadataSerializer.java @@ -3,8 +3,8 @@ package net.minecraft.client.resources.data; import org.json.JSONObject; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -import net.minecraft.util.IRegistry; -import net.minecraft.util.RegistrySimple; +import net.minecraft.util.registry.IRegistry; +import net.minecraft.util.registry.RegistrySimple; /** * + diff --git a/src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java b/src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java index b92c91b..dba1301 100644 --- a/src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java +++ b/src/main/java/net/minecraft/client/resources/data/PackMetadataSection.java @@ -1,6 +1,6 @@ package net.minecraft.client.resources.data; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -32,15 +32,15 @@ import net.minecraft.util.IChatComponent; * */ public class PackMetadataSection implements IMetadataSection { - private final IChatComponent packDescription; + private final ITextComponent packDescription; private final int packFormat; - public PackMetadataSection(IChatComponent parIChatComponent, int parInt1) { + public PackMetadataSection(ITextComponent parIChatComponent, int parInt1) { this.packDescription = parIChatComponent; this.packFormat = parInt1; } - public IChatComponent getPackDescription() { + public ITextComponent getPackDescription() { return this.packDescription; } diff --git a/src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java b/src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java index 86c359f..582a51f 100644 --- a/src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java +++ b/src/main/java/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java @@ -4,8 +4,8 @@ import org.json.JSONException; import org.json.JSONObject; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeSerializer; +import net.minecraft.util.text.ITextComponent; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -import net.minecraft.util.IChatComponent; /** * + @@ -39,8 +39,8 @@ import net.minecraft.util.IChatComponent; public class PackMetadataSectionSerializer extends BaseMetadataSectionSerializer implements JSONTypeSerializer { public PackMetadataSection deserialize(JSONObject jsonobject) throws JSONException { - IChatComponent ichatcomponent = JSONTypeProvider.deserialize(jsonobject.get("description"), - IChatComponent.class); + ITextComponent ichatcomponent = JSONTypeProvider.deserialize(jsonobject.get("description"), + ITextComponent.class); if (ichatcomponent == null) { throw new JSONException("Invalid/missing description!"); } else { diff --git a/src/main/java/net/minecraft/client/resources/model/ModelBakery.java b/src/main/java/net/minecraft/client/resources/model/ModelBakery.java index f53bfca..ccfd564 100644 --- a/src/main/java/net/minecraft/client/resources/model/ModelBakery.java +++ b/src/main/java/net/minecraft/client/resources/model/ModelBakery.java @@ -44,10 +44,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IRegistry; -import net.minecraft.util.RegistrySimple; import net.minecraft.util.ResourceLocation; - +import net.minecraft.util.registry.IRegistry; +import net.minecraft.util.registry.RegistrySimple; import net.minecraft.block.BlockSlab; import net.hoosiertransfer.EaglerItems; diff --git a/src/main/java/net/minecraft/client/resources/model/ModelManager.java b/src/main/java/net/minecraft/client/resources/model/ModelManager.java index 04de56f..c8d7b5a 100644 --- a/src/main/java/net/minecraft/client/resources/model/ModelManager.java +++ b/src/main/java/net/minecraft/client/resources/model/ModelManager.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.BlockModelShapes; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.util.IRegistry; +import net.minecraft.util.registry.IRegistry; /** * + diff --git a/src/main/java/net/minecraft/client/resources/model/ModelRotation.java b/src/main/java/net/minecraft/client/resources/model/ModelRotation.java index 0443a47..dfa31bf 100644 --- a/src/main/java/net/minecraft/client/resources/model/ModelRotation.java +++ b/src/main/java/net/minecraft/client/resources/model/ModelRotation.java @@ -7,7 +7,7 @@ import com.google.common.collect.Maps; import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; import net.lax1dude.eaglercraft.v1_8.vector.Vector3f; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/client/settings/GameSettings.java b/src/main/java/net/minecraft/client/settings/GameSettings.java index 8429fb4..7c59cb4 100644 --- a/src/main/java/net/minecraft/client/settings/GameSettings.java +++ b/src/main/java/net/minecraft/client/settings/GameSettings.java @@ -39,7 +39,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.network.play.client.C15PacketClientSettings; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumDifficulty; /** diff --git a/src/main/java/net/minecraft/command/CommandBase.java b/src/main/java/net/minecraft/command/CommandBase.java index a085ee8..42c3601 100644 --- a/src/main/java/net/minecraft/command/CommandBase.java +++ b/src/main/java/net/minecraft/command/CommandBase.java @@ -16,10 +16,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -293,23 +293,23 @@ public abstract class CommandBase implements ICommand { } } - public static IChatComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int parInt1) + public static ITextComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int parInt1) throws PlayerNotFoundException { return getChatComponentFromNthArg(sender, args, parInt1, false); } - public static IChatComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int index, + public static ITextComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int index, boolean parFlag) throws PlayerNotFoundException { - ChatComponentText chatcomponenttext = new ChatComponentText(""); + TextComponentString chatcomponenttext = new TextComponentString(""); for (int i = index; i < args.length; ++i) { if (i > index) { chatcomponenttext.appendText(" "); } - Object object = new ChatComponentText(args[i]); + Object object = new TextComponentString(args[i]); if (parFlag) { - IChatComponent ichatcomponent = PlayerSelector.matchEntitiesToChatComponent(sender, args[i]); + ITextComponent ichatcomponent = PlayerSelector.matchEntitiesToChatComponent(sender, args[i]); if (ichatcomponent == null) { if (PlayerSelector.hasArguments(args[i])) { throw new PlayerNotFoundException(); @@ -319,7 +319,7 @@ public abstract class CommandBase implements ICommand { } } - chatcomponenttext.appendSibling((IChatComponent) object); + chatcomponenttext.appendSibling((ITextComponent) object); } return chatcomponenttext; @@ -489,8 +489,8 @@ public abstract class CommandBase implements ICommand { return stringbuilder.toString(); } - public static IChatComponent join(List components) { - ChatComponentText chatcomponenttext = new ChatComponentText(""); + public static ITextComponent join(List components) { + TextComponentString chatcomponenttext = new TextComponentString(""); for (int i = 0; i < components.size(); ++i) { if (i > 0) { @@ -501,7 +501,7 @@ public abstract class CommandBase implements ICommand { } } - chatcomponenttext.appendSibling((IChatComponent) components.get(i)); + chatcomponenttext.appendSibling((ITextComponent) components.get(i)); } return chatcomponenttext; diff --git a/src/main/java/net/minecraft/command/CommandBlockData.java b/src/main/java/net/minecraft/command/CommandBlockData.java index 7c46be7..a2dcc08 100644 --- a/src/main/java/net/minecraft/command/CommandBlockData.java +++ b/src/main/java/net/minecraft/command/CommandBlockData.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/command/CommandClearInventory.java b/src/main/java/net/minecraft/command/CommandClearInventory.java index 2df5896..6477ef0 100644 --- a/src/main/java/net/minecraft/command/CommandClearInventory.java +++ b/src/main/java/net/minecraft/command/CommandClearInventory.java @@ -7,8 +7,8 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -98,7 +98,7 @@ public class CommandClearInventory extends CommandBase { throw new CommandException("commands.clear.failure", new Object[] { entityplayermp.getName() }); } else { if (j == 0) { - parICommandSender.addChatMessage(new ChatComponentTranslation("commands.clear.testing", + parICommandSender.addChatMessage(new TextComponentTranslation("commands.clear.testing", new Object[] { entityplayermp.getName(), Integer.valueOf(k) })); } else { notifyOperators(parICommandSender, this, "commands.clear.success", diff --git a/src/main/java/net/minecraft/command/CommandClone.java b/src/main/java/net/minecraft/command/CommandClone.java index 92b61ff..c99168a 100644 --- a/src/main/java/net/minecraft/command/CommandClone.java +++ b/src/main/java/net/minecraft/command/CommandClone.java @@ -10,7 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.NextTickListEntry; import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; diff --git a/src/main/java/net/minecraft/command/CommandCompare.java b/src/main/java/net/minecraft/command/CommandCompare.java index 02d576e..fd916e5 100644 --- a/src/main/java/net/minecraft/command/CommandCompare.java +++ b/src/main/java/net/minecraft/command/CommandCompare.java @@ -5,7 +5,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; diff --git a/src/main/java/net/minecraft/command/CommandDefaultGameMode.java b/src/main/java/net/minecraft/command/CommandDefaultGameMode.java index 96a2871..58a97dd 100644 --- a/src/main/java/net/minecraft/command/CommandDefaultGameMode.java +++ b/src/main/java/net/minecraft/command/CommandDefaultGameMode.java @@ -4,7 +4,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.WorldSettings; /** @@ -66,7 +66,7 @@ public class CommandDefaultGameMode extends CommandGameMode { parArrayOfString[0]); this.setGameType(worldsettings$gametype); notifyOperators(parICommandSender, this, "commands.defaultgamemode.success", new Object[] { - new ChatComponentTranslation("gameMode." + worldsettings$gametype.getName(), new Object[0]) }); + new TextComponentTranslation("gameMode." + worldsettings$gametype.getName(), new Object[0]) }); } } diff --git a/src/main/java/net/minecraft/command/CommandDifficulty.java b/src/main/java/net/minecraft/command/CommandDifficulty.java index b0d2f75..13bd147 100644 --- a/src/main/java/net/minecraft/command/CommandDifficulty.java +++ b/src/main/java/net/minecraft/command/CommandDifficulty.java @@ -2,8 +2,8 @@ package net.minecraft.command; import java.util.List; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.EnumDifficulty; /** @@ -72,7 +72,7 @@ public class CommandDifficulty extends CommandBase { EnumDifficulty enumdifficulty = this.getDifficultyFromCommand(parArrayOfString[0]); MinecraftServer.getServer().setDifficultyForAllWorlds(enumdifficulty); notifyOperators(parICommandSender, this, "commands.difficulty.success", new Object[] { - new ChatComponentTranslation(enumdifficulty.getDifficultyResourceKey(), new Object[0]) }); + new TextComponentTranslation(enumdifficulty.getDifficultyResourceKey(), new Object[0]) }); } } diff --git a/src/main/java/net/minecraft/command/CommandEffect.java b/src/main/java/net/minecraft/command/CommandEffect.java index b737c99..4608e75 100644 --- a/src/main/java/net/minecraft/command/CommandEffect.java +++ b/src/main/java/net/minecraft/command/CommandEffect.java @@ -5,8 +5,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -125,17 +125,17 @@ public class CommandEffect extends CommandBase { entitylivingbase.addPotionEffect(potioneffect); notifyOperators(parICommandSender, this, "commands.effect.success", new Object[] { - new ChatComponentTranslation(potioneffect.getEffectName(), new Object[0]), + new TextComponentTranslation(potioneffect.getEffectName(), new Object[0]), Integer.valueOf(i), Integer.valueOf(k), entitylivingbase.getName(), Integer.valueOf(l) }); } else if (entitylivingbase.isPotionActive(i)) { entitylivingbase.removePotionEffect(i); notifyOperators(parICommandSender, this, "commands.effect.success.removed", - new Object[] { new ChatComponentTranslation(potion1.getName(), new Object[0]), + new Object[] { new TextComponentTranslation(potion1.getName(), new Object[0]), entitylivingbase.getName() }); } else { throw new CommandException("commands.effect.failure.notActive", - new Object[] { new ChatComponentTranslation(potion1.getName(), new Object[0]), + new Object[] { new TextComponentTranslation(potion1.getName(), new Object[0]), entitylivingbase.getName() }); } } else { diff --git a/src/main/java/net/minecraft/command/CommandEnchant.java b/src/main/java/net/minecraft/command/CommandEnchant.java index b16579d..97b130a 100644 --- a/src/main/java/net/minecraft/command/CommandEnchant.java +++ b/src/main/java/net/minecraft/command/CommandEnchant.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandExecuteAt.java b/src/main/java/net/minecraft/command/CommandExecuteAt.java index 33df47d..0f46902 100644 --- a/src/main/java/net/minecraft/command/CommandExecuteAt.java +++ b/src/main/java/net/minecraft/command/CommandExecuteAt.java @@ -5,9 +5,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -103,11 +103,11 @@ public class CommandExecuteAt extends CommandBase { return entity.getName(); } - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return entity.getDisplayName(); } - public void addChatMessage(IChatComponent component) { + public void addChatMessage(ITextComponent component) { parICommandSender.addChatMessage(component); } @@ -119,8 +119,8 @@ public class CommandExecuteAt extends CommandBase { return blockpos; } - public Vec3 getPositionVector() { - return new Vec3(d0, d1, d2); + public Vec3d getPositionVector() { + return new Vec3d(d0, d1, d2); } public World getEntityWorld() { diff --git a/src/main/java/net/minecraft/command/CommandFill.java b/src/main/java/net/minecraft/command/CommandFill.java index 31d6de7..85a15d6 100644 --- a/src/main/java/net/minecraft/command/CommandFill.java +++ b/src/main/java/net/minecraft/command/CommandFill.java @@ -11,7 +11,7 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/command/CommandGameMode.java b/src/main/java/net/minecraft/command/CommandGameMode.java index cb45dcb..ff92314 100644 --- a/src/main/java/net/minecraft/command/CommandGameMode.java +++ b/src/main/java/net/minecraft/command/CommandGameMode.java @@ -3,8 +3,8 @@ package net.minecraft.command; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.WorldSettings; /** @@ -78,10 +78,10 @@ public class CommandGameMode extends CommandBase { entityplayermp.setGameType(worldsettings$gametype); entityplayermp.fallDistance = 0.0F; if (parICommandSender.getEntityWorld().getGameRules().getBoolean("sendCommandFeedback")) { - entityplayermp.addChatMessage(new ChatComponentTranslation("gameMode.changed", new Object[0])); + entityplayermp.addChatMessage(new TextComponentTranslation("gameMode.changed", new Object[0])); } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "gameMode." + worldsettings$gametype.getName(), new Object[0]); if (entityplayermp != parICommandSender) { notifyOperators(parICommandSender, this, 1, "commands.gamemode.success.other", diff --git a/src/main/java/net/minecraft/command/CommandGameRule.java b/src/main/java/net/minecraft/command/CommandGameRule.java index 1b8f094..9ce0c81 100644 --- a/src/main/java/net/minecraft/command/CommandGameRule.java +++ b/src/main/java/net/minecraft/command/CommandGameRule.java @@ -4,8 +4,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.S19PacketEntityStatus; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.GameRules; /** @@ -73,7 +73,7 @@ public class CommandGameRule extends CommandBase { String s1 = parArrayOfString.length > 1 ? buildString(parArrayOfString, 1) : ""; switch (parArrayOfString.length) { case 0: - parICommandSender.addChatMessage(new ChatComponentText(joinNiceString(gamerules.getRules()))); + parICommandSender.addChatMessage(new TextComponentString(joinNiceString(gamerules.getRules()))); break; case 1: if (!gamerules.hasRule(s)) { @@ -81,7 +81,7 @@ public class CommandGameRule extends CommandBase { } String s2 = gamerules.getString(s); - parICommandSender.addChatMessage((new ChatComponentText(s)).appendText(" = ").appendText(s2)); + parICommandSender.addChatMessage((new TextComponentString(s)).appendText(" = ").appendText(s2)); parICommandSender.setCommandStat(CommandResultStats.Type.QUERY_RESULT, gamerules.getInt(s)); break; default: diff --git a/src/main/java/net/minecraft/command/CommandGive.java b/src/main/java/net/minecraft/command/CommandGive.java index 78d63e8..1dfcda4 100644 --- a/src/main/java/net/minecraft/command/CommandGive.java +++ b/src/main/java/net/minecraft/command/CommandGive.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandHandler.java b/src/main/java/net/minecraft/command/CommandHandler.java index e0de8d9..ca0691e 100644 --- a/src/main/java/net/minecraft/command/CommandHandler.java +++ b/src/main/java/net/minecraft/command/CommandHandler.java @@ -9,9 +9,9 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; @@ -67,7 +67,7 @@ public class CommandHandler implements ICommandManager { int i = this.getUsernameIndex(icommand, astring); int j = 0; if (icommand == null) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.generic.notFound", new Object[0]); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(chatcomponenttranslation); @@ -92,7 +92,7 @@ public class CommandHandler implements ICommandManager { } } } else { - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation( "commands.generic.permission", new Object[0]); chatcomponenttranslation1.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(chatcomponenttranslation1); @@ -107,18 +107,18 @@ public class CommandHandler implements ICommandManager { command.processCommand(sender, args); return true; } catch (WrongUsageException wrongusageexception) { - ChatComponentTranslation chatcomponenttranslation2 = new ChatComponentTranslation("commands.generic.usage", - new Object[] { new ChatComponentTranslation(wrongusageexception.getMessage(), + TextComponentTranslation chatcomponenttranslation2 = new TextComponentTranslation("commands.generic.usage", + new Object[] { new TextComponentTranslation(wrongusageexception.getMessage(), wrongusageexception.getErrorObjects()) }); chatcomponenttranslation2.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(chatcomponenttranslation2); } catch (CommandException commandexception) { - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation( commandexception.getMessage(), commandexception.getErrorObjects()); chatcomponenttranslation1.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(chatcomponenttranslation1); } catch (Throwable var9) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.generic.exception", new Object[0]); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); sender.addChatMessage(chatcomponenttranslation); diff --git a/src/main/java/net/minecraft/command/CommandHelp.java b/src/main/java/net/minecraft/command/CommandHelp.java index d788145..f3b73e0 100644 --- a/src/main/java/net/minecraft/command/CommandHelp.java +++ b/src/main/java/net/minecraft/command/CommandHelp.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.event.ClickEvent; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.event.ClickEvent; /** * + @@ -103,14 +103,14 @@ public class CommandHelp extends CommandBase { } int k = Math.min((j + 1) * 7, list.size()); - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation("commands.help.header", + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation("commands.help.header", new Object[] { Integer.valueOf(j + 1), Integer.valueOf(i + 1) }); chatcomponenttranslation1.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation1); for (int l = j * 7; l < k; ++l) { ICommand icommand1 = (ICommand) list.get(l); - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( icommand1.getCommandUsage(parICommandSender), new Object[0]); chatcomponenttranslation.getChatStyle().setChatClickEvent( new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + icommand1.getCommandName() + " ")); @@ -118,7 +118,7 @@ public class CommandHelp extends CommandBase { } if (j == 0 && parICommandSender instanceof EntityPlayer) { - ChatComponentTranslation chatcomponenttranslation2 = new ChatComponentTranslation("commands.help.footer", + TextComponentTranslation chatcomponenttranslation2 = new TextComponentTranslation("commands.help.footer", new Object[0]); chatcomponenttranslation2.getChatStyle().setColor(EnumChatFormatting.GREEN); parICommandSender.addChatMessage(chatcomponenttranslation2); diff --git a/src/main/java/net/minecraft/command/CommandKill.java b/src/main/java/net/minecraft/command/CommandKill.java index ffbbd17..99ce332 100644 --- a/src/main/java/net/minecraft/command/CommandKill.java +++ b/src/main/java/net/minecraft/command/CommandKill.java @@ -4,7 +4,7 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandParticle.java b/src/main/java/net/minecraft/command/CommandParticle.java index 999cde4..faa4e74 100644 --- a/src/main/java/net/minecraft/command/CommandParticle.java +++ b/src/main/java/net/minecraft/command/CommandParticle.java @@ -1,9 +1,10 @@ package net.minecraft.command; import java.util.List; -import net.minecraft.util.BlockPos; + import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -93,7 +94,7 @@ public class CommandParticle extends CommandBase { throw new CommandException("commands.particle.notFound", new Object[] { parArrayOfString[0] }); } else { String s = parArrayOfString[0]; - Vec3 vec3 = parICommandSender.getPositionVector(); + Vec3d vec3 = parICommandSender.getPositionVector(); double d6 = (double) ((float) parseDouble(vec3.xCoord, parArrayOfString[1], true)); double d0 = (double) ((float) parseDouble(vec3.yCoord, parArrayOfString[2], true)); double d1 = (double) ((float) parseDouble(vec3.zCoord, parArrayOfString[3], true)); diff --git a/src/main/java/net/minecraft/command/CommandPlaySound.java b/src/main/java/net/minecraft/command/CommandPlaySound.java index 9993a0e..fe2288a 100644 --- a/src/main/java/net/minecraft/command/CommandPlaySound.java +++ b/src/main/java/net/minecraft/command/CommandPlaySound.java @@ -4,8 +4,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.S29PacketSoundEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; /** * + @@ -73,7 +73,7 @@ public class CommandPlaySound extends CommandBase { int i = 0; String s = parArrayOfString[i++]; EntityPlayerMP entityplayermp = getPlayer(parICommandSender, parArrayOfString[i++]); - Vec3 vec3 = parICommandSender.getPositionVector(); + Vec3d vec3 = parICommandSender.getPositionVector(); double d0 = vec3.xCoord; if (parArrayOfString.length > i) { d0 = parseDouble(d0, parArrayOfString[i++], true); diff --git a/src/main/java/net/minecraft/command/CommandReplaceItem.java b/src/main/java/net/minecraft/command/CommandReplaceItem.java index 26a50a1..c34f845 100644 --- a/src/main/java/net/minecraft/command/CommandReplaceItem.java +++ b/src/main/java/net/minecraft/command/CommandReplaceItem.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/command/CommandResultStats.java b/src/main/java/net/minecraft/command/CommandResultStats.java index 59f33b7..1936b4e 100644 --- a/src/main/java/net/minecraft/command/CommandResultStats.java +++ b/src/main/java/net/minecraft/command/CommandResultStats.java @@ -5,9 +5,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -63,11 +63,11 @@ public class CommandResultStats { return sender.getName(); } - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return sender.getDisplayName(); } - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { sender.addChatMessage(ichatcomponent); } @@ -79,7 +79,7 @@ public class CommandResultStats { return sender.getPosition(); } - public Vec3 getPositionVector() { + public Vec3d getPositionVector() { return sender.getPositionVector(); } diff --git a/src/main/java/net/minecraft/command/CommandServerKick.java b/src/main/java/net/minecraft/command/CommandServerKick.java index 705471a..f6b7a39 100644 --- a/src/main/java/net/minecraft/command/CommandServerKick.java +++ b/src/main/java/net/minecraft/command/CommandServerKick.java @@ -3,8 +3,8 @@ package net.minecraft.command; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java b/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java index c428c4e..47b9bba 100644 --- a/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java +++ b/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java @@ -3,7 +3,7 @@ package net.minecraft.command; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandShowSeed.java b/src/main/java/net/minecraft/command/CommandShowSeed.java index 7b8aba2..a455d8f 100644 --- a/src/main/java/net/minecraft/command/CommandShowSeed.java +++ b/src/main/java/net/minecraft/command/CommandShowSeed.java @@ -2,7 +2,7 @@ package net.minecraft.command; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; /** @@ -76,7 +76,7 @@ public class CommandShowSeed extends CommandBase { public void processCommand(ICommandSender parICommandSender, String[] parArrayOfString) throws CommandException { Object object = parICommandSender instanceof EntityPlayer ? ((EntityPlayer) parICommandSender).worldObj : MinecraftServer.getServer().worldServerForDimension(0); - parICommandSender.addChatMessage(new ChatComponentTranslation("commands.seed.success", + parICommandSender.addChatMessage(new TextComponentTranslation("commands.seed.success", new Object[] { Long.valueOf(((World) object).getSeed()) })); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/command/CommandSpreadPlayers.java b/src/main/java/net/minecraft/command/CommandSpreadPlayers.java index cab28af..ca89e55 100644 --- a/src/main/java/net/minecraft/command/CommandSpreadPlayers.java +++ b/src/main/java/net/minecraft/command/CommandSpreadPlayers.java @@ -16,9 +16,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; /** @@ -118,7 +118,7 @@ public class CommandSpreadPlayers extends CommandBase { throw new EntityNotFoundException(); } else { parICommandSender.addChatMessage( - new ChatComponentTranslation("commands.spreadplayers.spreading." + (flag ? "teams" : "players"), + new TextComponentTranslation("commands.spreadplayers.spreading." + (flag ? "teams" : "players"), new Object[] { Integer.valueOf(arraylist.size()), Double.valueOf(d3), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) })); this.func_110669_a(parICommandSender, arraylist, new CommandSpreadPlayers.Position(d0, d1), d2, d3, @@ -143,7 +143,7 @@ public class CommandSpreadPlayers extends CommandBase { new Object[] { Integer.valueOf(acommandspreadplayers$position.length), Double.valueOf(parPosition.field_111101_a), Double.valueOf(parPosition.field_111100_b) }); if (acommandspreadplayers$position.length > 1) { - worldIn.addChatMessage(new ChatComponentTranslation( + worldIn.addChatMessage(new TextComponentTranslation( "commands.spreadplayers.info." + (parFlag ? "teams" : "players"), new Object[] { HString.format("%.2f", new Object[] { Double.valueOf(d4) }), Integer.valueOf(i) })); } diff --git a/src/main/java/net/minecraft/command/CommandStats.java b/src/main/java/net/minecraft/command/CommandStats.java index dd68161..42c5ada 100644 --- a/src/main/java/net/minecraft/command/CommandStats.java +++ b/src/main/java/net/minecraft/command/CommandStats.java @@ -10,7 +10,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/command/CommandTime.java b/src/main/java/net/minecraft/command/CommandTime.java index 5f51935..865c4e1 100644 --- a/src/main/java/net/minecraft/command/CommandTime.java +++ b/src/main/java/net/minecraft/command/CommandTime.java @@ -2,7 +2,7 @@ package net.minecraft.command; import java.util.List; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; /** diff --git a/src/main/java/net/minecraft/command/CommandTitle.java b/src/main/java/net/minecraft/command/CommandTitle.java index a763fde..cf26a9d 100644 --- a/src/main/java/net/minecraft/command/CommandTitle.java +++ b/src/main/java/net/minecraft/command/CommandTitle.java @@ -7,9 +7,9 @@ import org.json.JSONException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.S45PacketTitle; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentProcessor; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentUtils; +import net.minecraft.util.text.ITextComponent; import net.lax1dude.eaglercraft.v1_8.ExceptionUtils; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; @@ -108,9 +108,9 @@ public class CommandTitle extends CommandBase { } else { String s = buildString(parArrayOfString, 2); - IChatComponent ichatcomponent; + ITextComponent ichatcomponent; try { - ichatcomponent = IChatComponent.Serializer.jsonToComponent(s); + ichatcomponent = ITextComponent.Serializer.jsonToComponent(s); } catch (JSONException jsonparseexception) { Throwable throwable = ExceptionUtils.getRootCause(jsonparseexception); throw new SyntaxErrorException("commands.tellraw.jsonException", @@ -118,14 +118,14 @@ public class CommandTitle extends CommandBase { } S45PacketTitle s45packettitle1 = new S45PacketTitle(s45packettitle$type, - ChatComponentProcessor.processComponent(parICommandSender, ichatcomponent, entityplayermp)); + TextComponentUtils.processComponent(parICommandSender, ichatcomponent, entityplayermp)); entityplayermp.playerNetServerHandler.sendPacket(s45packettitle1); notifyOperators(parICommandSender, this, "commands.title.success", new Object[0]); } } else if (parArrayOfString.length != 2) { throw new WrongUsageException("commands.title.usage", new Object[0]); } else { - S45PacketTitle s45packettitle = new S45PacketTitle(s45packettitle$type, (IChatComponent) null); + S45PacketTitle s45packettitle = new S45PacketTitle(s45packettitle$type, (ITextComponent) null); entityplayermp.playerNetServerHandler.sendPacket(s45packettitle); notifyOperators(parICommandSender, this, "commands.title.success", new Object[0]); } diff --git a/src/main/java/net/minecraft/command/CommandTrigger.java b/src/main/java/net/minecraft/command/CommandTrigger.java index 65cbb14..638ccdd 100644 --- a/src/main/java/net/minecraft/command/CommandTrigger.java +++ b/src/main/java/net/minecraft/command/CommandTrigger.java @@ -10,7 +10,7 @@ import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/CommandWeather.java b/src/main/java/net/minecraft/command/CommandWeather.java index 616664a..42dbc03 100644 --- a/src/main/java/net/minecraft/command/CommandWeather.java +++ b/src/main/java/net/minecraft/command/CommandWeather.java @@ -4,7 +4,7 @@ import java.util.List; import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.WorldInfo; diff --git a/src/main/java/net/minecraft/command/CommandWorldBorder.java b/src/main/java/net/minecraft/command/CommandWorldBorder.java index 7f3f5b8..8b13527 100644 --- a/src/main/java/net/minecraft/command/CommandWorldBorder.java +++ b/src/main/java/net/minecraft/command/CommandWorldBorder.java @@ -4,9 +4,9 @@ import java.util.List; import net.lax1dude.eaglercraft.v1_8.HString; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.border.WorldBorder; /** @@ -202,7 +202,7 @@ public class CommandWorldBorder extends CommandBase { double d7 = worldborder.getDiameter(); parICommandSender.setCommandStat(CommandResultStats.Type.QUERY_RESULT, MathHelper.floor_double(d7 + 0.5D)); - parICommandSender.addChatMessage(new ChatComponentTranslation("commands.worldborder.get.success", + parICommandSender.addChatMessage(new TextComponentTranslation("commands.worldborder.get.success", new Object[] { HString.format("%.0f", new Object[] { Double.valueOf(d7) }) })); } diff --git a/src/main/java/net/minecraft/command/CommandXP.java b/src/main/java/net/minecraft/command/CommandXP.java index acf3302..9802ac9 100644 --- a/src/main/java/net/minecraft/command/CommandXP.java +++ b/src/main/java/net/minecraft/command/CommandXP.java @@ -3,7 +3,7 @@ package net.minecraft.command; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/ICommand.java b/src/main/java/net/minecraft/command/ICommand.java index 0d37338..e13c4a6 100644 --- a/src/main/java/net/minecraft/command/ICommand.java +++ b/src/main/java/net/minecraft/command/ICommand.java @@ -1,7 +1,8 @@ package net.minecraft.command; import java.util.List; -import net.minecraft.util.BlockPos; + +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/ICommandManager.java b/src/main/java/net/minecraft/command/ICommandManager.java index b0b50d2..a6707bb 100644 --- a/src/main/java/net/minecraft/command/ICommandManager.java +++ b/src/main/java/net/minecraft/command/ICommandManager.java @@ -2,7 +2,8 @@ package net.minecraft.command; import java.util.List; import java.util.Map; -import net.minecraft.util.BlockPos; + +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/ICommandSender.java b/src/main/java/net/minecraft/command/ICommandSender.java index b911ada..bfd5f7c 100644 --- a/src/main/java/net/minecraft/command/ICommandSender.java +++ b/src/main/java/net/minecraft/command/ICommandSender.java @@ -1,9 +1,9 @@ package net.minecraft.command; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -48,13 +48,13 @@ public interface ICommandSender { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - IChatComponent getDisplayName(); + ITextComponent getDisplayName(); /** * + * Send a chat message to the CommandSender */ - void addChatMessage(IChatComponent var1); + void addChatMessage(ITextComponent var1); /** * + @@ -77,7 +77,7 @@ public interface ICommandSender { * If you are not an entity in the world, return 0.0D, 0.0D, * 0.0D */ - Vec3 getPositionVector(); + Vec3d getPositionVector(); /** * + diff --git a/src/main/java/net/minecraft/command/PlayerSelector.java b/src/main/java/net/minecraft/command/PlayerSelector.java index a6f2a86..526d2d2 100644 --- a/src/main/java/net/minecraft/command/PlayerSelector.java +++ b/src/main/java/net/minecraft/command/PlayerSelector.java @@ -26,13 +26,13 @@ import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraft.world.WorldSettings; @@ -107,7 +107,7 @@ public class PlayerSelector { return (T) (list.size() == 1 ? (Entity) list.get(0) : null); } - public static IChatComponent matchEntitiesToChatComponent(ICommandSender sender, String token) { + public static ITextComponent matchEntitiesToChatComponent(ICommandSender sender, String token) { List list = matchEntities(sender, token, Entity.class); if (list.isEmpty()) { return null; @@ -181,7 +181,7 @@ public class PlayerSelector { String s = func_179651_b(params, "type"); s = s != null && s.startsWith("!") ? s.substring(1) : s; if (s != null && !EntityList.isStringValidEntityName(s)) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.generic.entity.invalidType", new Object[] { s }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); commandSender.addChatMessage(chatcomponenttranslation); diff --git a/src/main/java/net/minecraft/command/ServerCommandManager.java b/src/main/java/net/minecraft/command/ServerCommandManager.java index 88e87f7..47760e4 100644 --- a/src/main/java/net/minecraft/command/ServerCommandManager.java +++ b/src/main/java/net/minecraft/command/ServerCommandManager.java @@ -16,8 +16,8 @@ import net.minecraft.command.server.CommandTestFor; import net.minecraft.command.server.CommandTestForBlock; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextComponentTranslation; import java.util.List; @@ -116,8 +116,8 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman flag = false; } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation("chat.type.admin", - new Object[] { sender.getName(), new ChatComponentTranslation(msgFormat, msgParams) }); + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation("chat.type.admin", + new Object[] { sender.getName(), new TextComponentTranslation(msgFormat, msgParams) }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.GRAY); chatcomponenttranslation.getChatStyle().setItalic(Boolean.valueOf(true)); if (flag) { @@ -143,7 +143,7 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman } if ((flags & 1) != 1 && flag3 || sender instanceof MinecraftServer) { - sender.addChatMessage(new ChatComponentTranslation(msgFormat, msgParams)); + sender.addChatMessage(new TextComponentTranslation(msgFormat, msgParams)); } } diff --git a/src/main/java/net/minecraft/command/server/CommandAchievement.java b/src/main/java/net/minecraft/command/server/CommandAchievement.java index bfcf539..e3d203a 100644 --- a/src/main/java/net/minecraft/command/server/CommandAchievement.java +++ b/src/main/java/net/minecraft/command/server/CommandAchievement.java @@ -15,7 +15,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.stats.AchievementList; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/server/CommandBlockBaseLogic.java b/src/main/java/net/minecraft/command/server/CommandBlockBaseLogic.java index a7b64f1..00881e7 100644 --- a/src/main/java/net/minecraft/command/server/CommandBlockBaseLogic.java +++ b/src/main/java/net/minecraft/command/server/CommandBlockBaseLogic.java @@ -13,9 +13,9 @@ import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ReportedException; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -59,7 +59,7 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { * + * The previously run command. */ - private IChatComponent lastOutput = null; + private ITextComponent lastOutput = null; /** * + * The command stored in the command block. @@ -88,7 +88,7 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { * + * Returns the lastOutput. */ - public IChatComponent getLastOutput() { + public ITextComponent getLastOutput() { return this.lastOutput; } @@ -102,7 +102,7 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { tagCompound.setString("CustomName", this.customName); tagCompound.setBoolean("TrackOutput", this.trackOutput); if (this.lastOutput != null && this.trackOutput) { - tagCompound.setString("LastOutput", IChatComponent.Serializer.componentToJson(this.lastOutput)); + tagCompound.setString("LastOutput", ITextComponent.Serializer.componentToJson(this.lastOutput)); } this.resultStats.writeStatsToNBT(tagCompound); @@ -124,7 +124,7 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { } if (nbt.hasKey("LastOutput", 8) && this.trackOutput) { - this.lastOutput = IChatComponent.Serializer.jsonToComponent(nbt.getString("LastOutput")); + this.lastOutput = ITextComponent.Serializer.jsonToComponent(nbt.getString("LastOutput")); } this.resultStats.readStatsFromNBT(nbt); @@ -203,8 +203,8 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return new ChatComponentText(this.getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(this.getName()); } public void setName(String parString1) { @@ -215,9 +215,9 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { if (this.trackOutput && this.getEntityWorld() != null && !this.getEntityWorld().isRemote) { - this.lastOutput = (new ChatComponentText("[" + timestampFormat.format(new Date()) + "] ")) + this.lastOutput = (new TextComponentString("[" + timestampFormat.format(new Date()) + "] ")) .appendSibling(ichatcomponent); this.updateCommand(); } @@ -245,7 +245,7 @@ public abstract class CommandBlockBaseLogic implements ICommandSender { public abstract void fillInInfo(ByteBuf var1); - public void setLastOutput(IChatComponent lastOutputMessage) { + public void setLastOutput(ITextComponent lastOutputMessage) { this.lastOutput = lastOutputMessage; } diff --git a/src/main/java/net/minecraft/command/server/CommandBroadcast.java b/src/main/java/net/minecraft/command/server/CommandBroadcast.java index 0f55d25..5f36b38 100644 --- a/src/main/java/net/minecraft/command/server/CommandBroadcast.java +++ b/src/main/java/net/minecraft/command/server/CommandBroadcast.java @@ -6,11 +6,11 @@ import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -73,13 +73,13 @@ public class CommandBroadcast extends CommandBase { */ public void processCommand(ICommandSender parICommandSender, String[] parArrayOfString) throws CommandException { if (parArrayOfString.length > 0 && parArrayOfString[0].length() > 0) { - IChatComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 0, true); + ITextComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 0, true); if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() .getBoolean("colorCodes")) { - ichatcomponent = new ChatComponentText( + ichatcomponent = new TextComponentString( StringUtils.translateControlCodesAlternate(ichatcomponent.getFormattedText())); } - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation( + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new TextComponentTranslation( "chat.type.announcement", new Object[] { parICommandSender.getDisplayName(), ichatcomponent })); } else { throw new WrongUsageException("commands.say.usage", new Object[0]); diff --git a/src/main/java/net/minecraft/command/server/CommandEmote.java b/src/main/java/net/minecraft/command/server/CommandEmote.java index 75cfff5..1d34519 100644 --- a/src/main/java/net/minecraft/command/server/CommandEmote.java +++ b/src/main/java/net/minecraft/command/server/CommandEmote.java @@ -7,11 +7,11 @@ import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -76,14 +76,14 @@ public class CommandEmote extends CommandBase { if (args.length <= 0) { throw new WrongUsageException("commands.me.usage", new Object[0]); } else { - IChatComponent ichatcomponent = getChatComponentFromNthArg(sender, args, 0, + ITextComponent ichatcomponent = getChatComponentFromNthArg(sender, args, 0, !(sender instanceof EntityPlayer)); if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() .getBoolean("colorCodes")) { - ichatcomponent = new ChatComponentText( + ichatcomponent = new TextComponentString( StringUtils.translateControlCodesAlternate(ichatcomponent.getFormattedText())); } - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation( + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new TextComponentTranslation( "chat.type.emote", new Object[] { sender.getDisplayName(), ichatcomponent })); } } diff --git a/src/main/java/net/minecraft/command/server/CommandListPlayers.java b/src/main/java/net/minecraft/command/server/CommandListPlayers.java index 392d7fb..7973ef1 100644 --- a/src/main/java/net/minecraft/command/server/CommandListPlayers.java +++ b/src/main/java/net/minecraft/command/server/CommandListPlayers.java @@ -5,8 +5,8 @@ import net.minecraft.command.CommandException; import net.minecraft.command.CommandResultStats; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -69,9 +69,9 @@ public class CommandListPlayers extends CommandBase { */ public void processCommand(ICommandSender parICommandSender, String[] parArrayOfString) throws CommandException { int i = MinecraftServer.getServer().getCurrentPlayerCount(); - parICommandSender.addChatMessage(new ChatComponentTranslation("commands.players.list", + parICommandSender.addChatMessage(new TextComponentTranslation("commands.players.list", new Object[] { Integer.valueOf(i), Integer.valueOf(MinecraftServer.getServer().getMaxPlayers()) })); - parICommandSender.addChatMessage(new ChatComponentText(MinecraftServer.getServer().getConfigurationManager() + parICommandSender.addChatMessage(new TextComponentString(MinecraftServer.getServer().getConfigurationManager() .func_181058_b(parArrayOfString.length > 0 && "uuids".equalsIgnoreCase(parArrayOfString[0])))); parICommandSender.setCommandStat(CommandResultStats.Type.QUERY_RESULT, i); } diff --git a/src/main/java/net/minecraft/command/server/CommandMessage.java b/src/main/java/net/minecraft/command/server/CommandMessage.java index 6b81b54..5376466 100644 --- a/src/main/java/net/minecraft/command/server/CommandMessage.java +++ b/src/main/java/net/minecraft/command/server/CommandMessage.java @@ -10,12 +10,12 @@ import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -92,17 +92,17 @@ public class CommandMessage extends CommandBase { if (entityplayermp == parICommandSender) { throw new PlayerNotFoundException("commands.message.sameTarget", new Object[0]); } else { - IChatComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 1, + ITextComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 1, !(parICommandSender instanceof EntityPlayer)); if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() .getBoolean("colorCodes")) { - ichatcomponent = new ChatComponentText( + ichatcomponent = new TextComponentString( StringUtils.translateControlCodesAlternate(ichatcomponent.getFormattedText())); } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.message.display.incoming", new Object[] { parICommandSender.getDisplayName(), ichatcomponent.createCopy() }); - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation( "commands.message.display.outgoing", new Object[] { entityplayermp.getDisplayName(), ichatcomponent.createCopy() }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.GRAY) diff --git a/src/main/java/net/minecraft/command/server/CommandMessageRaw.java b/src/main/java/net/minecraft/command/server/CommandMessageRaw.java index 63efedb..aca5fa4 100644 --- a/src/main/java/net/minecraft/command/server/CommandMessageRaw.java +++ b/src/main/java/net/minecraft/command/server/CommandMessageRaw.java @@ -12,9 +12,9 @@ import net.minecraft.command.SyntaxErrorException; import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentProcessor; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentUtils; +import net.minecraft.util.text.ITextComponent; /** * + @@ -83,9 +83,9 @@ public class CommandMessageRaw extends CommandBase { String s = buildString(parArrayOfString, 1); try { - IChatComponent ichatcomponent = IChatComponent.Serializer.jsonToComponent(s); + ITextComponent ichatcomponent = ITextComponent.Serializer.jsonToComponent(s); entityplayermp.addChatMessage( - ChatComponentProcessor.processComponent(parICommandSender, ichatcomponent, entityplayermp)); + TextComponentUtils.processComponent(parICommandSender, ichatcomponent, entityplayermp)); } catch (JSONException jsonparseexception) { Throwable throwable = ExceptionUtils.getRootCause(jsonparseexception); throw new SyntaxErrorException("commands.tellraw.jsonException", diff --git a/src/main/java/net/minecraft/command/server/CommandScoreboard.java b/src/main/java/net/minecraft/command/server/CommandScoreboard.java index 6eedd1d..ea2cd0f 100644 --- a/src/main/java/net/minecraft/command/server/CommandScoreboard.java +++ b/src/main/java/net/minecraft/command/server/CommandScoreboard.java @@ -28,10 +28,10 @@ import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -277,7 +277,7 @@ public class CommandScoreboard extends CommandBase { this.processCommand(parICommandSender, parArrayOfString); arraylist.add(s1); } catch (CommandException commandexception) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( commandexception.getMessage(), commandexception.getErrorObjects()); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); parICommandSender.addChatMessage(chatcomponenttranslation); @@ -487,12 +487,12 @@ public class CommandScoreboard extends CommandBase { new Object[] { scoreplayerteam.getRegisteredName() }); } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.scoreboard.teams.list.player.count", new Object[] { Integer.valueOf(collection.size()), scoreplayerteam.getRegisteredName() }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation); - parICommandSender.addChatMessage(new ChatComponentText(joinNiceString(collection.toArray()))); + parICommandSender.addChatMessage(new TextComponentString(joinNiceString(collection.toArray()))); } else { Collection collection1 = scoreboard.getTeams(); parICommandSender.setCommandStat(CommandResultStats.Type.QUERY_RESULT, collection1.size()); @@ -500,13 +500,13 @@ public class CommandScoreboard extends CommandBase { throw new CommandException("commands.scoreboard.teams.list.empty", new Object[0]); } - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation( "commands.scoreboard.teams.list.count", new Object[] { Integer.valueOf(collection1.size()) }); chatcomponenttranslation1.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation1); for (ScorePlayerTeam scoreplayerteam1 : (Collection) collection1) { - parICommandSender.addChatMessage(new ChatComponentTranslation("commands.scoreboard.teams.list.entry", + parICommandSender.addChatMessage(new TextComponentTranslation("commands.scoreboard.teams.list.entry", new Object[] { scoreplayerteam1.getRegisteredName(), scoreplayerteam1.getTeamName(), Integer.valueOf(scoreplayerteam1.getMembershipCollection().size()) })); } @@ -649,13 +649,13 @@ public class CommandScoreboard extends CommandBase { if (collection.size() <= 0) { throw new CommandException("commands.scoreboard.objectives.list.empty", new Object[0]); } else { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.scoreboard.objectives.list.count", new Object[] { Integer.valueOf(collection.size()) }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation); for (ScoreObjective scoreobjective : (Collection) collection) { - parICommandSender.addChatMessage(new ChatComponentTranslation( + parICommandSender.addChatMessage(new TextComponentTranslation( "commands.scoreboard.objectives.list.entry", new Object[] { scoreobjective.getName(), scoreobjective.getDisplayName(), scoreobjective.getCriteria().getName() })); } @@ -699,14 +699,14 @@ public class CommandScoreboard extends CommandBase { throw new CommandException("commands.scoreboard.players.list.player.empty", new Object[] { s }); } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "commands.scoreboard.players.list.player.count", new Object[] { Integer.valueOf(map.size()), s }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation); for (Score score : (Collection) map.values()) { parICommandSender - .addChatMessage(new ChatComponentTranslation("commands.scoreboard.players.list.player.entry", + .addChatMessage(new TextComponentTranslation("commands.scoreboard.players.list.player.entry", new Object[] { Integer.valueOf(score.getScorePoints()), score.getObjective().getDisplayName(), score.getObjective().getName() })); } @@ -717,11 +717,11 @@ public class CommandScoreboard extends CommandBase { throw new CommandException("commands.scoreboard.players.list.empty", new Object[0]); } - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation( "commands.scoreboard.players.list.count", new Object[] { Integer.valueOf(collection.size()) }); chatcomponenttranslation1.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN); parICommandSender.addChatMessage(chatcomponenttranslation1); - parICommandSender.addChatMessage(new ChatComponentText(joinNiceString(collection.toArray()))); + parICommandSender.addChatMessage(new TextComponentString(joinNiceString(collection.toArray()))); } } diff --git a/src/main/java/net/minecraft/command/server/CommandSetBlock.java b/src/main/java/net/minecraft/command/server/CommandSetBlock.java index fe050dc..4107116 100644 --- a/src/main/java/net/minecraft/command/server/CommandSetBlock.java +++ b/src/main/java/net/minecraft/command/server/CommandSetBlock.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java b/src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java index d3a6d3b..de1648e 100644 --- a/src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java +++ b/src/main/java/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java @@ -7,7 +7,7 @@ import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.network.play.server.S05PacketSpawnPosition; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/server/CommandSummon.java b/src/main/java/net/minecraft/command/server/CommandSummon.java index 57137e0..40621d3 100644 --- a/src/main/java/net/minecraft/command/server/CommandSummon.java +++ b/src/main/java/net/minecraft/command/server/CommandSummon.java @@ -13,9 +13,9 @@ import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -83,7 +83,7 @@ public class CommandSummon extends CommandBase { } else { String s = parArrayOfString[0]; BlockPos blockpos = parICommandSender.getPosition(); - Vec3 vec3 = parICommandSender.getPositionVector(); + Vec3d vec3 = parICommandSender.getPositionVector(); double d0 = vec3.xCoord; double d1 = vec3.yCoord; double d2 = vec3.zCoord; @@ -104,7 +104,7 @@ public class CommandSummon extends CommandBase { NBTTagCompound nbttagcompound = new NBTTagCompound(); boolean flag = false; if (parArrayOfString.length >= 5) { - IChatComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 4); + ITextComponent ichatcomponent = getChatComponentFromNthArg(parICommandSender, parArrayOfString, 4); try { nbttagcompound = JsonToNBT.getTagFromJson(ichatcomponent.getUnformattedText()); diff --git a/src/main/java/net/minecraft/command/server/CommandTeleport.java b/src/main/java/net/minecraft/command/server/CommandTeleport.java index 84d9701..40c1ab8 100644 --- a/src/main/java/net/minecraft/command/server/CommandTeleport.java +++ b/src/main/java/net/minecraft/command/server/CommandTeleport.java @@ -10,8 +10,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.S08PacketPlayerPosLook; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/command/server/CommandTestFor.java b/src/main/java/net/minecraft/command/server/CommandTestFor.java index 003379e..06f8cee 100644 --- a/src/main/java/net/minecraft/command/server/CommandTestFor.java +++ b/src/main/java/net/minecraft/command/server/CommandTestFor.java @@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/command/server/CommandTestForBlock.java b/src/main/java/net/minecraft/command/server/CommandTestForBlock.java index 7d5e3e3..a3a84bf 100644 --- a/src/main/java/net/minecraft/command/server/CommandTestForBlock.java +++ b/src/main/java/net/minecraft/command/server/CommandTestForBlock.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/crash/CrashReportCategory.java b/src/main/java/net/minecraft/crash/CrashReportCategory.java index 1974ba8..b9b070b 100644 --- a/src/main/java/net/minecraft/crash/CrashReportCategory.java +++ b/src/main/java/net/minecraft/crash/CrashReportCategory.java @@ -9,7 +9,7 @@ import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.HString; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/dispenser/IBlockSource.java b/src/main/java/net/minecraft/dispenser/IBlockSource.java index 5a9c85e..e0db7e0 100644 --- a/src/main/java/net/minecraft/dispenser/IBlockSource.java +++ b/src/main/java/net/minecraft/dispenser/IBlockSource.java @@ -1,7 +1,7 @@ package net.minecraft.dispenser; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentFrostWalker.java b/src/main/java/net/minecraft/enchantment/EnchantmentFrostWalker.java index 31cd1a0..78cd905 100644 --- a/src/main/java/net/minecraft/enchantment/EnchantmentFrostWalker.java +++ b/src/main/java/net/minecraft/enchantment/EnchantmentFrostWalker.java @@ -8,10 +8,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class EnchantmentFrostWalker extends Enchantment { diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentProtection.java b/src/main/java/net/minecraft/enchantment/EnchantmentProtection.java index 8a9f32d..7ef1c67 100644 --- a/src/main/java/net/minecraft/enchantment/EnchantmentProtection.java +++ b/src/main/java/net/minecraft/enchantment/EnchantmentProtection.java @@ -2,8 +2,8 @@ package net.minecraft.enchantment; import net.minecraft.entity.Entity; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/DataWatcher.java b/src/main/java/net/minecraft/entity/DataWatcher.java index 56fc8a3..5ec24c1 100644 --- a/src/main/java/net/minecraft/entity/DataWatcher.java +++ b/src/main/java/net/minecraft/entity/DataWatcher.java @@ -15,9 +15,9 @@ import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.BlockPos; import net.minecraft.util.ReportedException; import net.minecraft.util.Rotations; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/entity/Entity.java b/src/main/java/net/minecraft/entity/Entity.java index 5fa17a6..5ae1a9a 100644 --- a/src/main/java/net/minecraft/entity/Entity.java +++ b/src/main/java/net/minecraft/entity/Entity.java @@ -30,7 +30,6 @@ 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; @@ -39,18 +38,19 @@ 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.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.event.HoverEvent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -155,7 +155,7 @@ public abstract class Entity implements ICommandSender { protected int portalCounter; public int dimension; protected BlockPos field_181016_an; - protected Vec3 field_181017_ao; + protected Vec3d field_181017_ao; protected EnumFacing field_181018_ap; private boolean invulnerable; protected EaglercraftUUID entityUniqueID; @@ -166,7 +166,7 @@ public abstract class Entity implements ICommandSender { private boolean outOfCamera = false; private long displayNameCachedAt; - private IChatComponent cachedDisplayName; + private ITextComponent cachedDisplayName; protected boolean glowing; @@ -1309,7 +1309,7 @@ public abstract class Entity implements ICommandSender { * + * interpolated look vector */ - public Vec3 getLook(float partialTicks) { + public Vec3d getLook(float partialTicks) { if (partialTicks == 1.0F) { return this.getVectorForRotation(this.rotationPitch, this.rotationYaw); } else { @@ -1324,30 +1324,30 @@ public abstract class Entity implements ICommandSender { * Creates a Vec3 using the pitch and yaw of the entities * rotation. */ - protected final Vec3 getVectorForRotation(float pitch, float yaw) { + protected final Vec3d 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)); + return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2)); } - public Vec3 getPositionEyes(float partialTicks) { + public Vec3d getPositionEyes(float partialTicks) { if (partialTicks == 1.0F) { - return new Vec3(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); + return new Vec3d(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); + return new Vec3d(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, + public RayTraceResult rayTrace(double blockReachDistance, float partialTicks) { + Vec3d vec3 = this.getPositionEyes(partialTicks); + Vec3d vec31 = this.getLook(partialTicks); + Vec3d vec32 = vec3.addVector(vec31.xCoord * blockReachDistance, vec31.yCoord * blockReachDistance, vec31.zCoord * blockReachDistance); return this.worldObj.rayTraceBlocks(vec3, vec32, false, false, true); } @@ -1832,7 +1832,7 @@ public abstract class Entity implements ICommandSender { * + * returns a (normalized) vector of where this entity is looking */ - public Vec3 getLookVec() { + public Vec3d getLookVec() { return null; } @@ -1857,7 +1857,7 @@ public abstract class Entity implements ICommandSender { (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_181017_ao = new Vec3d(d1, d2, 0.0D); this.field_181018_ap = blockpattern$patternhelper.getFinger(); } @@ -2294,7 +2294,7 @@ public abstract class Entity implements ICommandSender { return 3; } - public Vec3 func_181014_aG() { + public Vec3d func_181014_aG() { return this.field_181017_ao; } @@ -2363,11 +2363,11 @@ public abstract class Entity implements ICommandSender { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { if (System.currentTimeMillis() - displayNameCachedAt < 50L) { return cachedDisplayName; } - ChatComponentText chatcomponenttext = new ChatComponentText(this.getName()); + TextComponentString chatcomponenttext = new TextComponentString(this.getName()); // When is a non-player entity going to be sending a chat message? // chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent()); chatcomponenttext.getChatStyle().setInsertion(this.getUniqueID().toString()); @@ -2434,7 +2434,7 @@ public abstract class Entity implements ICommandSender { } nbttagcompound.setString("name", this.getName()); - return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new ChatComponentText(nbttagcompound.toString())); + return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new TextComponentString(nbttagcompound.toString())); } public boolean isSpectatedByPlayer(EntityPlayerMP var1) { @@ -2469,7 +2469,7 @@ public abstract class Entity implements ICommandSender { * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent var1) { + public void addChatMessage(ITextComponent var1) { } /** @@ -2497,8 +2497,8 @@ public abstract class Entity implements ICommandSender { * 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); + public Vec3d getPositionVector() { + return new Vec3d(this.posX, this.posY, this.posZ); } /** @@ -2558,7 +2558,7 @@ public abstract class Entity implements ICommandSender { * New version of interactWith that includes vector information * on where precisely the player targeted. */ - public boolean interactAt(EntityPlayer player, Vec3 targetVec3) { + public boolean interactAt(EntityPlayer player, Vec3d targetVec3) { return false; } diff --git a/src/main/java/net/minecraft/entity/EntityAgeable.java b/src/main/java/net/minecraft/entity/EntityAgeable.java index d4fd507..80b30b1 100644 --- a/src/main/java/net/minecraft/entity/EntityAgeable.java +++ b/src/main/java/net/minecraft/entity/EntityAgeable.java @@ -5,7 +5,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/EntityBodyHelper.java b/src/main/java/net/minecraft/entity/EntityBodyHelper.java index 48cdc8e..1d45eec 100644 --- a/src/main/java/net/minecraft/entity/EntityBodyHelper.java +++ b/src/main/java/net/minecraft/entity/EntityBodyHelper.java @@ -1,6 +1,6 @@ package net.minecraft.entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/EntityCreature.java b/src/main/java/net/minecraft/entity/EntityCreature.java index 97cd9b4..a22a903 100644 --- a/src/main/java/net/minecraft/entity/EntityCreature.java +++ b/src/main/java/net/minecraft/entity/EntityCreature.java @@ -7,7 +7,7 @@ import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/EntityFlying.java b/src/main/java/net/minecraft/entity/EntityFlying.java index c32ce4e..36849b9 100644 --- a/src/main/java/net/minecraft/entity/EntityFlying.java +++ b/src/main/java/net/minecraft/entity/EntityFlying.java @@ -1,8 +1,8 @@ package net.minecraft.entity; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/EntityHanging.java b/src/main/java/net/minecraft/entity/EntityHanging.java index ac0bde4..a7400bf 100644 --- a/src/main/java/net/minecraft/entity/EntityHanging.java +++ b/src/main/java/net/minecraft/entity/EntityHanging.java @@ -4,10 +4,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneDiode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/net/minecraft/entity/EntityLeashKnot.java b/src/main/java/net/minecraft/entity/EntityLeashKnot.java index 3af88cf..1aa2311 100644 --- a/src/main/java/net/minecraft/entity/EntityLeashKnot.java +++ b/src/main/java/net/minecraft/entity/EntityLeashKnot.java @@ -7,9 +7,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/EntityLiving.java b/src/main/java/net/minecraft/entity/EntityLiving.java index 9bb10ae..466f50e 100644 --- a/src/main/java/net/minecraft/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/entity/EntityLiving.java @@ -32,9 +32,9 @@ import net.minecraft.network.play.server.S1BPacketEntityAttach; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/EntityLivingBase.java b/src/main/java/net/minecraft/entity/EntityLivingBase.java index d9dc25a..ec9facd 100644 --- a/src/main/java/net/minecraft/entity/EntityLivingBase.java +++ b/src/main/java/net/minecraft/entity/EntityLivingBase.java @@ -4,7 +4,7 @@ import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Maps; -import com.logisticscraft.occlusionculling.util.Vec3d; +import net.minecraft.util.math.Vec3d; import java.util.Collection; import java.util.Iterator; @@ -53,14 +53,14 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionHelper; import net.minecraft.scoreboard.Team; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.CombatTracker; import net.minecraft.util.DamageSource; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.client.entity.EntityPlayerSP; @@ -176,8 +176,7 @@ public abstract class EntityLivingBase extends Entity { /** The BlockPos the entity had during the previous tick. */ private BlockPos prevBlockpos; - protected int ticksSinceLastSwing; - + protected int ticksSinceLastSwing; /** * + @@ -891,11 +890,11 @@ public abstract class EntityLivingBase extends Entity { this.playSound("random.break", 0.8F, 0.8F + this.worldObj.rand.nextFloat() * 0.4F); for (int i = 0; i < 5; ++i) { - Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); + Vec3d vec3 = new Vec3d(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D; - Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); + Vec3d vec31 = new Vec3d(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); vec31 = vec31.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec31 = vec31.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); @@ -1061,10 +1060,10 @@ public abstract class EntityLivingBase extends Entity { * Returns the current armor value as determined by a call to * InventoryPlayer.getTotalArmorValue */ - public int getTotalArmorValue() { - IAttributeInstance iattributeinstance = this.getEntityAttribute(SharedMonsterAttributes.ARMOR); - return MathHelper.floor_double(iattributeinstance.getAttributeValue()); - } + public int getTotalArmorValue() { + IAttributeInstance iattributeinstance = this.getEntityAttribute(SharedMonsterAttributes.ARMOR); + return MathHelper.floor_double(iattributeinstance.getAttributeValue()); + } protected void damageArmor(float parFloat1) { } @@ -1073,15 +1072,15 @@ public abstract class EntityLivingBase extends Entity { * + * Reduces damage, depending on armor */ - protected float applyArmorCalculations(DamageSource source, float damage) { - if (!source.isUnblockable()) { - this.damageArmor(damage); - damage = CombatRules.func_189427_a(damage, (float) this.getTotalArmorValue(), - (float) this.getEntityAttribute(SharedMonsterAttributes.field_189429_h).getAttributeValue()); - } + protected float applyArmorCalculations(DamageSource source, float damage) { + if (!source.isUnblockable()) { + this.damageArmor(damage); + damage = CombatRules.func_189427_a(damage, (float) this.getTotalArmorValue(), + (float) this.getEntityAttribute(SharedMonsterAttributes.field_189429_h).getAttributeValue()); + } - return damage; - } + return damage; + } /** * + @@ -1439,7 +1438,7 @@ public abstract class EntityLivingBase extends Entity { this.fallDistance = 1.0F; } - Vec3 vec3d = this.getLookVec(); + Vec3d vec3d = this.getLookVec(); float rotation = this.rotationPitch * 0.017453292F; double d6 = Math.sqrt(vec3d.xCoord * vec3d.xCoord + vec3d.zCoord * vec3d.zCoord); double d8 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); @@ -2005,15 +2004,15 @@ public abstract class EntityLivingBase extends Entity { * seen. (Raytrace) */ public boolean canEntityBeSeen(Entity entityIn) { - return this.worldObj.rayTraceBlocks(new Vec3(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ), - new Vec3(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ)) == null; + return this.worldObj.rayTraceBlocks(new Vec3d(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ), + new Vec3d(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ)) == null; } /** * + * returns a (normalized) vector of where this entity is looking */ - public Vec3 getLookVec() { + public Vec3d getLookVec() { return this.getLook(1.0F); } @@ -2021,7 +2020,7 @@ public abstract class EntityLivingBase extends Entity { * + * interpolated look vector */ - public Vec3 getLook(float f) { + public Vec3d getLook(float f) { if (f == 1.0F) { return this.getVectorForRotation(this.rotationPitch, this.rotationYawHead); } else { diff --git a/src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java b/src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java index 090d5f5..e0a56af 100644 --- a/src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java +++ b/src/main/java/net/minecraft/entity/EntityMinecartCommandBlock.java @@ -8,9 +8,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -48,7 +48,7 @@ public class EntityMinecartCommandBlock extends EntityMinecart { public void updateCommand() { EntityMinecartCommandBlock.this.getDataWatcher().updateObject(23, this.getCommand()); EntityMinecartCommandBlock.this.getDataWatcher().updateObject(24, - IChatComponent.Serializer.componentToJson(this.getLastOutput())); + ITextComponent.Serializer.componentToJson(this.getLastOutput())); } public int getCommandBlockType() { @@ -64,8 +64,8 @@ public class EntityMinecartCommandBlock extends EntityMinecart { EntityMinecartCommandBlock.this.posZ); } - public Vec3 getPositionVector() { - return new Vec3(EntityMinecartCommandBlock.this.posX, EntityMinecartCommandBlock.this.posY, + public Vec3d getPositionVector() { + return new Vec3d(EntityMinecartCommandBlock.this.posX, EntityMinecartCommandBlock.this.posY, EntityMinecartCommandBlock.this.posZ); } @@ -111,7 +111,7 @@ public class EntityMinecartCommandBlock extends EntityMinecart { this.commandBlockLogic.readDataFromNBT(nbttagcompound); this.getDataWatcher().updateObject(23, this.getCommandBlockLogic().getCommand()); this.getDataWatcher().updateObject(24, - IChatComponent.Serializer.componentToJson(this.getCommandBlockLogic().getLastOutput())); + ITextComponent.Serializer.componentToJson(this.getCommandBlockLogic().getLastOutput())); } /** @@ -163,7 +163,7 @@ public class EntityMinecartCommandBlock extends EntityMinecart { if (i == 24) { try { this.commandBlockLogic.setLastOutput( - IChatComponent.Serializer.jsonToComponent(this.getDataWatcher().getWatchableObjectString(24))); + ITextComponent.Serializer.jsonToComponent(this.getDataWatcher().getWatchableObjectString(24))); } catch (Throwable var3) { ; } diff --git a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java index c6b3ebc..78cb5ca 100644 --- a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java @@ -55,8 +55,8 @@ import net.minecraft.network.play.server.S1DPacketEntityEffect; import net.minecraft.network.play.server.S20PacketEntityProperties; import net.minecraft.network.play.server.S49PacketUpdateEntityNBT; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.storage.MapData; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; diff --git a/src/main/java/net/minecraft/entity/IMerchant.java b/src/main/java/net/minecraft/entity/IMerchant.java index ac43866..901b458 100644 --- a/src/main/java/net/minecraft/entity/IMerchant.java +++ b/src/main/java/net/minecraft/entity/IMerchant.java @@ -2,7 +2,7 @@ package net.minecraft.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; @@ -59,5 +59,5 @@ public interface IMerchant { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - IChatComponent getDisplayName(); + ITextComponent getDisplayName(); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/entity/NpcMerchant.java b/src/main/java/net/minecraft/entity/NpcMerchant.java index 4ba38c5..2512bfd 100644 --- a/src/main/java/net/minecraft/entity/NpcMerchant.java +++ b/src/main/java/net/minecraft/entity/NpcMerchant.java @@ -3,8 +3,8 @@ package net.minecraft.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryMerchant; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; @@ -41,9 +41,9 @@ public class NpcMerchant implements IMerchant { private InventoryMerchant theMerchantInventory; private EntityPlayer customer; private MerchantRecipeList recipeList; - private IChatComponent field_175548_d; + private ITextComponent field_175548_d; - public NpcMerchant(EntityPlayer parEntityPlayer, IChatComponent parIChatComponent) { + public NpcMerchant(EntityPlayer parEntityPlayer, ITextComponent parIChatComponent) { this.customer = parEntityPlayer; this.field_175548_d = parIChatComponent; this.theMerchantInventory = new InventoryMerchant(parEntityPlayer, this); @@ -82,8 +82,8 @@ public class NpcMerchant implements IMerchant { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.field_175548_d != null ? this.field_175548_d - : new ChatComponentTranslation("entity.Villager.name", new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.field_175548_d != null ? this.field_175548_d + : new TextComponentTranslation("entity.Villager.name", new Object[0])); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java b/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java index ca723cb..addb2f6 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java @@ -3,7 +3,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IRangedAttackMob; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java b/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java index 8cb7bba..00da3bf 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; import net.minecraft.pathfinding.PathEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java b/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java index 9bb81da..98a47a5 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java @@ -8,7 +8,7 @@ import net.minecraft.entity.EntityCreature; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.util.EntitySelectors; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -87,7 +87,7 @@ public class EntityAIAvoidEntity extends EntityAIBase { return false; } else { this.closestLivingEntity = (T) list.get(0); - Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockAwayFrom(this.theEntity, 16, 7, new Vec3( + Vec3d vec3 = RandomPositionGenerator.findRandomTargetBlockAwayFrom(this.theEntity, 16, 7, new Vec3d( this.closestLivingEntity.posX, this.closestLivingEntity.posY, this.closestLivingEntity.posZ)); if (vec3 == null) { return false; diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java b/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java index 4d3f58e..19c488b 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java @@ -9,8 +9,8 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.pathfinder.WalkNodeProcessor; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java b/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java index d5c992b..8d482ed 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java b/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java index 67e86ba..98830da 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java @@ -8,7 +8,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateHelper; import net.minecraft.entity.EntityLiving; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java b/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java index b68d610..5979378 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java @@ -2,8 +2,8 @@ package net.minecraft.entity.ai; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -63,7 +63,7 @@ public class EntityAIFleeSun extends EntityAIBase { this.theCreature.getEntityBoundingBox().minY, this.theCreature.posZ))) { return false; } else { - Vec3 vec3 = this.findPossibleShelter(); + Vec3d vec3 = this.findPossibleShelter(); if (vec3 == null) { return false; } else { @@ -92,7 +92,7 @@ public class EntityAIFleeSun extends EntityAIBase { this.theCreature.getNavigator().tryMoveToXYZ(this.shelterX, this.shelterY, this.shelterZ, this.movementSpeed); } - private Vec3 findPossibleShelter() { + private Vec3d findPossibleShelter() { EaglercraftRandom random = this.theCreature.getRNG(); BlockPos blockpos = new BlockPos(this.theCreature.posX, this.theCreature.getEntityBoundingBox().minY, this.theCreature.posZ); @@ -100,7 +100,7 @@ public class EntityAIFleeSun extends EntityAIBase { for (int i = 0; i < 10; ++i) { BlockPos blockpos1 = blockpos.add(random.nextInt(20) - 10, random.nextInt(6) - 3, random.nextInt(20) - 10); if (!this.theWorld.canSeeSky(blockpos1) && this.theCreature.getBlockPathWeight(blockpos1) < 0.0F) { - return new Vec3((double) blockpos1.getX(), (double) blockpos1.getY(), (double) blockpos1.getZ()); + return new Vec3d((double) blockpos1.getX(), (double) blockpos1.getY(), (double) blockpos1.getZ()); } } diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java b/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java index 3b9927c..9661d32 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java @@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java b/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java index 4ee81f3..d17c0a5 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java @@ -9,7 +9,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java index e2f91b4..42139b1 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java @@ -4,7 +4,7 @@ import java.util.List; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java index b6d5077..d061e33 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java @@ -2,7 +2,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java index 76a21c1..7f81b13 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java @@ -1,8 +1,8 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.village.Village; import net.minecraft.village.VillageDoorInfo; @@ -94,8 +94,8 @@ public class EntityAIMoveIndoors extends EntityAIBase { int j = blockpos.getY(); int k = blockpos.getZ(); if (this.entityObj.getDistanceSq(blockpos) > 256.0D) { - Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.entityObj, 14, 3, - new Vec3((double) i + 0.5D, (double) j, (double) k + 0.5D)); + Vec3d vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.entityObj, 14, 3, + new Vec3d((double) i + 0.5D, (double) j, (double) k + 0.5D)); if (vec3 != null) { this.entityObj.getNavigator().tryMoveToXYZ(vec3.xCoord, vec3.yCoord, vec3.zCoord, 1.0D); } diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java index 8c73587..6301afc 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java @@ -5,9 +5,9 @@ import java.util.List; import net.minecraft.entity.EntityCreature; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.village.Village; import net.minecraft.village.VillageDoorInfo; @@ -84,8 +84,8 @@ public class EntityAIMoveThroughVillage extends EntityAIBase { if (this.entityPathNavigate != null) { return true; } else { - Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 10, 7, - new Vec3((double) this.doorInfo.getDoorBlockPos().getX(), + Vec3d vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 10, 7, + new Vec3d((double) this.doorInfo.getDoorBlockPos().getX(), (double) this.doorInfo.getDoorBlockPos().getY(), (double) this.doorInfo.getDoorBlockPos().getZ())); if (vec3 == null) { diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java index 6daa6a1..8ac5e61 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java @@ -1,7 +1,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java index f66ec4a..7da80b9 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java @@ -1,8 +1,8 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; /** * + @@ -55,8 +55,8 @@ public class EntityAIMoveTowardsRestriction extends EntityAIBase { return false; } else { BlockPos blockpos = this.theEntity.getHomePosition(); - Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, - new Vec3((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ())); + Vec3d vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, + new Vec3d((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ())); if (vec3 == null) { return false; } else { diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java index 9301106..a322965 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java @@ -2,7 +2,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -61,8 +61,8 @@ public class EntityAIMoveTowardsTarget extends EntityAIBase { .getDistanceSqToEntity(this.theEntity) > (double) (this.maxTargetDistance * this.maxTargetDistance)) { return false; } else { - Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, - new Vec3(this.targetEntity.posX, this.targetEntity.posY, this.targetEntity.posZ)); + Vec3d vec3 = RandomPositionGenerator.findRandomTargetBlockTowards(this.theEntity, 16, 7, + new Vec3d(this.targetEntity.posX, this.targetEntity.posY, this.targetEntity.posZ)); if (vec3 == null) { return false; } else { diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java index c3e4585..096a778 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java @@ -7,7 +7,7 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java b/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java index 73b2297..ccda2ff 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java @@ -1,7 +1,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -53,7 +53,7 @@ public class EntityAIPanic extends EntityAIBase { if (this.theEntityCreature.getAITarget() == null && !this.theEntityCreature.isBurning()) { return false; } else { - Vec3 vec3 = RandomPositionGenerator.findRandomTarget(this.theEntityCreature, 5, 4); + Vec3d vec3 = RandomPositionGenerator.findRandomTarget(this.theEntityCreature, 5, 4); if (vec3 == null) { return false; } else { diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java b/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java index 506685f..81dbced 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java @@ -3,7 +3,7 @@ package net.minecraft.entity.ai; import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -73,7 +73,7 @@ public class EntityAIPlay extends EntityAIBase { } if (this.targetVillager == null) { - Vec3 vec3 = RandomPositionGenerator.findRandomTarget(this.villagerObj, 16, 3); + Vec3d vec3 = RandomPositionGenerator.findRandomTarget(this.villagerObj, 16, 3); if (vec3 == null) { return false; } @@ -124,7 +124,7 @@ public class EntityAIPlay extends EntityAIBase { this.villagerObj.getNavigator().tryMoveToEntityLiving(this.targetVillager, this.speed); } } else if (this.villagerObj.getNavigator().noPath()) { - Vec3 vec3 = RandomPositionGenerator.findRandomTarget(this.villagerObj, 16, 3); + Vec3d vec3 = RandomPositionGenerator.findRandomTarget(this.villagerObj, 16, 3); if (vec3 == null) { return; } diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java index 1339c65..3238abd 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java @@ -2,7 +2,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.village.Village; import net.minecraft.village.VillageDoorInfo; diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java b/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java index da2ea45..f3992ec 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java @@ -3,7 +3,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -53,7 +53,7 @@ public class EntityAIRunAroundLikeCrazy extends EntityAIBase { */ public boolean shouldExecute() { if (!this.horseHost.isTame() && this.horseHost.riddenByEntity != null) { - Vec3 vec3 = RandomPositionGenerator.findRandomTarget(this.horseHost, 5, 4); + Vec3d vec3 = RandomPositionGenerator.findRandomTarget(this.horseHost, 5, 4); if (vec3 == null) { return false; } else { diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITarget.java b/src/main/java/net/minecraft/entity/ai/EntityAITarget.java index 4f79aff..6f15f0c 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAITarget.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAITarget.java @@ -10,8 +10,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathPoint; import net.minecraft.scoreboard.Team; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java index 0f5fa26..0201198 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java @@ -7,7 +7,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java index b1b313d..57cb27f 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java @@ -2,7 +2,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.village.Village; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWander.java b/src/main/java/net/minecraft/entity/ai/EntityAIWander.java index 77945b7..10fb500 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityAIWander.java +++ b/src/main/java/net/minecraft/entity/ai/EntityAIWander.java @@ -1,7 +1,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; /** * + @@ -67,7 +67,7 @@ public class EntityAIWander extends EntityAIBase { } } - Vec3 vec3 = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); + Vec3d vec3 = RandomPositionGenerator.findRandomTarget(this.entity, 10, 7); if (vec3 == null) { return false; } else { diff --git a/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java b/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java index 272239c..22f77f8 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java +++ b/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java @@ -3,7 +3,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java b/src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java index 248d671..7346d2d 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java +++ b/src/main/java/net/minecraft/entity/ai/EntityMinecartMobSpawner.java @@ -5,7 +5,7 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.MobSpawnerBaseLogic; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java b/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java index a214ba6..eb9eda3 100644 --- a/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java +++ b/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java @@ -2,7 +2,7 @@ package net.minecraft.entity.ai; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java b/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java index 0155518..a152cb9 100644 --- a/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java @@ -2,9 +2,9 @@ package net.minecraft.entity.ai; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.entity.EntityCreature; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -42,13 +42,13 @@ public class RandomPositionGenerator { * move towards or away from. WARNING: NEVER THREAD SAFE. * MULTIPLE findTowards and findAway calls, will share this var */ - private static Vec3 staticVector = new Vec3(0.0D, 0.0D, 0.0D); + private static Vec3d staticVector = new Vec3d(0.0D, 0.0D, 0.0D); /** * + * finds a random target within par1(x,z) and par2 (y) blocks */ - public static Vec3 findRandomTarget(EntityCreature entitycreatureIn, int xz, int y) { + public static Vec3d findRandomTarget(EntityCreature entitycreatureIn, int xz, int y) { /** * + * searches 10 blocks at random in a within par1(x,z) and par2 @@ -56,7 +56,7 @@ public class RandomPositionGenerator { * then points to the tile for which creature.getBlockPathWeight * returns the highest number */ - return findRandomTargetBlock(entitycreatureIn, xz, y, (Vec3) null); + return findRandomTargetBlock(entitycreatureIn, xz, y, (Vec3d) null); } /** @@ -64,7 +64,7 @@ public class RandomPositionGenerator { * finds a random target within par1(x,z) and par2 (y) blocks in * the direction of the point par3 */ - public static Vec3 findRandomTargetBlockTowards(EntityCreature entitycreatureIn, int xz, int y, Vec3 targetVec3) { + public static Vec3d findRandomTargetBlockTowards(EntityCreature entitycreatureIn, int xz, int y, Vec3d targetVec3) { staticVector = targetVec3.subtract(entitycreatureIn.posX, entitycreatureIn.posY, entitycreatureIn.posZ); /** * + @@ -81,8 +81,9 @@ public class RandomPositionGenerator { * finds a random target within par1(x,z) and par2 (y) blocks in * the reverse direction of the point par3 */ - public static Vec3 findRandomTargetBlockAwayFrom(EntityCreature entitycreatureIn, int xz, int y, Vec3 targetVec3) { - staticVector = (new Vec3(entitycreatureIn.posX, entitycreatureIn.posY, entitycreatureIn.posZ)) + public static Vec3d findRandomTargetBlockAwayFrom(EntityCreature entitycreatureIn, int xz, int y, + Vec3d targetVec3) { + staticVector = (new Vec3d(entitycreatureIn.posX, entitycreatureIn.posY, entitycreatureIn.posZ)) .subtract(targetVec3); /** * + @@ -101,7 +102,7 @@ public class RandomPositionGenerator { * then points to the tile for which creature.getBlockPathWeight * returns the highest number */ - private static Vec3 findRandomTargetBlock(EntityCreature entitycreatureIn, int xz, int y, Vec3 targetVec3) { + private static Vec3d findRandomTargetBlock(EntityCreature entitycreatureIn, int xz, int y, Vec3d targetVec3) { EaglercraftRandom random = entitycreatureIn.getRNG(); boolean flag = false; int i = 0; @@ -158,7 +159,7 @@ public class RandomPositionGenerator { } if (flag) { - return new Vec3((double) i, (double) j, (double) k); + return new Vec3d((double) i, (double) j, (double) k); } else { return null; } diff --git a/src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java b/src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java index 716f680..eafaef2 100644 --- a/src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java +++ b/src/main/java/net/minecraft/entity/ai/attributes/AttributeModifier.java @@ -5,7 +5,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import org.apache.commons.lang3.Validate; import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java b/src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java index db245f8..2cd628a 100644 --- a/src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java +++ b/src/main/java/net/minecraft/entity/ai/attributes/RangedAttribute.java @@ -1,6 +1,6 @@ package net.minecraft.entity.ai.attributes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/entity/boss/EntityDragon.java b/src/main/java/net/minecraft/entity/boss/EntityDragon.java index bb5d746..946b05f 100644 --- a/src/main/java/net/minecraft/entity/boss/EntityDragon.java +++ b/src/main/java/net/minecraft/entity/boss/EntityDragon.java @@ -17,14 +17,14 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.Explosion; import net.minecraft.world.World; @@ -251,10 +251,11 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt d6 = -50.0D; } - Vec3 vec3 = (new Vec3(this.targetX - this.posX, this.targetY - this.posY, this.targetZ - this.posZ)) + Vec3d vec3 = (new Vec3d(this.targetX - this.posX, this.targetY - this.posY, + this.targetZ - this.posZ)) .normalize(); double d15 = (double) (-MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F)); - Vec3 vec31 = (new Vec3((double) MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F), + Vec3d vec31 = (new Vec3d((double) MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F), this.motionY, d15)).normalize(); float f5 = ((float) vec31.dotProduct(vec3) + 0.5F) / 1.5F; if (f5 < 0.0F) { @@ -282,7 +283,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt this.moveEntity(this.motionX, this.motionY, this.motionZ); } - Vec3 vec32 = (new Vec3(this.motionX, this.motionY, this.motionZ)).normalize(); + Vec3d vec32 = (new Vec3d(this.motionX, this.motionY, this.motionZ)).normalize(); float f9 = ((float) vec32.dotProduct(vec31) + 1.0F) / 2.0F; f9 = 0.8F + 0.15F * f9; this.motionX *= (double) f9; diff --git a/src/main/java/net/minecraft/entity/boss/EntityWither.java b/src/main/java/net/minecraft/entity/boss/EntityWither.java index d532bb7..e5afbe7 100644 --- a/src/main/java/net/minecraft/entity/boss/EntityWither.java +++ b/src/main/java/net/minecraft/entity/boss/EntityWither.java @@ -29,11 +29,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/boss/IBossDisplayData.java b/src/main/java/net/minecraft/entity/boss/IBossDisplayData.java index 37f7250..cf7341b 100644 --- a/src/main/java/net/minecraft/entity/boss/IBossDisplayData.java +++ b/src/main/java/net/minecraft/entity/boss/IBossDisplayData.java @@ -1,6 +1,6 @@ package net.minecraft.entity.boss; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -41,5 +41,5 @@ public interface IBossDisplayData { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - IChatComponent getDisplayName(); + ITextComponent getDisplayName(); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java b/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java index 357ea35..729f78b 100644 --- a/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java +++ b/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java @@ -5,8 +5,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/item/EntityArmorStand.java b/src/main/java/net/minecraft/entity/item/EntityArmorStand.java index 8ce10c4..60f2af8 100644 --- a/src/main/java/net/minecraft/entity/item/EntityArmorStand.java +++ b/src/main/java/net/minecraft/entity/item/EntityArmorStand.java @@ -18,11 +18,11 @@ import net.minecraft.item.ItemElytra; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.Rotations; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -346,7 +346,7 @@ public class EntityArmorStand extends EntityLivingBase { * New version of interactWith that includes vector information * on where precisely the player targeted. */ - public boolean interactAt(EntityPlayer entityplayer, Vec3 vec3) { + public boolean interactAt(EntityPlayer entityplayer, Vec3d vec3) { if (this.func_181026_s()) { return false; } else if (!this.worldObj.isRemote && !entityplayer.isSpectator()) { diff --git a/src/main/java/net/minecraft/entity/item/EntityBoat.java b/src/main/java/net/minecraft/entity/item/EntityBoat.java index 5b4ef32..3ad2436 100644 --- a/src/main/java/net/minecraft/entity/item/EntityBoat.java +++ b/src/main/java/net/minecraft/entity/item/EntityBoat.java @@ -10,12 +10,12 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java b/src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java index 74f8604..edbaa39 100644 --- a/src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/entity/item/EntityEnderCrystal.java @@ -10,9 +10,9 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.WorldProviderEnd; diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderEye.java b/src/main/java/net/minecraft/entity/item/EntityEnderEye.java index a363bb1..0c6ba69 100644 --- a/src/main/java/net/minecraft/entity/item/EntityEnderEye.java +++ b/src/main/java/net/minecraft/entity/item/EntityEnderEye.java @@ -5,9 +5,9 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityEnderPearl.java b/src/main/java/net/minecraft/entity/item/EntityEnderPearl.java index 7cb9c3f..99d6a5d 100644 --- a/src/main/java/net/minecraft/entity/item/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/entity/item/EntityEnderPearl.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -60,7 +60,7 @@ public class EntityEnderPearl extends EntityThrowable { * + * Called when this EntityThrowable hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { EntityLivingBase entitylivingbase = this.getThrower(); if (movingobjectposition.entityHit != null) { if (movingobjectposition.entityHit == this.field_181555_c) { diff --git a/src/main/java/net/minecraft/entity/item/EntityExpBottle.java b/src/main/java/net/minecraft/entity/item/EntityExpBottle.java index 48a5bae..78f6657 100644 --- a/src/main/java/net/minecraft/entity/item/EntityExpBottle.java +++ b/src/main/java/net/minecraft/entity/item/EntityExpBottle.java @@ -2,8 +2,8 @@ package net.minecraft.entity.item; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -69,7 +69,7 @@ public class EntityExpBottle extends EntityThrowable { * + * Called when this EntityThrowable hits a block or entity. */ - protected void onImpact(MovingObjectPosition var1) { + protected void onImpact(RayTraceResult var1) { if (!this.worldObj.isRemote) { this.worldObj.playAuxSFX(2002, new BlockPos(this), 0); int i = 3 + this.worldObj.rand.nextInt(5) + this.worldObj.rand.nextInt(5); diff --git a/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java b/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java index 596fecf..9729105 100644 --- a/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java @@ -15,11 +15,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java b/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java index 781e9dc..61a7302 100644 --- a/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java +++ b/src/main/java/net/minecraft/entity/item/EntityFireworkRocket.java @@ -5,8 +5,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -129,7 +129,7 @@ public class EntityFireworkRocket extends Entity { if (this.creator != null) { if (this.creator.isElytraFlying()) { - Vec3 look = this.creator.getLookVec(); + Vec3d look = this.creator.getLookVec(); double newMotionX = look.xCoord * 0.1D + (look.xCoord * 1.5D - this.creator.motionX) * 0.5D; double newMotionY = look.yCoord * 0.1D + (look.yCoord * 1.5D - this.creator.motionY) * 0.5D; double newMotionZ = look.zCoord * 0.1D + (look.zCoord * 1.5D - this.creator.motionZ) * 0.5D; diff --git a/src/main/java/net/minecraft/entity/item/EntityItem.java b/src/main/java/net/minecraft/entity/item/EntityItem.java index e89a828..0005f19 100644 --- a/src/main/java/net/minecraft/entity/item/EntityItem.java +++ b/src/main/java/net/minecraft/entity/item/EntityItem.java @@ -14,10 +14,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityItemFrame.java b/src/main/java/net/minecraft/entity/item/EntityItemFrame.java index 6b7b3e6..6b3ae7b 100644 --- a/src/main/java/net/minecraft/entity/item/EntityItemFrame.java +++ b/src/main/java/net/minecraft/entity/item/EntityItemFrame.java @@ -10,9 +10,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemMap; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.storage.MapData; diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecart.java b/src/main/java/net/minecraft/entity/item/EntityMinecart.java index 0de1e26..bb976a1 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecart.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecart.java @@ -20,15 +20,15 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IWorldNameable; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -427,7 +427,7 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { protected void func_180460_a(BlockPos parBlockPos, IBlockState parIBlockState) { this.fallDistance = 0.0F; - Vec3 vec3 = this.func_70489_a(this.posX, this.posY, this.posZ); + Vec3d vec3 = this.func_70489_a(this.posX, this.posY, this.posZ); this.posY = (double) parBlockPos.getY(); boolean flag = false; boolean flag1 = false; @@ -544,7 +544,7 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { } this.applyDrag(); - Vec3 vec31 = this.func_70489_a(this.posX, this.posY, this.posZ); + Vec3d vec31 = this.func_70489_a(this.posX, this.posY, this.posZ); if (vec31 != null && vec3 != null) { double d14 = (vec3.yCoord - vec31.yCoord) * 0.05D; d5 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); @@ -615,7 +615,7 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { d1 + (double) f1, d2 + (double) f)); } - public Vec3 func_70495_a(double parDouble1, double parDouble2, double parDouble3, double parDouble4) { + public Vec3d func_70495_a(double parDouble1, double parDouble2, double parDouble3, double parDouble4) { int i = MathHelper.floor_double(parDouble1); int j = MathHelper.floor_double(parDouble2); int k = MathHelper.floor_double(parDouble3); @@ -654,7 +654,7 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { } } - public Vec3 func_70489_a(double parDouble1, double parDouble2, double parDouble3) { + public Vec3d func_70489_a(double parDouble1, double parDouble2, double parDouble3) { int i = MathHelper.floor_double(parDouble1); int j = MathHelper.floor_double(parDouble2); int k = MathHelper.floor_double(parDouble3); @@ -700,7 +700,7 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { parDouble2 += 0.5D; } - return new Vec3(parDouble1, parDouble2, parDouble3); + return new Vec3d(parDouble1, parDouble2, parDouble3); } else { return null; } @@ -801,8 +801,8 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { if (entity instanceof EntityMinecart) { double d4 = entity.posX - this.posX; double d5 = entity.posZ - this.posZ; - Vec3 vec3 = (new Vec3(d4, 0.0D, d5)).normalize(); - Vec3 vec31 = (new Vec3((double) MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F), + Vec3d vec3 = (new Vec3d(d4, 0.0D, d5)).normalize(); + Vec3d vec31 = (new Vec3d((double) MathHelper.cos(this.rotationYaw * 3.1415927F / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * 3.1415927F / 180.0F))).normalize(); double d6 = Math.abs(vec3.dotProduct(vec31)); if (d6 < 0.800000011920929D) { @@ -995,14 +995,14 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { if (this.hasCustomName()) { - ChatComponentText chatcomponenttext = new ChatComponentText(this.entityName); + TextComponentString chatcomponenttext = new TextComponentString(this.entityName); chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent()); chatcomponenttext.getChatStyle().setInsertion(this.getUniqueID().toString()); return chatcomponenttext; } else { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation(this.getName(), + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation(this.getName(), new Object[0]); chatcomponenttranslation.getChatStyle().setChatHoverEvent(this.getHoverEvent()); chatcomponenttranslation.getChatStyle().setInsertion(this.getUniqueID().toString()); diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java b/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java index 107a26b..1e32d06 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java @@ -7,11 +7,11 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java b/src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java index 3bb63b8..7f0912b 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecartHopper.java @@ -12,9 +12,9 @@ import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.IHopper; import net.minecraft.tileentity.TileEntityHopper; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntitySelectors; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java b/src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java index 9dad7ad..9c71231 100644 --- a/src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java +++ b/src/main/java/net/minecraft/entity/item/EntityMinecartTNT.java @@ -8,9 +8,9 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/item/EntityPainting.java b/src/main/java/net/minecraft/entity/item/EntityPainting.java index a8aa207..7b75887 100644 --- a/src/main/java/net/minecraft/entity/item/EntityPainting.java +++ b/src/main/java/net/minecraft/entity/item/EntityPainting.java @@ -10,8 +10,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/item/EntityXPOrb.java b/src/main/java/net/minecraft/entity/item/EntityXPOrb.java index 45066a1..3727ba8 100644 --- a/src/main/java/net/minecraft/entity/item/EntityXPOrb.java +++ b/src/main/java/net/minecraft/entity/item/EntityXPOrb.java @@ -8,9 +8,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntityBlaze.java b/src/main/java/net/minecraft/entity/monster/EntityBlaze.java index 124b91c..94e7898 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityBlaze.java +++ b/src/main/java/net/minecraft/entity/monster/EntityBlaze.java @@ -14,10 +14,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntityEnderman.java b/src/main/java/net/minecraft/entity/monster/EntityEnderman.java index 56e290a..e64488b 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityEnderman.java +++ b/src/main/java/net/minecraft/entity/monster/EntityEnderman.java @@ -30,13 +30,13 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -153,8 +153,8 @@ public class EntityEnderman extends EntityMob { if (itemstack != null && itemstack.getItem() == Item.getItemFromBlock(Blocks.pumpkin)) { return false; } else { - Vec3 vec3 = player.getLook(1.0F).normalize(); - Vec3 vec31 = new Vec3(this.posX - player.posX, this.getEntityBoundingBox().minY + Vec3d vec3 = player.getLook(1.0F).normalize(); + Vec3d vec31 = new Vec3d(this.posX - player.posX, this.getEntityBoundingBox().minY + (double) (this.height / 2.0F) - (player.posY + (double) player.getEyeHeight()), this.posZ - player.posZ); double d0 = vec31.lengthVector(); @@ -229,7 +229,7 @@ public class EntityEnderman extends EntityMob { * Teleport the enderman to another entity */ protected boolean teleportToEntity(Entity parEntity) { - Vec3 vec3 = new Vec3(this.posX - parEntity.posX, this.getEntityBoundingBox().minY + Vec3d vec3 = new Vec3d(this.posX - parEntity.posX, this.getEntityBoundingBox().minY + (double) (this.height / 2.0F) - parEntity.posY + (double) parEntity.getEyeHeight(), this.posZ - parEntity.posZ); vec3 = vec3.normalize(); diff --git a/src/main/java/net/minecraft/entity/monster/EntityEndermite.java b/src/main/java/net/minecraft/entity/monster/EntityEndermite.java index b19c495..623ee02 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityEndermite.java +++ b/src/main/java/net/minecraft/entity/monster/EntityEndermite.java @@ -13,8 +13,8 @@ import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntityGhast.java b/src/main/java/net/minecraft/entity/monster/EntityGhast.java index 0ea7e25..e998023 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityGhast.java +++ b/src/main/java/net/minecraft/entity/monster/EntityGhast.java @@ -13,11 +13,11 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.AchievementList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; @@ -254,7 +254,7 @@ public class EntityGhast extends EntityFlying implements IMob { if (this.attackTimer == 20) { double d1 = 4.0D; - Vec3 vec3 = this.parentEntity.getLook(1.0F); + Vec3d vec3 = this.parentEntity.getLook(1.0F); double d2 = entitylivingbase.posX - (this.parentEntity.posX + vec3.xCoord * d1); double d3 = entitylivingbase.getEntityBoundingBox().minY + (double) (entitylivingbase.height / 2.0F) - (0.5D + this.parentEntity.posY + (double) (this.parentEntity.height / 2.0F)); diff --git a/src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java b/src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java index 117eb24..e9d55fc 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/entity/monster/EntityGiantZombie.java @@ -1,7 +1,7 @@ package net.minecraft.entity.monster; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntityGuardian.java b/src/main/java/net/minecraft/entity/monster/EntityGuardian.java index b61a618..243f60a 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityGuardian.java +++ b/src/main/java/net/minecraft/entity/monster/EntityGuardian.java @@ -29,13 +29,13 @@ import net.minecraft.pathfinding.PathNavigate; import net.minecraft.pathfinding.PathNavigateSwimmer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandomFishable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; @@ -340,7 +340,7 @@ public class EntityGuardian extends EntityMob { } if (this.func_175472_n() && this.isInWater()) { - Vec3 vec3 = this.getLook(0.0F); + Vec3d vec3 = this.getLook(0.0F); for (int i = 0; i < 2; ++i) { this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, diff --git a/src/main/java/net/minecraft/entity/monster/EntityIronGolem.java b/src/main/java/net/minecraft/entity/monster/EntityIronGolem.java index 952845e..74d0f69 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityIronGolem.java +++ b/src/main/java/net/minecraft/entity/monster/EntityIronGolem.java @@ -27,10 +27,10 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.village.Village; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/monster/EntityMob.java b/src/main/java/net/minecraft/entity/monster/EntityMob.java index a308ff8..075eced 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityMob.java +++ b/src/main/java/net/minecraft/entity/monster/EntityMob.java @@ -9,9 +9,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; @@ -122,58 +122,59 @@ public abstract class EntityMob extends EntityCreature implements IMob { return i > 4 ? "game.hostile.hurt.fall.big" : "game.hostile.hurt.fall.small"; } - public boolean attackEntityAsMob(Entity entityIn) - { - float f = (float)this.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); - int i = 0; + public boolean attackEntityAsMob(Entity entityIn) { + float f = (float) this.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); + int i = 0; - if (entityIn instanceof EntityLivingBase) - { - f += EnchantmentHelper.func_152377_a(this.getHeldItem(), ((EntityLivingBase)entityIn).getCreatureAttribute()); - i += EnchantmentHelper.getKnockbackModifier(this); - } + if (entityIn instanceof EntityLivingBase) { + f += EnchantmentHelper.func_152377_a(this.getHeldItem(), + ((EntityLivingBase) entityIn).getCreatureAttribute()); + i += EnchantmentHelper.getKnockbackModifier(this); + } - boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), f); + boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), f); - if (flag) - { - if (i > 0 && entityIn instanceof EntityLivingBase) - { - ((EntityLivingBase)entityIn).knockBack(this, (float)i * 0.5F, (double)MathHelper.sin(this.rotationYaw * 0.017453292F), (double)(-MathHelper.cos(this.rotationYaw * 0.017453292F))); - this.motionX *= 0.6D; - this.motionZ *= 0.6D; - } + if (flag) { + if (i > 0 && entityIn instanceof EntityLivingBase) { + ((EntityLivingBase) entityIn).knockBack(this, (float) i * 0.5F, + (double) MathHelper.sin(this.rotationYaw * 0.017453292F), + (double) (-MathHelper.cos(this.rotationYaw * 0.017453292F))); + this.motionX *= 0.6D; + this.motionZ *= 0.6D; + } - int j = EnchantmentHelper.getFireAspectModifier(this); + int j = EnchantmentHelper.getFireAspectModifier(this); - if (j > 0) - { - entityIn.setFire(j * 4); - } + if (j > 0) { + entityIn.setFire(j * 4); + } - // if (entityIn instanceof EntityPlayer) - // { - // EntityPlayer entityplayer = (EntityPlayer)entityIn; - // ItemStack itemstack = this.getHeldItem(); - // ItemStack itemstack1 = entityplayer.isHandActive() ? entityplayer.getActiveItemStack() : null; + // if (entityIn instanceof EntityPlayer) + // { + // EntityPlayer entityplayer = (EntityPlayer)entityIn; + // ItemStack itemstack = this.getHeldItem(); + // ItemStack itemstack1 = entityplayer.isHandActive() ? + // entityplayer.getActiveItemStack() : null; - // if (itemstack != null && itemstack1 != null && itemstack.getItem() instanceof ItemAxe && itemstack1.getItem() == Items.SHIELD) - // { - // float f1 = 0.25F + (float)EnchantmentHelper.getEfficiencyModifier(this) * 0.05F; + // if (itemstack != null && itemstack1 != null && itemstack.getItem() instanceof + // ItemAxe && itemstack1.getItem() == Items.SHIELD) + // { + // float f1 = 0.25F + (float)EnchantmentHelper.getEfficiencyModifier(this) * + // 0.05F; - // if (this.rand.nextFloat() < f1) - // { - // entityplayer.getCooldownTracker().setCooldown(Items.SHIELD, 100); - // this.worldObj.setEntityState(entityplayer, (byte)30); - // } - // } - // } + // if (this.rand.nextFloat() < f1) + // { + // entityplayer.getCooldownTracker().setCooldown(Items.SHIELD, 100); + // this.worldObj.setEntityState(entityplayer, (byte)30); + // } + // } + // } - this.applyEnchantments(this, entityIn); - } + this.applyEnchantments(this, entityIn); + } - return flag; - } + return flag; + } public float getBlockPathWeight(BlockPos blockpos) { return 0.5F - this.worldObj.getLightBrightness(blockpos); diff --git a/src/main/java/net/minecraft/entity/monster/EntitySilverfish.java b/src/main/java/net/minecraft/entity/monster/EntitySilverfish.java index 976ee5f..d1abb91 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySilverfish.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySilverfish.java @@ -15,10 +15,10 @@ import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java b/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java index 5b4a5fd..3bc8d52 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java @@ -33,8 +33,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; import net.minecraft.world.WorldProviderHell; diff --git a/src/main/java/net/minecraft/entity/monster/EntitySlime.java b/src/main/java/net/minecraft/entity/monster/EntitySlime.java index 6a78545..0e69855 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySlime.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySlime.java @@ -15,10 +15,10 @@ import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/monster/EntitySnowman.java b/src/main/java/net/minecraft/entity/monster/EntitySnowman.java index cb34cf7..61a853b 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySnowman.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySnowman.java @@ -16,9 +16,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntitySpider.java b/src/main/java/net/minecraft/entity/monster/EntitySpider.java index 8ca25f4..467d3be 100644 --- a/src/main/java/net/minecraft/entity/monster/EntitySpider.java +++ b/src/main/java/net/minecraft/entity/monster/EntitySpider.java @@ -22,7 +22,7 @@ import net.minecraft.pathfinding.PathNavigate; import net.minecraft.pathfinding.PathNavigateClimber; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/monster/EntityWitch.java b/src/main/java/net/minecraft/entity/monster/EntityWitch.java index 1043d87..7738e8f 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityWitch.java +++ b/src/main/java/net/minecraft/entity/monster/EntityWitch.java @@ -24,7 +24,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/monster/EntityZombie.java b/src/main/java/net/minecraft/entity/monster/EntityZombie.java index 5ec19ea..6b2b507 100644 --- a/src/main/java/net/minecraft/entity/monster/EntityZombie.java +++ b/src/main/java/net/minecraft/entity/monster/EntityZombie.java @@ -36,10 +36,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EntitySelectors; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; @@ -123,7 +123,7 @@ public class EntityZombie extends EntityMob { this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(35.0D); this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.23000000417232513D); this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(3.0D); - this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0D); + this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0D); this.getAttributeMap().registerAttribute(reinforcementChance) .setBaseValue(this.rand.nextDouble() * 0.10000000149011612D); } diff --git a/src/main/java/net/minecraft/entity/passive/EntityAnimal.java b/src/main/java/net/minecraft/entity/passive/EntityAnimal.java index 2331eca..352d35e 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityAnimal.java +++ b/src/main/java/net/minecraft/entity/passive/EntityAnimal.java @@ -7,10 +7,10 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityBat.java b/src/main/java/net/minecraft/entity/passive/EntityBat.java index be8ce23..17d94ac 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityBat.java +++ b/src/main/java/net/minecraft/entity/passive/EntityBat.java @@ -6,9 +6,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityChicken.java b/src/main/java/net/minecraft/entity/passive/EntityChicken.java index 6196f05..9a15ac8 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityChicken.java +++ b/src/main/java/net/minecraft/entity/passive/EntityChicken.java @@ -18,8 +18,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityCow.java b/src/main/java/net/minecraft/entity/passive/EntityCow.java index bd7ac38..e2a0a67 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityCow.java +++ b/src/main/java/net/minecraft/entity/passive/EntityCow.java @@ -16,7 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityHorse.java b/src/main/java/net/minecraft/entity/passive/EntityHorse.java index 0cbffe2..2a8e6f1 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityHorse.java +++ b/src/main/java/net/minecraft/entity/passive/EntityHorse.java @@ -36,11 +36,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; @@ -326,15 +326,17 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { this.resetTexturePrefix(); // TODO: implement ar // if (!this.worldObj.isRemote) - // { - // this.getEntityAttribute(SharedMonsterAttributes.ARMOR).removeModifier(ARMOR_MODIFIER_UUID); - // int i = horsearmortype.getProtection(); + // { + // this.getEntityAttribute(SharedMonsterAttributes.ARMOR).removeModifier(ARMOR_MODIFIER_UUID); + // int i = horsearmortype.getProtection(); - // if (i != 0) - // { - // this.getEntityAttribute(SharedMonsterAttributes.ARMOR).applyModifier((new AttributeModifier(ARMOR_MODIFIER_UUID, "Horse armor bonus", (double)i, 0)).setSaved(false)); - // } - // } + // if (i != 0) + // { + // this.getEntityAttribute(SharedMonsterAttributes.ARMOR).applyModifier((new + // AttributeModifier(ARMOR_MODIFIER_UUID, "Horse armor bonus", (double)i, + // 0)).setSaved(false)); + // } + // } } public void setBreeding(boolean breeding) { diff --git a/src/main/java/net/minecraft/entity/passive/EntityOcelot.java b/src/main/java/net/minecraft/entity/passive/EntityOcelot.java index d10ea3f..5d1b10a 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityOcelot.java +++ b/src/main/java/net/minecraft/entity/passive/EntityOcelot.java @@ -25,9 +25,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/passive/EntityPig.java b/src/main/java/net/minecraft/entity/passive/EntityPig.java index 2d98021..c7f7e7e 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityPig.java +++ b/src/main/java/net/minecraft/entity/passive/EntityPig.java @@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityRabbit.java b/src/main/java/net/minecraft/entity/passive/EntityRabbit.java index 0497aaa..a252aa8 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityRabbit.java +++ b/src/main/java/net/minecraft/entity/passive/EntityRabbit.java @@ -29,12 +29,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathEntity; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; @@ -187,7 +187,7 @@ public class EntityRabbit extends EntityAnimal { if (!entityrabbit$rabbitjumphelper.getIsJumping()) { if (this.moveHelper.isUpdating() && this.currentMoveTypeDuration == 0) { PathEntity pathentity = this.navigator.getPath(); - Vec3 vec3 = new Vec3(this.moveHelper.getX(), this.moveHelper.getY(), this.moveHelper.getZ()); + Vec3d vec3 = new Vec3d(this.moveHelper.getX(), this.moveHelper.getY(), this.moveHelper.getZ()); if (pathentity != null && pathentity.getCurrentPathIndex() < pathentity.getCurrentPathLength()) { vec3 = pathentity.getPosition(this); } @@ -389,7 +389,7 @@ public class EntityRabbit extends EntityAnimal { public void setRabbitType(int rabbitTypeId) { if (rabbitTypeId == 99) { - this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(8.0D); + this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(8.0D); this.tasks.removeTask(this.aiAvoidWolves); this.tasks.addTask(4, new EntityRabbit.AIEvilAttack(this)); this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false, new Class[0])); diff --git a/src/main/java/net/minecraft/entity/passive/EntitySheep.java b/src/main/java/net/minecraft/entity/passive/EntitySheep.java index 4f0aa97..7ee46ca 100644 --- a/src/main/java/net/minecraft/entity/passive/EntitySheep.java +++ b/src/main/java/net/minecraft/entity/passive/EntitySheep.java @@ -28,8 +28,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/entity/passive/EntitySquid.java b/src/main/java/net/minecraft/entity/passive/EntitySquid.java index f8a0a67..f0db246 100644 --- a/src/main/java/net/minecraft/entity/passive/EntitySquid.java +++ b/src/main/java/net/minecraft/entity/passive/EntitySquid.java @@ -8,7 +8,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/passive/EntityVillager.java b/src/main/java/net/minecraft/entity/passive/EntityVillager.java index b35f9e9..76547f6 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityVillager.java +++ b/src/main/java/net/minecraft/entity/passive/EntityVillager.java @@ -50,14 +50,14 @@ import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; import net.minecraft.util.Tuple; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; import net.minecraft.village.Village; @@ -750,10 +750,10 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { String s = this.getCustomNameTag(); if (s != null && s.length() > 0) { - ChatComponentText chatcomponenttext = new ChatComponentText(s); + TextComponentString chatcomponenttext = new TextComponentString(s); chatcomponenttext.getChatStyle().setChatHoverEvent(this.getHoverEvent()); chatcomponenttext.getChatStyle().setInsertion(this.getUniqueID().toString()); return chatcomponenttext; @@ -799,7 +799,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc { } if (s1 != null) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation( + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation( "entity.Villager." + s1, new Object[0]); chatcomponenttranslation.getChatStyle().setChatHoverEvent(this.getHoverEvent()); chatcomponenttranslation.getChatStyle().setInsertion(this.getUniqueID().toString()); diff --git a/src/main/java/net/minecraft/entity/passive/EntityWolf.java b/src/main/java/net/minecraft/entity/passive/EntityWolf.java index e011625..b8249fb 100644 --- a/src/main/java/net/minecraft/entity/passive/EntityWolf.java +++ b/src/main/java/net/minecraft/entity/passive/EntityWolf.java @@ -32,10 +32,10 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayer.java b/src/main/java/net/minecraft/entity/player/EntityPlayer.java index acc049e..6df2c9d 100644 --- a/src/main/java/net/minecraft/entity/player/EntityPlayer.java +++ b/src/main/java/net/minecraft/entity/player/EntityPlayer.java @@ -37,7 +37,6 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityFishHook; -import net.minecraft.event.ClickEvent; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.Container; @@ -67,17 +66,18 @@ import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.CooldownTracker; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.FoodStats; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.IInteractionObject; import net.minecraft.world.LockCode; @@ -455,11 +455,12 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS if (itemStackIn.getItemUseAction() == EnumAction.EAT) { for (int i = 0; i < parInt1; ++i) { - Vec3 vec3 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D); + Vec3d vec3 = new Vec3d(((double) this.rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, + 0.0D); vec3 = vec3.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec3 = vec3.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); double d0 = (double) (-this.rand.nextFloat()) * 0.6D - 0.3D; - Vec3 vec31 = new Vec3(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); + Vec3d vec31 = new Vec3d(((double) this.rand.nextFloat() - 0.5D) * 0.3D, d0, 0.6D); vec31 = vec31.rotatePitch(-this.rotationPitch * 3.1415927F / 180.0F); vec31 = vec31.rotateYaw(-this.rotationYaw * 3.1415927F / 180.0F); vec31 = vec31.addVector(this.posX, this.posY + (double) this.getEyeHeight(), this.posZ); @@ -1695,7 +1696,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS return this.sleepTimer; } - public void addChatComponentMessage(IChatComponent var1) { + public void addChatComponentMessage(ITextComponent var1) { } public BlockPos getBedLocation() { @@ -2225,8 +2226,8 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - ChatComponentText chatcomponenttext = new ChatComponentText( + public ITextComponent getDisplayName() { + TextComponentString chatcomponenttext = new TextComponentString( ScorePlayerTeam.formatPlayerName(this.getTeam(), this.getName())); chatcomponenttext.getChatStyle() .setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.getName() + " ")); diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java index cf078a9..ac4690d 100644 --- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java +++ b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java @@ -79,16 +79,16 @@ import net.minecraft.stats.StatisticsFile; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.CooldownTracker; import net.minecraft.util.CooldownTrackerServer; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.IChatComponent; import net.minecraft.util.JsonSerializableSet; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.IInteractionObject; @@ -744,7 +744,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { if (ilockablecontainer.isLocked() && !this.canOpen(ilockablecontainer.getLockCode()) && !this.isSpectator()) { this.playerNetServerHandler - .sendPacket(new S02PacketChat(new ChatComponentTranslation("container.isLocked", + .sendPacket(new S02PacketChat(new TextComponentTranslation("container.isLocked", new Object[] { iinventory.getDisplayName() }), (byte) 2)); this.playerNetServerHandler.sendPacket( new S29PacketSoundEffect("random.door_close", this.posX, this.posY, this.posZ, 1.0F, 1.0F)); @@ -774,7 +774,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { this.openContainer.windowId = this.currentWindowId; this.openContainer.onCraftGuiOpened(this); InventoryMerchant inventorymerchant = ((ContainerMerchant) this.openContainer).getMerchantInventory(); - IChatComponent ichatcomponent = imerchant.getDisplayName(); + ITextComponent ichatcomponent = imerchant.getDisplayName(); this.playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(this.currentWindowId, "minecraft:villager", ichatcomponent, inventorymerchant.getSizeInventory())); MerchantRecipeList merchantrecipelist = imerchant.getRecipes(this); @@ -969,7 +969,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { this.lastHealth = -1.0E8F; } - public void addChatComponentMessage(IChatComponent ichatcomponent) { + public void addChatComponentMessage(ITextComponent ichatcomponent) { this.playerNetServerHandler.sendPacket(new S02PacketChat(ichatcomponent)); } @@ -1089,7 +1089,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { this.playerNetServerHandler.sendPacket(new S02PacketChat(ichatcomponent)); } @@ -1224,7 +1224,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { * the player's name, return a different value to display the * specified text instead of the player's name */ - public IChatComponent getTabListDisplayName() { + public ITextComponent getTabListDisplayName() { return null; } diff --git a/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java b/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java index 7b91cd9..bda5548 100644 --- a/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java +++ b/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java @@ -1,7 +1,7 @@ package net.minecraft.entity.player; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -41,13 +41,13 @@ public enum EnumPlayerModelParts { private final int partId; private final int partMask; private final String partName; - private final IChatComponent field_179339_k; + private final ITextComponent field_179339_k; private EnumPlayerModelParts(int partIdIn, String partNameIn) { this.partId = partIdIn; this.partMask = 1 << partIdIn; this.partName = partNameIn; - this.field_179339_k = new ChatComponentTranslation("options.modelPart." + partNameIn, new Object[0]); + this.field_179339_k = new TextComponentTranslation("options.modelPart." + partNameIn, new Object[0]); } public int getPartMask() { @@ -62,7 +62,7 @@ public enum EnumPlayerModelParts { return this.partName; } - public IChatComponent func_179326_d() { + public ITextComponent func_179326_d() { return this.field_179339_k; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/entity/player/InventoryPlayer.java b/src/main/java/net/minecraft/entity/player/InventoryPlayer.java index 96f8ae7..2fd94ae 100644 --- a/src/main/java/net/minecraft/entity/player/InventoryPlayer.java +++ b/src/main/java/net/minecraft/entity/player/InventoryPlayer.java @@ -12,10 +12,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ReportedException; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -589,9 +589,9 @@ public class InventoryPlayer implements IInventory { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/entity/projectile/EntityArrow.java index e961e14..c7e1bf0 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityArrow.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityArrow.java @@ -15,14 +15,14 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -221,7 +221,7 @@ public class EntityArrow extends Entity implements IProjectile { if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, blockpos); AxisAlignedBB axisalignedbb = block.getCollisionBoundingBox(this.worldObj, blockpos, iblockstate); - if (axisalignedbb != null && axisalignedbb.isVecInside(new Vec3(this.posX, this.posY, this.posZ))) { + if (axisalignedbb != null && axisalignedbb.isVecInside(new Vec3d(this.posX, this.posY, this.posZ))) { this.inGround = true; } } @@ -248,13 +248,13 @@ public class EntityArrow extends Entity implements IProjectile { } else { ++this.ticksInAir; - Vec3 vec31 = new Vec3(this.posX, this.posY, this.posZ); - Vec3 vec3 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec31, vec3, false, true, false); - vec31 = new Vec3(this.posX, this.posY, this.posZ); - vec3 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec31 = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec3 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec31, vec3, false, true, false); + vec31 = new Vec3d(this.posX, this.posY, this.posZ); + vec3 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { - vec3 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, + vec3 = new Vec3d(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } @@ -269,7 +269,7 @@ public class EntityArrow extends Entity implements IProjectile { float f1 = 0.3F; AxisAlignedBB axisalignedbb1 = entity1.getEntityBoundingBox().expand((double) f1, (double) f1, (double) f1); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); + RayTraceResult movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); if (movingobjectposition1 != null) { double d1 = vec31.squareDistanceTo(movingobjectposition1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -281,7 +281,7 @@ public class EntityArrow extends Entity implements IProjectile { } if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + movingobjectposition = new RayTraceResult(entity); } if (movingobjectposition != null && movingobjectposition.entityHit != null diff --git a/src/main/java/net/minecraft/entity/projectile/EntityEgg.java b/src/main/java/net/minecraft/entity/projectile/EntityEgg.java index 7af643d..d5539d8 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityEgg.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityEgg.java @@ -6,7 +6,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -55,7 +55,7 @@ public class EntityEgg extends EntityThrowable { * + * Called when this EntityThrowable hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { if (movingobjectposition.entityHit != null) { movingobjectposition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0.0F); diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/entity/projectile/EntityFireball.java index ddb5861..1240dba 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityFireball.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityFireball.java @@ -7,14 +7,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -148,13 +148,13 @@ public abstract class EntityFireball extends Entity { ++this.ticksInAir; } - Vec3 vec3 = new Vec3(this.posX, this.posY, this.posZ); - Vec3 vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); - vec3 = new Vec3(this.posX, this.posY, this.posZ); - vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3 = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); + vec3 = new Vec3d(this.posX, this.posY, this.posZ); + vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { - vec31 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, + vec31 = new Vec3d(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } @@ -170,7 +170,7 @@ public abstract class EntityFireball extends Entity { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double) f, (double) f, (double) f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + RayTraceResult movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); if (movingobjectposition1 != null) { double d1 = vec3.squareDistanceTo(movingobjectposition1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -182,7 +182,7 @@ public abstract class EntityFireball extends Entity { } if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + movingobjectposition = new RayTraceResult(entity); } if (movingobjectposition != null) { @@ -251,7 +251,7 @@ public abstract class EntityFireball extends Entity { return 0.95F; } - protected abstract void onImpact(MovingObjectPosition var1); + protected abstract void onImpact(RayTraceResult var1); /** * + @@ -319,7 +319,7 @@ public abstract class EntityFireball extends Entity { } else { this.setBeenAttacked(); if (damagesource.getEntity() != null) { - Vec3 vec3 = damagesource.getEntity().getLookVec(); + Vec3d vec3 = damagesource.getEntity().getLookVec(); if (vec3 != null) { this.motionX = vec3.xCoord; this.motionY = vec3.yCoord; diff --git a/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java b/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java index 91dfd0d..9b205aa 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityFishHook.java @@ -16,16 +16,16 @@ import net.minecraft.item.ItemFishFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.StatList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandomFishable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -284,13 +284,13 @@ public class EntityFishHook extends Entity { ++this.ticksInAir; } - Vec3 vec31 = new Vec3(this.posX, this.posY, this.posZ); - Vec3 vec3 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec31, vec3); - vec31 = new Vec3(this.posX, this.posY, this.posZ); - vec3 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec31 = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec3 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec31, vec3); + vec31 = new Vec3d(this.posX, this.posY, this.posZ); + vec3 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { - vec3 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, + vec3 = new Vec3d(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } @@ -305,7 +305,7 @@ public class EntityFishHook extends Entity { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double) f, (double) f, (double) f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec31, vec3); + RayTraceResult movingobjectposition1 = axisalignedbb.calculateIntercept(vec31, vec3); if (movingobjectposition1 != null) { double d2 = vec31.squareDistanceTo(movingobjectposition1.hitVec); if (d2 < d0 || d0 == 0.0D) { @@ -317,7 +317,7 @@ public class EntityFishHook extends Entity { } if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + movingobjectposition = new RayTraceResult(entity); } if (movingobjectposition != null) { diff --git a/src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java b/src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java index fce749c..b1e198e 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityLargeFireball.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -56,7 +56,7 @@ public class EntityLargeFireball extends EntityFireball { * + * Called when this EntityFireball hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { if (!this.worldObj.isRemote) { if (movingobjectposition.entityHit != null) { movingobjectposition.entityHit diff --git a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java index 90d6b3f..5b27de6 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -112,7 +112,7 @@ public class EntityPotion extends EntityThrowable { * + * Called when this EntityThrowable hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { if (!this.worldObj.isRemote) { List list = Items.potionitem.getEffects(this.potionDamage); if (list != null && !list.isEmpty()) { diff --git a/src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java b/src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java index c6d3c59..a4fdbda 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/entity/projectile/EntitySmallFireball.java @@ -3,9 +3,9 @@ package net.minecraft.entity.projectile; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -58,7 +58,7 @@ public class EntitySmallFireball extends EntityFireball { * + * Called when this EntityFireball hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { if (!this.worldObj.isRemote) { if (movingobjectposition.entityHit != null) { boolean flag = movingobjectposition.entityHit diff --git a/src/main/java/net/minecraft/entity/projectile/EntitySnowball.java b/src/main/java/net/minecraft/entity/projectile/EntitySnowball.java index f0f93a5..47d86f0 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntitySnowball.java +++ b/src/main/java/net/minecraft/entity/projectile/EntitySnowball.java @@ -4,7 +4,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -53,7 +53,7 @@ public class EntitySnowball extends EntityThrowable { * + * Called when this EntityThrowable hits a block or entity. */ - protected void onImpact(MovingObjectPosition parMovingObjectPosition) { + protected void onImpact(RayTraceResult parMovingObjectPosition) { if (parMovingObjectPosition.entityHit != null) { byte b0 = 0; if (parMovingObjectPosition.entityHit instanceof EntityBlaze) { diff --git a/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java b/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java index 07e47f1..ed9177d 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityThrowable.java @@ -9,13 +9,13 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -198,13 +198,13 @@ public abstract class EntityThrowable extends Entity implements IProjectile { ++this.ticksInAir; } - Vec3 vec3 = new Vec3(this.posX, this.posY, this.posZ); - Vec3 vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); - vec3 = new Vec3(this.posX, this.posY, this.posZ); - vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3 = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); + vec3 = new Vec3d(this.posX, this.posY, this.posZ); + vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { - vec31 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, + vec31 = new Vec3d(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } @@ -221,7 +221,7 @@ public abstract class EntityThrowable extends Entity implements IProjectile { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double) f, (double) f, (double) f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + RayTraceResult movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); if (movingobjectposition1 != null) { double d1 = vec3.squareDistanceTo(movingobjectposition1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -233,12 +233,12 @@ public abstract class EntityThrowable extends Entity implements IProjectile { } if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + movingobjectposition = new RayTraceResult(entity); } } if (movingobjectposition != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { this.func_181015_d(movingobjectposition.getBlockPos()); } else { @@ -302,7 +302,7 @@ public abstract class EntityThrowable extends Entity implements IProjectile { return 0.03F; } - protected abstract void onImpact(MovingObjectPosition var1); + protected abstract void onImpact(RayTraceResult var1); /** * + diff --git a/src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java b/src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java index 1780cfc..422ff7d 100644 --- a/src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java +++ b/src/main/java/net/minecraft/entity/projectile/EntityWitherSkull.java @@ -6,9 +6,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityWither; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.Explosion; import net.minecraft.world.World; @@ -94,7 +94,7 @@ public class EntityWitherSkull extends EntityFireball { * + * Called when this EntityFireball hits a block or entity. */ - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult movingobjectposition) { if (!this.worldObj.isRemote) { if (movingobjectposition.entityHit != null) { if (this.shootingEntity != null) { diff --git a/src/main/java/net/minecraft/init/Bootstrap.java b/src/main/java/net/minecraft/init/Bootstrap.java index 9dac633..a3aaeb0 100644 --- a/src/main/java/net/minecraft/init/Bootstrap.java +++ b/src/main/java/net/minecraft/init/Bootstrap.java @@ -50,9 +50,9 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; diff --git a/src/main/java/net/minecraft/inventory/AnimalChest.java b/src/main/java/net/minecraft/inventory/AnimalChest.java index d9c1996..f466e9d 100644 --- a/src/main/java/net/minecraft/inventory/AnimalChest.java +++ b/src/main/java/net/minecraft/inventory/AnimalChest.java @@ -1,6 +1,6 @@ package net.minecraft.inventory; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -36,7 +36,7 @@ public class AnimalChest extends InventoryBasic { super(inventoryName, false, slotCount); } - public AnimalChest(IChatComponent invTitle, int slotCount) { + public AnimalChest(ITextComponent invTitle, int slotCount) { super(invTitle, slotCount); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/inventory/Container.java b/src/main/java/net/minecraft/inventory/Container.java index 3bcc380..f6d2608 100644 --- a/src/main/java/net/minecraft/inventory/Container.java +++ b/src/main/java/net/minecraft/inventory/Container.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/inventory/ContainerEnchantment.java b/src/main/java/net/minecraft/inventory/ContainerEnchantment.java index d142130..91d8c8f 100644 --- a/src/main/java/net/minecraft/inventory/ContainerEnchantment.java +++ b/src/main/java/net/minecraft/inventory/ContainerEnchantment.java @@ -11,7 +11,7 @@ import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/inventory/ContainerRepair.java b/src/main/java/net/minecraft/inventory/ContainerRepair.java index dc7c129..1c26802 100644 --- a/src/main/java/net/minecraft/inventory/ContainerRepair.java +++ b/src/main/java/net/minecraft/inventory/ContainerRepair.java @@ -11,7 +11,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.apache.commons.lang3.StringUtils; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; @@ -327,10 +327,9 @@ public class ContainerRepair extends Container { k2 = itemstack2.getRepairCost(); } - if (b0 != i || b0 == 0) - { - k2 = k2 * 2 + 1; - } + if (b0 != i || b0 == 0) { + k2 = k2 * 2 + 1; + } itemstack1.setRepairCost(k2); EnchantmentHelper.setEnchantments(map, itemstack1); } diff --git a/src/main/java/net/minecraft/inventory/ContainerWorkbench.java b/src/main/java/net/minecraft/inventory/ContainerWorkbench.java index dc6fb79..fe30be2 100644 --- a/src/main/java/net/minecraft/inventory/ContainerWorkbench.java +++ b/src/main/java/net/minecraft/inventory/ContainerWorkbench.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/inventory/InventoryBasic.java b/src/main/java/net/minecraft/inventory/InventoryBasic.java index 7a4fba8..915c044 100644 --- a/src/main/java/net/minecraft/inventory/InventoryBasic.java +++ b/src/main/java/net/minecraft/inventory/InventoryBasic.java @@ -6,9 +6,9 @@ import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -53,7 +53,7 @@ public class InventoryBasic implements IInventory { this.inventoryContents = new ItemStack[slotCount]; } - public InventoryBasic(IChatComponent title, int slotCount) { + public InventoryBasic(ITextComponent title, int slotCount) { this(title.getUnformattedText(), true, slotCount); } @@ -203,9 +203,9 @@ public class InventoryBasic implements IInventory { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/inventory/InventoryCraftResult.java b/src/main/java/net/minecraft/inventory/InventoryCraftResult.java index 241854f..19fd4a0 100644 --- a/src/main/java/net/minecraft/inventory/InventoryCraftResult.java +++ b/src/main/java/net/minecraft/inventory/InventoryCraftResult.java @@ -2,9 +2,9 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -81,9 +81,9 @@ public class InventoryCraftResult implements IInventory { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/inventory/InventoryCrafting.java b/src/main/java/net/minecraft/inventory/InventoryCrafting.java index 6ab0364..34abf68 100644 --- a/src/main/java/net/minecraft/inventory/InventoryCrafting.java +++ b/src/main/java/net/minecraft/inventory/InventoryCrafting.java @@ -2,9 +2,9 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -98,9 +98,9 @@ public class InventoryCrafting implements IInventory { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/inventory/InventoryHelper.java b/src/main/java/net/minecraft/inventory/InventoryHelper.java index 70aad14..9eebf2b 100644 --- a/src/main/java/net/minecraft/inventory/InventoryHelper.java +++ b/src/main/java/net/minecraft/inventory/InventoryHelper.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/inventory/InventoryLargeChest.java b/src/main/java/net/minecraft/inventory/InventoryLargeChest.java index 82b6316..bfbc30c 100644 --- a/src/main/java/net/minecraft/inventory/InventoryLargeChest.java +++ b/src/main/java/net/minecraft/inventory/InventoryLargeChest.java @@ -3,9 +3,9 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.ILockableContainer; import net.minecraft.world.LockCode; @@ -103,9 +103,9 @@ public class InventoryLargeChest implements ILockableContainer { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/inventory/InventoryMerchant.java b/src/main/java/net/minecraft/inventory/InventoryMerchant.java index 45a3e17..a93eb64 100644 --- a/src/main/java/net/minecraft/inventory/InventoryMerchant.java +++ b/src/main/java/net/minecraft/inventory/InventoryMerchant.java @@ -3,9 +3,9 @@ package net.minecraft.inventory; import net.minecraft.entity.IMerchant; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; @@ -164,9 +164,9 @@ public class InventoryMerchant implements IInventory { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } /** diff --git a/src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java b/src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java index 3184868..f960348 100644 --- a/src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java +++ b/src/main/java/net/minecraft/inventory/SlotFurnaceOutput.java @@ -6,7 +6,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.stats.AchievementList; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/item/Item.java b/src/main/java/net/minecraft/item/Item.java index c9837ce..bb0bddd 100644 --- a/src/main/java/net/minecraft/item/Item.java +++ b/src/main/java/net/minecraft/item/Item.java @@ -42,16 +42,16 @@ import net.minecraft.init.Items; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionHelper; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IRegistry; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.RegistryNamespaced; -import net.minecraft.util.RegistrySimple; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.IRegistry; +import net.minecraft.util.registry.RegistryNamespaced; +import net.minecraft.util.registry.RegistrySimple; import net.minecraft.world.World; /** @@ -509,14 +509,14 @@ public class Item { return this.getItemStackLimit() == 1 && this.isDamageable(); } - protected MovingObjectPosition getMovingObjectPositionFromPlayer(World worldIn, EntityPlayer playerIn, + protected RayTraceResult getMovingObjectPositionFromPlayer(World worldIn, EntityPlayer playerIn, boolean useLiquids) { float f = playerIn.rotationPitch; float f1 = playerIn.rotationYaw; double d0 = playerIn.posX; double d1 = playerIn.posY + (double) playerIn.getEyeHeight(); double d2 = playerIn.posZ; - Vec3 vec3 = new Vec3(d0, d1, d2); + Vec3d vec3 = new Vec3d(d0, d1, d2); float f2 = MathHelper.cos(-f1 * 0.017453292F - 3.1415927F); float f3 = MathHelper.sin(-f1 * 0.017453292F - 3.1415927F); float f4 = -MathHelper.cos(-f * 0.017453292F); @@ -524,7 +524,7 @@ public class Item { float f6 = f3 * f4; float f7 = f2 * f4; double d3 = 5.0D; - Vec3 vec31 = vec3.addVector((double) f6 * d3, (double) f5 * d3, (double) f7 * d3); + Vec3d vec31 = vec3.addVector((double) f6 * d3, (double) f5 * d3, (double) f7 * d3); return worldIn.rayTraceBlocks(vec3, vec31, useLiquids, !useLiquids, false); } diff --git a/src/main/java/net/minecraft/item/ItemArmor.java b/src/main/java/net/minecraft/item/ItemArmor.java index c8787fa..b3acb0e 100644 --- a/src/main/java/net/minecraft/item/ItemArmor.java +++ b/src/main/java/net/minecraft/item/ItemArmor.java @@ -20,9 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EntitySelectors; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -60,7 +60,11 @@ public class ItemArmor extends Item { * Holds the 'base' maxDamage that each armorType have. */ private static final int[] maxDamageArray = new int[] { 11, 16, 15, 13 }; - private static final EaglercraftUUID[] ARMOR_MODIFIERS = new EaglercraftUUID[] {EaglercraftUUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), EaglercraftUUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"), EaglercraftUUID.fromString("9F3D476D-C118-4544-8365-64846904B48E"), EaglercraftUUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150")}; + private static final EaglercraftUUID[] ARMOR_MODIFIERS = new EaglercraftUUID[] { + EaglercraftUUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), + EaglercraftUUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"), + EaglercraftUUID.fromString("9F3D476D-C118-4544-8365-64846904B48E"), + EaglercraftUUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150") }; public static final String[] EMPTY_SLOT_NAMES = new String[] { "minecraft:items/empty_armor_slot_helmet", "minecraft:items/empty_armor_slot_chestplate", "minecraft:items/empty_armor_slot_leggings", @@ -96,7 +100,7 @@ public class ItemArmor extends Item { }; public final int armorType; public final int damageReduceAmount; - public final float field_189415_e; + public final float field_189415_e; public final int renderIndex; private final ItemArmor.ArmorMaterial material; @@ -107,7 +111,7 @@ public class ItemArmor extends Item { this.renderIndex = renderIndex; this.damageReduceAmount = material.getDamageReductionAmount(armorType); this.setMaxDamage(material.getDurability(armorType)); - this.field_189415_e = material.func_189416_e(); + this.field_189415_e = material.func_189416_e(); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.tabCombat); BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior); @@ -239,21 +243,22 @@ public class ItemArmor extends Item { return itemstack; } - public Multimap getItemAttributeModifiers(int equipmentSlot) - { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + public Multimap getItemAttributeModifiers(int equipmentSlot) { + Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - if (equipmentSlot == this.armorType) - { - multimap.put(SharedMonsterAttributes.ARMOR.getAttributeUnlocalizedName(), new AttributeModifier(ARMOR_MODIFIERS[equipmentSlot], "Armor modifier", (double)this.damageReduceAmount, 0)); - multimap.put(SharedMonsterAttributes.field_189429_h.getAttributeUnlocalizedName(), new AttributeModifier(ARMOR_MODIFIERS[equipmentSlot], "Armor toughness", (double)this.field_189415_e, 0)); - } + if (equipmentSlot == this.armorType) { + multimap.put(SharedMonsterAttributes.ARMOR.getAttributeUnlocalizedName(), new AttributeModifier( + ARMOR_MODIFIERS[equipmentSlot], "Armor modifier", (double) this.damageReduceAmount, 0)); + multimap.put(SharedMonsterAttributes.field_189429_h.getAttributeUnlocalizedName(), new AttributeModifier( + ARMOR_MODIFIERS[equipmentSlot], "Armor toughness", (double) this.field_189415_e, 0)); + } - return multimap; - } + return multimap; + } public static enum ArmorMaterial { - LEATHER("leather", 5, new int[] { 1, 3, 2, 1 }, 15, 0.0F), CHAIN("chainmail", 15, new int[] { 2, 5, 4, 1 }, 12, 0.0F), + LEATHER("leather", 5, new int[] { 1, 3, 2, 1 }, 15, 0.0F), + CHAIN("chainmail", 15, new int[] { 2, 5, 4, 1 }, 12, 0.0F), IRON("iron", 15, new int[] { 2, 6, 5, 2 }, 9, 0.0F), GOLD("gold", 7, new int[] { 2, 5, 3, 1 }, 25, 0.0F), DIAMOND("diamond", 33, new int[] { 3, 8, 6, 3 }, 10, 2.0F); diff --git a/src/main/java/net/minecraft/item/ItemArmorStand.java b/src/main/java/net/minecraft/item/ItemArmorStand.java index abc2074..2d1fae7 100644 --- a/src/main/java/net/minecraft/item/ItemArmorStand.java +++ b/src/main/java/net/minecraft/item/ItemArmorStand.java @@ -7,11 +7,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.Rotations; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemBanner.java b/src/main/java/net/minecraft/item/ItemBanner.java index 4c02d3c..928efbc 100644 --- a/src/main/java/net/minecraft/item/ItemBanner.java +++ b/src/main/java/net/minecraft/item/ItemBanner.java @@ -10,10 +10,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBanner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemBed.java b/src/main/java/net/minecraft/item/ItemBed.java index e44b89e..26df59c 100644 --- a/src/main/java/net/minecraft/item/ItemBed.java +++ b/src/main/java/net/minecraft/item/ItemBed.java @@ -6,9 +6,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemBlock.java b/src/main/java/net/minecraft/item/ItemBlock.java index 7c19677..7e0b186 100644 --- a/src/main/java/net/minecraft/item/ItemBlock.java +++ b/src/main/java/net/minecraft/item/ItemBlock.java @@ -10,8 +10,8 @@ import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemBoat.java b/src/main/java/net/minecraft/item/ItemBoat.java index 275ab04..2efb799 100644 --- a/src/main/java/net/minecraft/item/ItemBoat.java +++ b/src/main/java/net/minecraft/item/ItemBoat.java @@ -8,11 +8,11 @@ import net.minecraft.entity.item.EntityBoat; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.stats.StatList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -63,7 +63,7 @@ public class ItemBoat extends Item { double d1 = entityplayer.prevPosY + (entityplayer.posY - entityplayer.prevPosY) * (double) f + (double) entityplayer.getEyeHeight(); double d2 = entityplayer.prevPosZ + (entityplayer.posZ - entityplayer.prevPosZ) * (double) f; - Vec3 vec3 = new Vec3(d0, d1, d2); + Vec3d vec3 = new Vec3d(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.1415927F); float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.1415927F); float f5 = -MathHelper.cos(-f1 * 0.017453292F); @@ -71,12 +71,12 @@ public class ItemBoat extends Item { float f7 = f4 * f5; float f8 = f3 * f5; double d3 = 5.0D; - Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); - MovingObjectPosition movingobjectposition = world.rayTraceBlocks(vec3, vec31, true); + Vec3d vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); + RayTraceResult movingobjectposition = world.rayTraceBlocks(vec3, vec31, true); if (movingobjectposition == null) { return itemstack; } else { - Vec3 vec32 = entityplayer.getLook(f); + Vec3d vec32 = entityplayer.getLook(f); boolean flag = false; float f9 = 1.0F; List list = world.getEntitiesWithinAABBExcludingEntity(entityplayer, @@ -99,7 +99,7 @@ public class ItemBoat extends Item { if (flag) { return itemstack; } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (world.getBlockState(blockpos).getBlock() == Blocks.snow_layer) { blockpos = blockpos.down(); diff --git a/src/main/java/net/minecraft/item/ItemBucket.java b/src/main/java/net/minecraft/item/ItemBucket.java index 39b8a5c..d4556bf 100644 --- a/src/main/java/net/minecraft/item/ItemBucket.java +++ b/src/main/java/net/minecraft/item/ItemBucket.java @@ -9,9 +9,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -59,11 +59,11 @@ public class ItemBucket extends Item { */ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { boolean flag = this.isFull == Blocks.air; - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, flag); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, flag); if (movingobjectposition == null) { return itemstack; } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(entityplayer, blockpos)) { return itemstack; diff --git a/src/main/java/net/minecraft/item/ItemChorusFruit.java b/src/main/java/net/minecraft/item/ItemChorusFruit.java index b6c7b69..31ef35b 100644 --- a/src/main/java/net/minecraft/item/ItemChorusFruit.java +++ b/src/main/java/net/minecraft/item/ItemChorusFruit.java @@ -2,7 +2,7 @@ package net.minecraft.item; import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class ItemChorusFruit extends ItemFood { diff --git a/src/main/java/net/minecraft/item/ItemDoor.java b/src/main/java/net/minecraft/item/ItemDoor.java index 1d5765f..6ff9a97 100644 --- a/src/main/java/net/minecraft/item/ItemDoor.java +++ b/src/main/java/net/minecraft/item/ItemDoor.java @@ -5,8 +5,8 @@ import net.minecraft.block.BlockDoor; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemDye.java b/src/main/java/net/minecraft/item/ItemDye.java index 7ae83a1..859827b 100644 --- a/src/main/java/net/minecraft/item/ItemDye.java +++ b/src/main/java/net/minecraft/item/ItemDye.java @@ -12,9 +12,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemEditableBook.java b/src/main/java/net/minecraft/item/ItemEditableBook.java index 50819e7..caf4513 100644 --- a/src/main/java/net/minecraft/item/ItemEditableBook.java +++ b/src/main/java/net/minecraft/item/ItemEditableBook.java @@ -10,12 +10,12 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.stats.StatList; -import net.minecraft.util.ChatComponentProcessor; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; +import net.minecraft.util.text.TextComponentUtils; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -130,15 +130,15 @@ public class ItemEditableBook extends Item { for (int i = 0; i < nbttaglist.tagCount(); ++i) { String s = nbttaglist.getStringTagAt(i); - IChatComponent ichatcomponent; + ITextComponent ichatcomponent; try { - ichatcomponent = IChatComponent.Serializer.jsonToComponent(s); - ichatcomponent = ChatComponentProcessor.processComponent(player, ichatcomponent, player); + ichatcomponent = ITextComponent.Serializer.jsonToComponent(s); + ichatcomponent = TextComponentUtils.processComponent(player, ichatcomponent, player); } catch (Exception var9) { - ichatcomponent = new ChatComponentText(s); + ichatcomponent = new TextComponentString(s); } - nbttaglist.set(i, new NBTTagString(IChatComponent.Serializer.componentToJson(ichatcomponent))); + nbttaglist.set(i, new NBTTagString(ITextComponent.Serializer.componentToJson(ichatcomponent))); } nbttagcompound.setTag("pages", nbttaglist); diff --git a/src/main/java/net/minecraft/item/ItemEndCrystal.java b/src/main/java/net/minecraft/item/ItemEndCrystal.java index c43ee23..a61e892 100644 --- a/src/main/java/net/minecraft/item/ItemEndCrystal.java +++ b/src/main/java/net/minecraft/item/ItemEndCrystal.java @@ -8,9 +8,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemEndCrystal extends Item { diff --git a/src/main/java/net/minecraft/item/ItemEnderEye.java b/src/main/java/net/minecraft/item/ItemEnderEye.java index 30e2e9d..9adf4a7 100644 --- a/src/main/java/net/minecraft/item/ItemEnderEye.java +++ b/src/main/java/net/minecraft/item/ItemEnderEye.java @@ -7,10 +7,10 @@ import net.minecraft.entity.item.EntityEnderEye; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -151,9 +151,9 @@ public class ItemEnderEye extends Item { * button is pressed. Args: itemStack, world, entityPlayer */ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, false); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, false); if (movingobjectposition != null - && movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK + && movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && world.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.end_portal_frame) { return itemstack; } else { diff --git a/src/main/java/net/minecraft/item/ItemFireball.java b/src/main/java/net/minecraft/item/ItemFireball.java index b24373d..5da768b 100644 --- a/src/main/java/net/minecraft/item/ItemFireball.java +++ b/src/main/java/net/minecraft/item/ItemFireball.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemFirework.java b/src/main/java/net/minecraft/item/ItemFirework.java index b4ef164..3e3de63 100644 --- a/src/main/java/net/minecraft/item/ItemFirework.java +++ b/src/main/java/net/minecraft/item/ItemFirework.java @@ -7,9 +7,9 @@ import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemFlintAndSteel.java b/src/main/java/net/minecraft/item/ItemFlintAndSteel.java index c55d466..8e0b720 100644 --- a/src/main/java/net/minecraft/item/ItemFlintAndSteel.java +++ b/src/main/java/net/minecraft/item/ItemFlintAndSteel.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemGlassBottle.java b/src/main/java/net/minecraft/item/ItemGlassBottle.java index 06311a2..2b1e0f2 100644 --- a/src/main/java/net/minecraft/item/ItemGlassBottle.java +++ b/src/main/java/net/minecraft/item/ItemGlassBottle.java @@ -5,8 +5,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -49,11 +49,11 @@ public class ItemGlassBottle extends Item { * button is pressed. Args: itemStack, world, entityPlayer */ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); if (movingobjectposition == null) { return itemstack; } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(entityplayer, blockpos)) { return itemstack; diff --git a/src/main/java/net/minecraft/item/ItemHangingEntity.java b/src/main/java/net/minecraft/item/ItemHangingEntity.java index 866f9be..ba0bdd4 100644 --- a/src/main/java/net/minecraft/item/ItemHangingEntity.java +++ b/src/main/java/net/minecraft/item/ItemHangingEntity.java @@ -5,8 +5,8 @@ import net.minecraft.entity.EntityHanging; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemHoe.java b/src/main/java/net/minecraft/item/ItemHoe.java index 469f28e..37561cf 100644 --- a/src/main/java/net/minecraft/item/ItemHoe.java +++ b/src/main/java/net/minecraft/item/ItemHoe.java @@ -13,8 +13,8 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -48,14 +48,14 @@ import net.minecraft.world.World; */ public class ItemHoe extends Item { protected Item.ToolMaterial theToolMaterial; - private final float speed; + private final float speed; public ItemHoe(Item.ToolMaterial material) { this.theToolMaterial = material; this.maxStackSize = 1; this.setMaxDamage(material.getMaxUses()); this.setCreativeTab(CreativeTabs.tabTools); - this.speed = material.getDamageVsEntity() + 1.0F; + this.speed = material.getDamageVsEntity() + 1.0F; } diff --git a/src/main/java/net/minecraft/item/ItemLead.java b/src/main/java/net/minecraft/item/ItemLead.java index f08f253..9deaea1 100644 --- a/src/main/java/net/minecraft/item/ItemLead.java +++ b/src/main/java/net/minecraft/item/ItemLead.java @@ -8,9 +8,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLeashKnot; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemLilyPad.java b/src/main/java/net/minecraft/item/ItemLilyPad.java index a5e5718..008c14d 100644 --- a/src/main/java/net/minecraft/item/ItemLilyPad.java +++ b/src/main/java/net/minecraft/item/ItemLilyPad.java @@ -7,8 +7,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -51,11 +51,11 @@ public class ItemLilyPad extends ItemColored { * button is pressed. Args: itemStack, world, entityPlayer */ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); if (movingobjectposition == null) { return itemstack; } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(entityplayer, blockpos)) { return itemstack; diff --git a/src/main/java/net/minecraft/item/ItemMap.java b/src/main/java/net/minecraft/item/ItemMap.java index ffdba95..66d4bc8 100644 --- a/src/main/java/net/minecraft/item/ItemMap.java +++ b/src/main/java/net/minecraft/item/ItemMap.java @@ -16,8 +16,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.network.Packet; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.storage.MapData; diff --git a/src/main/java/net/minecraft/item/ItemMinecart.java b/src/main/java/net/minecraft/item/ItemMinecart.java index b77c91e..720b664 100644 --- a/src/main/java/net/minecraft/item/ItemMinecart.java +++ b/src/main/java/net/minecraft/item/ItemMinecart.java @@ -10,8 +10,8 @@ import net.minecraft.dispenser.IBehaviorDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemMonsterPlacer.java b/src/main/java/net/minecraft/item/ItemMonsterPlacer.java index f3dc7d2..312aa06 100644 --- a/src/main/java/net/minecraft/item/ItemMonsterPlacer.java +++ b/src/main/java/net/minecraft/item/ItemMonsterPlacer.java @@ -16,11 +16,11 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -134,12 +134,12 @@ public class ItemMonsterPlacer extends Item { if (world.isRemote) { return itemstack; } else { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); if (movingobjectposition == null) { return itemstack; } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); if (!world.isBlockModifiable(entityplayer, blockpos)) { return itemstack; diff --git a/src/main/java/net/minecraft/item/ItemRecord.java b/src/main/java/net/minecraft/item/ItemRecord.java index 1516926..83c6406 100644 --- a/src/main/java/net/minecraft/item/ItemRecord.java +++ b/src/main/java/net/minecraft/item/ItemRecord.java @@ -11,9 +11,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemRedstone.java b/src/main/java/net/minecraft/item/ItemRedstone.java index 9abb0b7..8edac5b 100644 --- a/src/main/java/net/minecraft/item/ItemRedstone.java +++ b/src/main/java/net/minecraft/item/ItemRedstone.java @@ -5,8 +5,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemReed.java b/src/main/java/net/minecraft/item/ItemReed.java index c7c3bec..1ea7b38 100644 --- a/src/main/java/net/minecraft/item/ItemReed.java +++ b/src/main/java/net/minecraft/item/ItemReed.java @@ -6,8 +6,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSeedFood.java b/src/main/java/net/minecraft/item/ItemSeedFood.java index 1dca9db..1b19257 100644 --- a/src/main/java/net/minecraft/item/ItemSeedFood.java +++ b/src/main/java/net/minecraft/item/ItemSeedFood.java @@ -2,8 +2,8 @@ package net.minecraft.item; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSeeds.java b/src/main/java/net/minecraft/item/ItemSeeds.java index e7ddae3..36150c9 100644 --- a/src/main/java/net/minecraft/item/ItemSeeds.java +++ b/src/main/java/net/minecraft/item/ItemSeeds.java @@ -3,8 +3,8 @@ package net.minecraft.item; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemShears.java b/src/main/java/net/minecraft/item/ItemShears.java index c63c0c0..7db8676 100644 --- a/src/main/java/net/minecraft/item/ItemShears.java +++ b/src/main/java/net/minecraft/item/ItemShears.java @@ -5,7 +5,7 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSign.java b/src/main/java/net/minecraft/item/ItemSign.java index 0257e90..773eecc 100644 --- a/src/main/java/net/minecraft/item/ItemSign.java +++ b/src/main/java/net/minecraft/item/ItemSign.java @@ -8,9 +8,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -70,7 +70,7 @@ public class ItemSign extends Item { return true; } else { blockpos = flag ? blockpos.down() : blockpos; - + if (enumfacing == EnumFacing.UP) { int i = MathHelper .floor_double((double) ((entityplayer.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15; diff --git a/src/main/java/net/minecraft/item/ItemSkull.java b/src/main/java/net/minecraft/item/ItemSkull.java index d97084c..7819011 100644 --- a/src/main/java/net/minecraft/item/ItemSkull.java +++ b/src/main/java/net/minecraft/item/ItemSkull.java @@ -13,10 +13,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSlab.java b/src/main/java/net/minecraft/item/ItemSlab.java index 747bf7d..ce2e5ae 100644 --- a/src/main/java/net/minecraft/item/ItemSlab.java +++ b/src/main/java/net/minecraft/item/ItemSlab.java @@ -5,8 +5,8 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSnow.java b/src/main/java/net/minecraft/item/ItemSnow.java index f7d7faa..bfc25fd 100644 --- a/src/main/java/net/minecraft/item/ItemSnow.java +++ b/src/main/java/net/minecraft/item/ItemSnow.java @@ -4,9 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSnow; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/item/ItemSpade.java b/src/main/java/net/minecraft/item/ItemSpade.java index 318c50e..9b59f67 100644 --- a/src/main/java/net/minecraft/item/ItemSpade.java +++ b/src/main/java/net/minecraft/item/ItemSpade.java @@ -12,8 +12,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.audio.SoundCategory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -46,13 +46,14 @@ import net.minecraft.world.World; * */ public class ItemSpade extends ItemTool { - private static Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, - Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand, - EaglerItems.getEaglerBlock("grass_path") }); + private static Set EFFECTIVE_ON = Sets + .newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, + Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand, + EaglerItems.getEaglerBlock("grass_path") }); - public ItemSpade(Item.ToolMaterial material) { - super(1.5F, -3.0F, material, EFFECTIVE_ON); - } + public ItemSpade(Item.ToolMaterial material) { + super(1.5F, -3.0F, material, EFFECTIVE_ON); + } /** * + diff --git a/src/main/java/net/minecraft/item/ItemStack.java b/src/main/java/net/minecraft/item/ItemStack.java index 5a4db5b..ffe109e 100644 --- a/src/main/java/net/minecraft/item/ItemStack.java +++ b/src/main/java/net/minecraft/item/ItemStack.java @@ -26,20 +26,20 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.event.HoverEvent; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.event.HoverEvent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -984,18 +984,18 @@ public final class ItemStack { * Get a ChatComponent for this Item's display name that shows * this Item on hover */ - public IChatComponent getChatComponent() { - ChatComponentText chatcomponenttext = new ChatComponentText(this.getDisplayName()); + public ITextComponent getChatComponent() { + TextComponentString chatcomponenttext = new TextComponentString(this.getDisplayName()); if (this.hasDisplayName()) { chatcomponenttext.getChatStyle().setItalic(Boolean.valueOf(true)); } - IChatComponent ichatcomponent = (new ChatComponentText("[")).appendSibling(chatcomponenttext).appendText("]"); + ITextComponent ichatcomponent = (new TextComponentString("[")).appendSibling(chatcomponenttext).appendText("]"); if (this.item != null) { NBTTagCompound nbttagcompound = new NBTTagCompound(); this.writeToNBT(nbttagcompound); ichatcomponent.getChatStyle().setChatHoverEvent( - new HoverEvent(HoverEvent.Action.SHOW_ITEM, new ChatComponentText(nbttagcompound.toString()))); + new HoverEvent(HoverEvent.Action.SHOW_ITEM, new TextComponentString(nbttagcompound.toString()))); ichatcomponent.getChatStyle().setColor(this.getRarity().rarityColor); } diff --git a/src/main/java/net/minecraft/item/ItemSword.java b/src/main/java/net/minecraft/item/ItemSword.java index 3fa7e51..986de25 100644 --- a/src/main/java/net/minecraft/item/ItemSword.java +++ b/src/main/java/net/minecraft/item/ItemSword.java @@ -10,7 +10,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -170,8 +170,9 @@ public class ItemSword extends Item { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", (double) this.attackDamage, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0)); - + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), + new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0)); + return multimap; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/item/ItemTool.java b/src/main/java/net/minecraft/item/ItemTool.java index cd0fdc0..65df770 100644 --- a/src/main/java/net/minecraft/item/ItemTool.java +++ b/src/main/java/net/minecraft/item/ItemTool.java @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** @@ -46,32 +46,30 @@ public class ItemTool extends Item { private Set effectiveBlocks; protected float efficiencyOnProperMaterial = 4.0F; protected float damageVsEntity; - protected float attackSpeed; + protected float attackSpeed; protected Item.ToolMaterial toolMaterial; - protected ItemTool(float attackDamageIn, float attackSpeedIn, Item.ToolMaterial materialIn, Set effectiveBlocksIn) - { - this.efficiencyOnProperMaterial = 4.0F; - this.toolMaterial = materialIn; - this.effectiveBlocks = effectiveBlocksIn; - this.maxStackSize = 1; - this.setMaxDamage(materialIn.getMaxUses()); - this.efficiencyOnProperMaterial = materialIn.getEfficiencyOnProperMaterial(); - this.damageVsEntity = attackDamageIn + materialIn.getDamageVsEntity(); - this.attackSpeed = attackSpeedIn; - this.setCreativeTab(CreativeTabs.tabTools); - } + protected ItemTool(float attackDamageIn, float attackSpeedIn, Item.ToolMaterial materialIn, + Set effectiveBlocksIn) { + this.efficiencyOnProperMaterial = 4.0F; + this.toolMaterial = materialIn; + this.effectiveBlocks = effectiveBlocksIn; + this.maxStackSize = 1; + this.setMaxDamage(materialIn.getMaxUses()); + this.efficiencyOnProperMaterial = materialIn.getEfficiencyOnProperMaterial(); + this.damageVsEntity = attackDamageIn + materialIn.getDamageVsEntity(); + this.attackSpeed = attackSpeedIn; + this.setCreativeTab(CreativeTabs.tabTools); + } - protected ItemTool(Item.ToolMaterial materialIn, Set effectiveBlocksIn) - { - this(0.0F, 0.0F, materialIn, effectiveBlocksIn); - } + protected ItemTool(Item.ToolMaterial materialIn, Set effectiveBlocksIn) { + this(0.0F, 0.0F, materialIn, effectiveBlocksIn); + } - public float getStrVsBlock(ItemStack stack, IBlockState state) - { - return this.effectiveBlocks.contains(state.getBlock()) ? this.efficiencyOnProperMaterial : 1.0F; - } + public float getStrVsBlock(ItemStack stack, IBlockState state) { + return this.effectiveBlocks.contains(state.getBlock()) ? this.efficiencyOnProperMaterial : 1.0F; + } public float getStrVsBlock(ItemStack var1, Block block) { return this.effectiveBlocks.contains(block) ? this.efficiencyOnProperMaterial : 1.0F; @@ -140,16 +138,17 @@ public class ItemTool extends Item { : super.getIsRepairable(itemstack, itemstack1); } - public Multimap getItemAttributeModifiers(int equipmentSlot) - { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + public Multimap getItemAttributeModifiers(int equipmentSlot) { + Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); - // if (equipmentSlot == EntityEquipmentSlot.MAINHAND) - // { - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", (double)this.damageVsEntity, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", (double)this.attackSpeed, 0)); - // } + // if (equipmentSlot == EntityEquipmentSlot.MAINHAND) + // { + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", (double) this.damageVsEntity, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), + new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", (double) this.attackSpeed, 0)); + // } - return multimap; - } + return multimap; + } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/nbt/NBTTagDouble.java b/src/main/java/net/minecraft/nbt/NBTTagDouble.java index 89ac831..51addb2 100644 --- a/src/main/java/net/minecraft/nbt/NBTTagDouble.java +++ b/src/main/java/net/minecraft/nbt/NBTTagDouble.java @@ -4,7 +4,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/nbt/NBTTagFloat.java b/src/main/java/net/minecraft/nbt/NBTTagFloat.java index 2a681b4..31e6c81 100644 --- a/src/main/java/net/minecraft/nbt/NBTTagFloat.java +++ b/src/main/java/net/minecraft/nbt/NBTTagFloat.java @@ -4,7 +4,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/nbt/NBTUtil.java b/src/main/java/net/minecraft/nbt/NBTUtil.java index 3848d1d..9a87c9b 100644 --- a/src/main/java/net/minecraft/nbt/NBTUtil.java +++ b/src/main/java/net/minecraft/nbt/NBTUtil.java @@ -7,8 +7,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; -import net.minecraft.util.BlockPos; import net.minecraft.util.StringUtils; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/INetHandler.java b/src/main/java/net/minecraft/network/INetHandler.java index 6d41477..83c23d1 100644 --- a/src/main/java/net/minecraft/network/INetHandler.java +++ b/src/main/java/net/minecraft/network/INetHandler.java @@ -1,6 +1,6 @@ package net.minecraft.network; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,5 +37,5 @@ public interface INetHandler { * Invoked when disconnecting, the parameter is a ChatComponent * describing the reason for termination */ - void onDisconnect(IChatComponent var1); + void onDisconnect(ITextComponent var1); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java index a67a46f..9a48a74 100644 --- a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java +++ b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java @@ -81,17 +81,17 @@ import net.minecraft.stats.AchievementList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; import net.minecraft.util.IntHashMap; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldServer; import net.lax1dude.eaglercraft.v1_8.sp.server.socket.IntegratedServerPlayerNetworkManager; import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService; @@ -204,7 +204,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { * Kick a player from the server with a reason */ public void kickPlayerFromServer(String reason) { - final ChatComponentText chatcomponenttext = new ChatComponentText(reason); + final TextComponentString chatcomponenttext = new TextComponentString(reason); this.netManager.sendPacket(new S40PacketDisconnect(chatcomponenttext)); this.netManager.closeChannel(chatcomponenttext); } @@ -566,7 +566,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { flag = true; } else { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation("build.tooHigh", + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation("build.tooHigh", new Object[] { Integer.valueOf(this.serverController.getBuildLimit()) }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); this.playerEntity.playerNetServerHandler.sendPacket(new S02PacketChat(chatcomponenttranslation)); @@ -660,12 +660,12 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { * Invoked when disconnecting, the parameter is a ChatComponent * describing the reason for termination */ - public void onDisconnect(IChatComponent ichatcomponent) { + public void onDisconnect(ITextComponent ichatcomponent) { if (!hasDisconnected) { hasDisconnected = true; logger.info(this.playerEntity.getName() + " lost connection: " + ichatcomponent); this.serverController.refreshStatusNextTick(); - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation("multiplayer.player.left", + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation("multiplayer.player.left", new Object[] { this.playerEntity.getDisplayName() }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.YELLOW); this.serverController.getConfigurationManager().sendChatMsg(chatcomponenttranslation); @@ -726,7 +726,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { */ public void processChatMessage(C01PacketChatMessage c01packetchatmessage) { if (this.playerEntity.getChatVisibility() == EntityPlayer.EnumChatVisibility.HIDDEN) { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation("chat.cannotSend", + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation("chat.cannotSend", new Object[0]); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.RED); this.sendPacket(new S02PacketChat(chatcomponenttranslation)); @@ -749,7 +749,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { .getBoolean("colorCodes")) { s = net.minecraft.util.StringUtils.translateControlCodesAlternate(s); } - ChatComponentTranslation chatcomponenttranslation1 = new ChatComponentTranslation("chat.type.text", + TextComponentTranslation chatcomponenttranslation1 = new TextComponentTranslation("chat.type.text", new Object[] { this.playerEntity.getDisplayName(), s }); this.serverController.getConfigurationManager().sendChatMsgImpl(chatcomponenttranslation1, false); } @@ -1070,7 +1070,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { return; } - IChatComponent[] aichatcomponent = c12packetupdatesign.getLines(); + ITextComponent[] aichatcomponent = c12packetupdatesign.getLines(); for (int i = 0; i < aichatcomponent.length; ++i) { String s = EnumChatFormatting.getTextWithoutFormattingCodes(aichatcomponent[i].getUnformattedText()); @@ -1078,7 +1078,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { .getBoolean("colorCodes")) { s = net.minecraft.util.StringUtils.translateControlCodesAlternate(s); } - tileentitysign.signText[i] = new ChatComponentText(s); + tileentitysign.signText[i] = new TextComponentString(s); } tileentitysign.markDirty(); @@ -1215,7 +1215,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { } } else if ("MC|AdvCmd".equals(c17packetcustompayload.getChannelName())) { if (!this.serverController.isCommandBlockEnabled()) { - this.playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notEnabled", new Object[0])); + this.playerEntity.addChatMessage(new TextComponentTranslation("advMode.notEnabled", new Object[0])); } else if (this.playerEntity.canCommandSenderUseCommand(2, "") && this.playerEntity.capabilities.isCreativeMode) { PacketBuffer packetbuffer = c17packetcustompayload.getBufferData(); @@ -1242,28 +1242,28 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { commandblocklogic.setCommand(s1); commandblocklogic.setTrackOutput(flag); if (!flag) { - commandblocklogic.setLastOutput((IChatComponent) null); + commandblocklogic.setLastOutput((ITextComponent) null); } commandblocklogic.updateCommand(); this.playerEntity.addChatMessage( - new ChatComponentTranslation("advMode.setCommand.success", new Object[] { s1 })); + new TextComponentTranslation("advMode.setCommand.success", new Object[] { s1 })); } } catch (Exception exception1) { logger.error("Couldn\'t set command block", exception1); } } else { - this.playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notAllowed", new Object[0])); + this.playerEntity.addChatMessage(new TextComponentTranslation("advMode.notAllowed", new Object[0])); } } else if ("MC|AutoCmd".equals(c17packetcustompayload.getChannelName())) { if (!this.serverController.isCommandBlockEnabled()) { - this.playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notEnabled", new Object[0])); + this.playerEntity.addChatMessage(new TextComponentTranslation("advMode.notEnabled", new Object[0])); return; } if (!this.playerEntity.canCommandSenderUseCommand(2, "") || !this.playerEntity.capabilities.isCreativeMode) { - this.playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notAllowed", new Object[0])); + this.playerEntity.addChatMessage(new TextComponentTranslation("advMode.notAllowed", new Object[0])); return; } @@ -1325,7 +1325,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { commandblockbaselogic1.setTrackOutput(flag1); if (!flag1) { - commandblockbaselogic1.setLastOutput((IChatComponent) null); + commandblockbaselogic1.setLastOutput((ITextComponent) null); } tileentitycommandblock.setAuto(flag3); @@ -1333,7 +1333,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { if (!net.minecraft.util.StringUtils.isNullOrEmpty(s1)) { this.playerEntity.addChatMessage( - new ChatComponentTranslation("advMode.setCommand.success", new Object[] { s1 })); + new TextComponentTranslation("advMode.setCommand.success", new Object[] { s1 })); } } } catch (Exception exception3) { diff --git a/src/main/java/net/minecraft/network/PacketBuffer.java b/src/main/java/net/minecraft/network/PacketBuffer.java index 3ebf078..3e411ec 100644 --- a/src/main/java/net/minecraft/network/PacketBuffer.java +++ b/src/main/java/net/minecraft/network/PacketBuffer.java @@ -21,8 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; /** * + @@ -95,12 +95,12 @@ public class PacketBuffer extends ByteBuf { this.writeLong(pos.toLong()); } - public IChatComponent readChatComponent() throws IOException { - return IChatComponent.Serializer.jsonToComponent(this.readStringFromBuffer(32767)); + public ITextComponent readChatComponent() throws IOException { + return ITextComponent.Serializer.jsonToComponent(this.readStringFromBuffer(32767)); } - public void writeChatComponent(IChatComponent component) throws IOException { - this.writeString(IChatComponent.Serializer.componentToJson(component)); + public void writeChatComponent(ITextComponent component) throws IOException { + this.writeString(ITextComponent.Serializer.componentToJson(component)); } public > T readEnumValue(Class enumClass) { diff --git a/src/main/java/net/minecraft/network/ServerStatusResponse.java b/src/main/java/net/minecraft/network/ServerStatusResponse.java index f2d9a93..1a20a76 100644 --- a/src/main/java/net/minecraft/network/ServerStatusResponse.java +++ b/src/main/java/net/minecraft/network/ServerStatusResponse.java @@ -8,7 +8,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -40,16 +40,16 @@ import net.minecraft.util.IChatComponent; * */ public class ServerStatusResponse { - private IChatComponent serverMotd; + private ITextComponent serverMotd; private ServerStatusResponse.PlayerCountData playerCount; private ServerStatusResponse.MinecraftProtocolVersionIdentifier protocolVersion; private String favicon; - public IChatComponent getServerDescription() { + public ITextComponent getServerDescription() { return this.serverMotd; } - public void setServerDescription(IChatComponent motd) { + public void setServerDescription(ITextComponent motd) { this.serverMotd = motd; } @@ -191,8 +191,8 @@ public class ServerStatusResponse { public ServerStatusResponse deserialize(JSONObject jsonobject) throws JSONException { ServerStatusResponse serverstatusresponse = new ServerStatusResponse(); if (jsonobject.has("description")) { - serverstatusresponse.setServerDescription((IChatComponent) JSONTypeProvider - .deserialize(jsonobject.get("description"), IChatComponent.class)); + serverstatusresponse.setServerDescription((ITextComponent) JSONTypeProvider + .deserialize(jsonobject.get("description"), ITextComponent.class)); } if (jsonobject.has("players")) { diff --git a/src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java b/src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java index 84d0d70..e091bb2 100644 --- a/src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java +++ b/src/main/java/net/minecraft/network/login/server/S00PacketDisconnect.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.login.INetHandlerLoginClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,12 +37,12 @@ import net.minecraft.util.IChatComponent; * */ public class S00PacketDisconnect implements Packet { - private IChatComponent reason; + private ITextComponent reason; public S00PacketDisconnect() { } - public S00PacketDisconnect(IChatComponent reasonIn) { + public S00PacketDisconnect(ITextComponent reasonIn) { this.reason = reasonIn; } @@ -70,7 +70,7 @@ public class S00PacketDisconnect implements Packet { inethandlerloginclient.handleDisconnect(this); } - public IChatComponent func_149603_c() { + public ITextComponent func_149603_c() { return this.reason; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java b/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java index 8177ac6..c3be3f2 100644 --- a/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java +++ b/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -41,7 +41,7 @@ import net.minecraft.world.World; public class C02PacketUseEntity implements Packet { private int entityId; private C02PacketUseEntity.Action action; - private Vec3 hitVec; + private Vec3d hitVec; public C02PacketUseEntity() { } @@ -51,7 +51,7 @@ public class C02PacketUseEntity implements Packet { this.action = action; } - public C02PacketUseEntity(Entity entity, Vec3 hitVec) { + public C02PacketUseEntity(Entity entity, Vec3d hitVec) { this(entity, C02PacketUseEntity.Action.INTERACT_AT); this.hitVec = hitVec; } @@ -64,7 +64,7 @@ public class C02PacketUseEntity implements Packet { this.entityId = parPacketBuffer.readVarIntFromBuffer(); this.action = (C02PacketUseEntity.Action) parPacketBuffer.readEnumValue(C02PacketUseEntity.Action.class); if (this.action == C02PacketUseEntity.Action.INTERACT_AT) { - this.hitVec = new Vec3((double) parPacketBuffer.readFloat(), (double) parPacketBuffer.readFloat(), + this.hitVec = new Vec3d((double) parPacketBuffer.readFloat(), (double) parPacketBuffer.readFloat(), (double) parPacketBuffer.readFloat()); } @@ -101,7 +101,7 @@ public class C02PacketUseEntity implements Packet { return this.action; } - public Vec3 getHitVec() { + public Vec3d getHitVec() { return this.hitVec; } diff --git a/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java b/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java index 66937ca..e86f5df 100644 --- a/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java +++ b/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java @@ -5,8 +5,8 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java b/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java index e2a4289..3104155 100644 --- a/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java +++ b/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java b/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java index 840bc7c..df9af7f 100644 --- a/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java +++ b/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java @@ -5,8 +5,8 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; /** * + @@ -39,14 +39,14 @@ import net.minecraft.util.IChatComponent; */ public class C12PacketUpdateSign implements Packet { private BlockPos pos; - private IChatComponent[] lines; + private ITextComponent[] lines; public C12PacketUpdateSign() { } - public C12PacketUpdateSign(BlockPos pos, IChatComponent[] lines) { + public C12PacketUpdateSign(BlockPos pos, ITextComponent[] lines) { this.pos = pos; - this.lines = new IChatComponent[] { lines[0], lines[1], lines[2], lines[3] }; + this.lines = new ITextComponent[] { lines[0], lines[1], lines[2], lines[3] }; } /** @@ -55,11 +55,11 @@ public class C12PacketUpdateSign implements Packet { */ public void readPacketData(PacketBuffer parPacketBuffer) throws IOException { this.pos = parPacketBuffer.readBlockPos(); - this.lines = new IChatComponent[4]; + this.lines = new ITextComponent[4]; for (int i = 0; i < 4; ++i) { String s = parPacketBuffer.readStringFromBuffer(384); - IChatComponent ichatcomponent = IChatComponent.Serializer.jsonToComponent(s); + ITextComponent ichatcomponent = ITextComponent.Serializer.jsonToComponent(s); this.lines[i] = ichatcomponent; } @@ -73,8 +73,8 @@ public class C12PacketUpdateSign implements Packet { parPacketBuffer.writeBlockPos(this.pos); for (int i = 0; i < 4; ++i) { - IChatComponent ichatcomponent = this.lines[i]; - String s = IChatComponent.Serializer.componentToJson(ichatcomponent); + ITextComponent ichatcomponent = this.lines[i]; + String s = ITextComponent.Serializer.componentToJson(ichatcomponent); parPacketBuffer.writeString(s); } @@ -92,7 +92,7 @@ public class C12PacketUpdateSign implements Packet { return this.pos; } - public IChatComponent[] getLines() { + public ITextComponent[] getLines() { return this.lines; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java b/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java index 0d6154f..a0e4331 100644 --- a/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java +++ b/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java @@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S02PacketChat.java b/src/main/java/net/minecraft/network/play/server/S02PacketChat.java index fe40fdf..a5b5068 100644 --- a/src/main/java/net/minecraft/network/play/server/S02PacketChat.java +++ b/src/main/java/net/minecraft/network/play/server/S02PacketChat.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,17 +37,17 @@ import net.minecraft.util.IChatComponent; * */ public class S02PacketChat implements Packet { - private IChatComponent chatComponent; + private ITextComponent chatComponent; private byte type; public S02PacketChat() { } - public S02PacketChat(IChatComponent component) { + public S02PacketChat(ITextComponent component) { this(component, (byte) 1); } - public S02PacketChat(IChatComponent message, byte typeIn) { + public S02PacketChat(ITextComponent message, byte typeIn) { this.chatComponent = message; this.type = typeIn; } @@ -78,7 +78,7 @@ public class S02PacketChat implements Packet { inethandlerplayclient.handleChat(this); } - public IChatComponent getChatComponent() { + public ITextComponent getChatComponent() { return this.chatComponent; } diff --git a/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java b/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java index ed06f1e..7912a26 100644 --- a/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java +++ b/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java b/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java index 9cd92e9..64a317e 100644 --- a/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java +++ b/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java b/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java index 3214cf6..a8fa1b6 100644 --- a/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java +++ b/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java b/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java index 097d320..04d1f09 100644 --- a/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java +++ b/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java b/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java index 0926939..f8283f7 100644 --- a/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java +++ b/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java @@ -9,7 +9,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java b/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java index 36975f6..960e97d 100644 --- a/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java +++ b/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java @@ -6,8 +6,8 @@ import net.minecraft.entity.item.EntityPainting; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java b/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java index 803502c..d79822a 100644 --- a/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java +++ b/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java @@ -6,7 +6,7 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java b/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java index ce81855..a3e3c4e 100644 --- a/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java +++ b/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java b/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java index 3e87198..1695ac9 100644 --- a/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java +++ b/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java @@ -7,7 +7,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java b/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java index 13e86c5..66adebf 100644 --- a/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java +++ b/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java @@ -7,7 +7,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java b/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java index 2970caa..a9fafb0 100644 --- a/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java +++ b/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java b/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java index 543eaf7..a823273 100644 --- a/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java +++ b/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java b/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java index 11b5121..795c931 100644 --- a/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java +++ b/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java @@ -8,8 +8,8 @@ import com.google.common.collect.Lists; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; /** * + @@ -54,7 +54,7 @@ public class S27PacketExplosion implements Packet { } public S27PacketExplosion(double parDouble1, double y, double z, float strengthIn, List affectedBlocksIn, - Vec3 parVec3_1) { + Vec3d parVec3_1) { this.posX = parDouble1; this.posY = y; this.posZ = z; diff --git a/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java b/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java index e94acfc..43bcf4c 100644 --- a/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java +++ b/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java b/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java index f955191..8715427 100644 --- a/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java +++ b/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.Validate; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java b/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java index 4fcc4c2..efb83ce 100644 --- a/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java +++ b/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java @@ -7,7 +7,7 @@ import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java b/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java index 6b5539a..09a1975 100644 --- a/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java +++ b/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -39,25 +39,25 @@ import net.minecraft.util.IChatComponent; public class S2DPacketOpenWindow implements Packet { private int windowId; private String inventoryType; - private IChatComponent windowTitle; + private ITextComponent windowTitle; private int slotCount; private int entityId; public S2DPacketOpenWindow() { } - public S2DPacketOpenWindow(int incomingWindowId, String incomingWindowTitle, IChatComponent windowTitleIn) { + public S2DPacketOpenWindow(int incomingWindowId, String incomingWindowTitle, ITextComponent windowTitleIn) { this(incomingWindowId, incomingWindowTitle, windowTitleIn, 0); } - public S2DPacketOpenWindow(int windowIdIn, String guiId, IChatComponent windowTitleIn, int slotCountIn) { + public S2DPacketOpenWindow(int windowIdIn, String guiId, ITextComponent windowTitleIn, int slotCountIn) { this.windowId = windowIdIn; this.inventoryType = guiId; this.windowTitle = windowTitleIn; this.slotCount = slotCountIn; } - public S2DPacketOpenWindow(int windowIdIn, String guiId, IChatComponent windowTitleIn, int slotCountIn, + public S2DPacketOpenWindow(int windowIdIn, String guiId, ITextComponent windowTitleIn, int slotCountIn, int incomingEntityId) { this(windowIdIn, guiId, windowTitleIn, slotCountIn); this.entityId = incomingEntityId; @@ -109,7 +109,7 @@ public class S2DPacketOpenWindow implements Packet { return this.inventoryType; } - public IChatComponent getWindowTitle() { + public ITextComponent getWindowTitle() { return this.windowTitle; } diff --git a/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java b/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java index d3dd79b..ae8a767 100644 --- a/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java +++ b/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java @@ -5,8 +5,8 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; /** @@ -41,15 +41,15 @@ import net.minecraft.world.World; public class S33PacketUpdateSign implements Packet { private World world; private BlockPos blockPos; - private IChatComponent[] lines; + private ITextComponent[] lines; public S33PacketUpdateSign() { } - public S33PacketUpdateSign(World worldIn, BlockPos blockPosIn, IChatComponent[] linesIn) { + public S33PacketUpdateSign(World worldIn, BlockPos blockPosIn, ITextComponent[] linesIn) { this.world = worldIn; this.blockPos = blockPosIn; - this.lines = new IChatComponent[] { linesIn[0], linesIn[1], linesIn[2], linesIn[3] }; + this.lines = new ITextComponent[] { linesIn[0], linesIn[1], linesIn[2], linesIn[3] }; } /** @@ -58,7 +58,7 @@ public class S33PacketUpdateSign implements Packet { */ public void readPacketData(PacketBuffer parPacketBuffer) throws IOException { this.blockPos = parPacketBuffer.readBlockPos(); - this.lines = new IChatComponent[4]; + this.lines = new ITextComponent[4]; for (int i = 0; i < 4; ++i) { this.lines[i] = parPacketBuffer.readChatComponent(); @@ -91,7 +91,7 @@ public class S33PacketUpdateSign implements Packet { return this.blockPos; } - public IChatComponent[] getLines() { + public ITextComponent[] getLines() { return this.lines; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java b/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java index 0747069..68e2fce 100644 --- a/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java +++ b/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java @@ -6,7 +6,7 @@ import java.util.Collection; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.Vec4b; +import net.minecraft.util.math.Vec4b; import net.minecraft.world.storage.MapData; /** diff --git a/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java b/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java index 4899914..6266921 100644 --- a/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java +++ b/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java @@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java b/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java index 89d9768..96e5346 100644 --- a/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java +++ b/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java b/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java index 8c33d4d..12306ce 100644 --- a/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java +++ b/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java @@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.WorldSettings; /** @@ -85,7 +85,7 @@ public class S38PacketPlayerListItem implements Packet { GameProfile gameprofile = null; int k = 0; WorldSettings.GameType worldsettings$gametype = null; - IChatComponent ichatcomponent = null; + ITextComponent ichatcomponent = null; switch (this.action) { case ADD_PLAYER: gameprofile = new GameProfile(parPacketBuffer.readUuid(), parPacketBuffer.readStringFromBuffer(16)); @@ -224,10 +224,10 @@ public class S38PacketPlayerListItem implements Packet { private final int ping; private final WorldSettings.GameType gamemode; private final GameProfile profile; - private final IChatComponent displayName; + private final ITextComponent displayName; public AddPlayerData(GameProfile profile, int pingIn, WorldSettings.GameType gamemodeIn, - IChatComponent displayNameIn) { + ITextComponent displayNameIn) { this.profile = profile; this.ping = pingIn; this.gamemode = gamemodeIn; @@ -246,14 +246,14 @@ public class S38PacketPlayerListItem implements Packet { return this.gamemode; } - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return this.displayName; } public String toString() { return Objects.toStringHelper(this).add("latency", this.ping).add("gameMode", this.gamemode) .add("profile", this.profile).add("displayName", this.displayName == null ? null - : IChatComponent.Serializer.componentToJson(this.displayName)) + : ITextComponent.Serializer.componentToJson(this.displayName)) .toString(); } } diff --git a/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java b/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java index 346b899..9a0edb7 100644 --- a/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java +++ b/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,12 +37,12 @@ import net.minecraft.util.IChatComponent; * */ public class S40PacketDisconnect implements Packet { - private IChatComponent reason; + private ITextComponent reason; public S40PacketDisconnect() { } - public S40PacketDisconnect(IChatComponent reasonIn) { + public S40PacketDisconnect(ITextComponent reasonIn) { this.reason = reasonIn; } @@ -70,7 +70,7 @@ public class S40PacketDisconnect implements Packet { inethandlerplayclient.handleDisconnect(this); } - public IChatComponent getReason() { + public ITextComponent getReason() { return this.reason; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java b/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java index d39f7b0..c63f05a 100644 --- a/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java +++ b/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -38,7 +38,7 @@ import net.minecraft.util.IChatComponent; */ public class S45PacketTitle implements Packet { private S45PacketTitle.Type type; - private IChatComponent message; + private ITextComponent message; private int fadeInTime; private int displayTime; private int fadeOutTime; @@ -46,15 +46,15 @@ public class S45PacketTitle implements Packet { public S45PacketTitle() { } - public S45PacketTitle(S45PacketTitle.Type type, IChatComponent message) { + public S45PacketTitle(S45PacketTitle.Type type, ITextComponent message) { this(type, message, -1, -1, -1); } public S45PacketTitle(int fadeInTime, int displayTime, int fadeOutTime) { - this(S45PacketTitle.Type.TIMES, (IChatComponent) null, fadeInTime, displayTime, fadeOutTime); + this(S45PacketTitle.Type.TIMES, (ITextComponent) null, fadeInTime, displayTime, fadeOutTime); } - public S45PacketTitle(S45PacketTitle.Type type, IChatComponent message, int fadeInTime, int displayTime, + public S45PacketTitle(S45PacketTitle.Type type, ITextComponent message, int fadeInTime, int displayTime, int fadeOutTime) { this.type = type; this.message = message; @@ -111,7 +111,7 @@ public class S45PacketTitle implements Packet { return this.type; } - public IChatComponent getMessage() { + public ITextComponent getMessage() { return this.message; } diff --git a/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java b/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java index c47f077..3ef3ee3 100644 --- a/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java +++ b/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java @@ -5,7 +5,7 @@ import java.io.IOException; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,13 +37,13 @@ import net.minecraft.util.IChatComponent; * */ public class S47PacketPlayerListHeaderFooter implements Packet { - private IChatComponent header; - private IChatComponent footer; + private ITextComponent header; + private ITextComponent footer; public S47PacketPlayerListHeaderFooter() { } - public S47PacketPlayerListHeaderFooter(IChatComponent headerIn) { + public S47PacketPlayerListHeaderFooter(ITextComponent headerIn) { this.header = headerIn; } @@ -73,11 +73,11 @@ public class S47PacketPlayerListHeaderFooter implements Packet vec31.yCoord && !this.theEntity.onGround && MathHelper.floor_double(vec3.xCoord) == MathHelper.floor_double(vec31.xCoord) @@ -214,7 +214,7 @@ public abstract class PathNavigate { } if (!this.noPath()) { - Vec3 vec32 = this.currentPath.getPosition(this.theEntity); + Vec3d vec32 = this.currentPath.getPosition(this.theEntity); if (vec32 != null) { AxisAlignedBB axisalignedbb1 = (new AxisAlignedBB(vec32.xCoord, vec32.yCoord, vec32.zCoord, vec32.xCoord, vec32.yCoord, vec32.zCoord)).expand(0.5D, 0.5D, 0.5D); @@ -235,7 +235,7 @@ public abstract class PathNavigate { } protected void pathFollow() { - Vec3 vec3 = this.getEntityPosition(); + Vec3d vec3 = this.getEntityPosition(); int i = this.currentPath.getCurrentPathLength(); for (int j = this.currentPath.getCurrentPathIndex(); j < this.currentPath.getCurrentPathLength(); ++j) { @@ -248,7 +248,7 @@ public abstract class PathNavigate { float f = this.theEntity.width * this.theEntity.width * this.heightRequirement; for (int k = this.currentPath.getCurrentPathIndex(); k < i; ++k) { - Vec3 vec31 = this.currentPath.getVectorFromIndex(this.theEntity, k); + Vec3d vec31 = this.currentPath.getVectorFromIndex(this.theEntity, k); if (vec3.squareDistanceTo(vec31) < (double) f) { this.currentPath.setCurrentPathIndex(k + 1); } @@ -275,7 +275,7 @@ public abstract class PathNavigate { * so, clears current {@link * net.minecraft.pathfinding.PathEntity} */ - protected void checkForStuck(Vec3 positionVec3) { + protected void checkForStuck(Vec3d positionVec3) { if (this.totalTicks - this.ticksAtLastPos > 100) { if (positionVec3.squareDistanceTo(this.lastPosCheck) < 2.25D) { this.clearPathEntity(); @@ -303,7 +303,7 @@ public abstract class PathNavigate { this.currentPath = null; } - protected abstract Vec3 getEntityPosition(); + protected abstract Vec3d getEntityPosition(); protected abstract boolean canNavigate(); @@ -323,5 +323,5 @@ public abstract class PathNavigate { protected void removeSunnyPath() { } - protected abstract boolean isDirectPathBetweenPoints(Vec3 var1, Vec3 var2, int var3, int var4, int var5); + protected abstract boolean isDirectPathBetweenPoints(Vec3d var1, Vec3d var2, int var3, int var4, int var5); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java b/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java index 97feb7d..30e25e4 100644 --- a/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java +++ b/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java @@ -2,8 +2,8 @@ package net.minecraft.pathfinding; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java b/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java index a46d02d..ee81abd 100644 --- a/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java +++ b/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java @@ -6,9 +6,9 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.pathfinder.WalkNodeProcessor; @@ -64,8 +64,8 @@ public class PathNavigateGround extends PathNavigate { && this.theEntity instanceof EntityZombie && this.theEntity.ridingEntity instanceof EntityChicken; } - protected Vec3 getEntityPosition() { - return new Vec3(this.theEntity.posX, (double) this.getPathablePosY(), this.theEntity.posZ); + protected Vec3d getEntityPosition() { + return new Vec3d(this.theEntity.posX, (double) this.getPathablePosY(), this.theEntity.posZ); } /** @@ -126,7 +126,7 @@ public class PathNavigateGround extends PathNavigate { * walk in a straight line between the two points. Args: pos1, * pos2, entityXSize, entityYSize, entityZSize */ - protected boolean isDirectPathBetweenPoints(Vec3 posVec31, Vec3 posVec32, int sizeX, int sizeY, int sizeZ) { + protected boolean isDirectPathBetweenPoints(Vec3d posVec31, Vec3d posVec32, int sizeX, int sizeY, int sizeZ) { int i = MathHelper.floor_double(posVec31.xCoord); int j = MathHelper.floor_double(posVec31.zCoord); double d0 = posVec32.xCoord - posVec31.xCoord; @@ -192,7 +192,8 @@ public class PathNavigateGround extends PathNavigate { * Returns true when an entity could stand at a position, * including solid blocks under the entire entity. */ - private boolean isSafeToStandAt(int x, int y, int z, int sizeX, int sizeY, int sizeZ, Vec3 vec31, double parDouble1, + private boolean isSafeToStandAt(int x, int y, int z, int sizeX, int sizeY, int sizeZ, Vec3d vec31, + double parDouble1, double parDouble2) { int i = x - sizeX / 2; int j = z - sizeZ / 2; @@ -231,7 +232,7 @@ public class PathNavigateGround extends PathNavigate { * blocks at the position. */ private boolean isPositionClear(int parInt1, int parInt2, int parInt3, int parInt4, int parInt5, int parInt6, - Vec3 parVec3_1, double parDouble1, double parDouble2) { + Vec3d parVec3_1, double parDouble1, double parDouble2) { for (BlockPos blockpos : BlockPos.getAllInBox(new BlockPos(parInt1, parInt2, parInt3), new BlockPos(parInt1 + parInt4 - 1, parInt2 + parInt5 - 1, parInt3 + parInt6 - 1))) { double d0 = (double) blockpos.getX() + 0.5D - parVec3_1.xCoord; diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java b/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java index cd9c85c..b952d34 100644 --- a/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java +++ b/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java @@ -1,8 +1,8 @@ package net.minecraft.pathfinding; import net.minecraft.entity.EntityLiving; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.pathfinder.SwimNodeProcessor; @@ -52,13 +52,13 @@ public class PathNavigateSwimmer extends PathNavigate { return this.isInLiquid(); } - protected Vec3 getEntityPosition() { - return new Vec3(this.theEntity.posX, this.theEntity.posY + (double) this.theEntity.height * 0.5D, + protected Vec3d getEntityPosition() { + return new Vec3d(this.theEntity.posX, this.theEntity.posY + (double) this.theEntity.height * 0.5D, this.theEntity.posZ); } protected void pathFollow() { - Vec3 vec3 = this.getEntityPosition(); + Vec3d vec3 = this.getEntityPosition(); float f = this.theEntity.width * this.theEntity.width; byte b0 = 6; if (vec3.squareDistanceTo(this.currentPath.getVectorFromIndex(this.theEntity, @@ -68,7 +68,7 @@ public class PathNavigateSwimmer extends PathNavigate { for (int i = Math.min(this.currentPath.getCurrentPathIndex() + b0, this.currentPath.getCurrentPathLength() - 1); i > this.currentPath.getCurrentPathIndex(); --i) { - Vec3 vec31 = this.currentPath.getVectorFromIndex(this.theEntity, i); + Vec3d vec31 = this.currentPath.getVectorFromIndex(this.theEntity, i); if (vec31.squareDistanceTo(vec3) <= 36.0D && this.isDirectPathBetweenPoints(vec3, vec31, 0, 0, 0)) { this.currentPath.setCurrentPathIndex(i); break; @@ -92,11 +92,12 @@ public class PathNavigateSwimmer extends PathNavigate { * walk in a straight line between the two points. Args: pos1, * pos2, entityXSize, entityYSize, entityZSize */ - protected boolean isDirectPathBetweenPoints(Vec3 vec3, Vec3 vec31, int var3, int var4, int var5) { - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, - new Vec3(vec31.xCoord, vec31.yCoord + (double) this.theEntity.height * 0.5D, vec31.zCoord), false, true, + protected boolean isDirectPathBetweenPoints(Vec3d vec3, Vec3d vec31, int var3, int var4, int var5) { + RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec3, + new Vec3d(vec31.xCoord, vec31.yCoord + (double) this.theEntity.height * 0.5D, vec31.zCoord), false, + true, false); return movingobjectposition == null - || movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.MISS; + || movingobjectposition.typeOfHit == RayTraceResult.MovingObjectType.MISS; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/pathfinding/PathPoint.java b/src/main/java/net/minecraft/pathfinding/PathPoint.java index d11d192..55531cf 100644 --- a/src/main/java/net/minecraft/pathfinding/PathPoint.java +++ b/src/main/java/net/minecraft/pathfinding/PathPoint.java @@ -1,6 +1,6 @@ package net.minecraft.pathfinding; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java b/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java index 2f420f0..f89ec3c 100644 --- a/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java +++ b/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java @@ -3,7 +3,7 @@ package net.minecraft.scoreboard; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index f49ba85..7c9b2d4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -26,15 +26,15 @@ import net.minecraft.network.play.server.S03PacketTimeUpdate; import net.minecraft.network.play.server.S41PacketServerDifficulty; import net.minecraft.profiler.Profiler; import net.minecraft.server.management.ServerConfigurationManager; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.IThreadListener; import net.minecraft.util.ITickable; import net.minecraft.util.ReportedException; import net.minecraft.util.Util; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.MinecraftException; import net.minecraft.world.World; @@ -739,7 +739,7 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre * + * Send a chat message to the CommandSender */ - public void addChatMessage(IChatComponent ichatcomponent) { + public void addChatMessage(ITextComponent ichatcomponent) { logger.info(ichatcomponent.getUnformattedText()); } @@ -980,8 +980,8 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre * If you are not an entity in the world, return 0.0D, 0.0D, * 0.0D */ - public Vec3 getPositionVector() { - return new Vec3(0.0D, 0.0D, 0.0D); + public Vec3d getPositionVector() { + return new Vec3d(0.0D, 0.0D, 0.0D); } /** @@ -1036,8 +1036,8 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return new ChatComponentText(this.getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(this.getName()); } public boolean isAnnouncingPlayerAchievements() { diff --git a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java index 5b1fd24..72daf58 100644 --- a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java +++ b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java @@ -13,8 +13,8 @@ import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.network.play.server.S38PacketPlayerListItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -302,8 +302,8 @@ public class ItemInWorldManager { if (this.gameType == WorldSettings.GameType.SPECTATOR) { return false; } else if (entityplayer.getCooldownTracker().hasCooldown(itemstack.getItem())) { - return false; - } else { + return false; + } else { int i = itemstack.stackSize; int j = itemstack.getMetadata(); ItemStack itemstack1 = itemstack.useItemRightClick(world, entityplayer); @@ -369,7 +369,7 @@ public class ItemInWorldManager { if (itemstack == null) { return false; } else if (entityplayer.getCooldownTracker().hasCooldown(itemstack.getItem())) { - return false; + return false; } else if (this.isCreative()) { int j = itemstack.getMetadata(); int i = itemstack.stackSize; diff --git a/src/main/java/net/minecraft/server/management/PlayerManager.java b/src/main/java/net/minecraft/server/management/PlayerManager.java index 8771688..a96ec75 100644 --- a/src/main/java/net/minecraft/server/management/PlayerManager.java +++ b/src/main/java/net/minecraft/server/management/PlayerManager.java @@ -9,9 +9,9 @@ import net.minecraft.network.play.server.S21PacketChunkData; import net.minecraft.network.play.server.S22PacketMultiBlockChange; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.LongHashMap; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldServer; diff --git a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java index c03f605..aa678f0 100644 --- a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java @@ -46,12 +46,12 @@ import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; import net.minecraft.stats.StatList; import net.minecraft.stats.StatisticsFile; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings; @@ -153,15 +153,15 @@ public abstract class ServerConfigurationManager { playerIn.getStatFile().sendAchievements(playerIn); this.sendScoreboard((ServerScoreboard) worldserver.getScoreboard(), playerIn); this.mcServer.refreshStatusNextTick(); - ChatComponentTranslation chatcomponenttranslation; - chatcomponenttranslation = new ChatComponentTranslation("multiplayer.player.joined", + TextComponentTranslation chatcomponenttranslation; + chatcomponenttranslation = new TextComponentTranslation("multiplayer.player.joined", new Object[] { playerIn.getDisplayName() }); chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.YELLOW); this.sendChatMsg(chatcomponenttranslation); if (playerIn.canCommandSenderUseCommand(2, "give")) { - ChatComponentText shaderF4Msg = new ChatComponentText("[EaglercraftX] "); + TextComponentString shaderF4Msg = new TextComponentString("[EaglercraftX] "); shaderF4Msg.getChatStyle().setColor(EnumChatFormatting.GOLD); - ChatComponentTranslation shaderF4Msg2 = new ChatComponentTranslation("command.skull.tip"); + TextComponentTranslation shaderF4Msg2 = new TextComponentTranslation("command.skull.tip"); shaderF4Msg2.getChatStyle().setColor(EnumChatFormatting.AQUA); shaderF4Msg.appendSibling(shaderF4Msg2); playerIn.addChatMessage(shaderF4Msg); @@ -624,7 +624,7 @@ public abstract class ServerConfigurationManager { } - public void sendMessageToAllTeamMembers(EntityPlayer player, IChatComponent message) { + public void sendMessageToAllTeamMembers(EntityPlayer player, ITextComponent message) { Team team = player.getTeam(); if (team != null) { for (String s : team.getMembershipCollection()) { @@ -637,7 +637,7 @@ public abstract class ServerConfigurationManager { } } - public void sendMessageToTeamOrEvryPlayer(EntityPlayer player, IChatComponent message) { + public void sendMessageToTeamOrEvryPlayer(EntityPlayer player, ITextComponent message) { Team team = player.getTeam(); if (team == null) { this.sendChatMsg(message); @@ -891,7 +891,7 @@ public abstract class ServerConfigurationManager { } - public void sendChatMsgImpl(IChatComponent component, boolean isChat) { + public void sendChatMsgImpl(ITextComponent component, boolean isChat) { this.mcServer.addChatMessage(component); int i = isChat ? 1 : 0; this.sendPacketToAllPlayers(new S02PacketChat(component, (byte) i)); @@ -901,7 +901,7 @@ public abstract class ServerConfigurationManager { * + * Sends the given string to every player as chat message. */ - public void sendChatMsg(IChatComponent component) { + public void sendChatMsg(ITextComponent component) { this.sendChatMsgImpl(component, true); } diff --git a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java b/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java index 742b6d0..89b35a7 100644 --- a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java +++ b/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java @@ -13,9 +13,9 @@ import net.minecraft.network.login.client.C01PacketEncryptionResponse; import net.minecraft.network.login.server.S00PacketDisconnect; import net.minecraft.network.login.server.S02PacketLoginSuccess; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import net.lax1dude.eaglercraft.v1_8.sp.server.socket.IntegratedServerPlayerNetworkManager; import net.lax1dude.eaglercraft.v1_8.sp.server.voice.IntegratedVoiceService; @@ -110,7 +110,7 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable public void closeConnection(String reason) { try { logger.info("Disconnecting " + this.getConnectionInfo() + ": " + reason); - ChatComponentText chatcomponenttext = new ChatComponentText(reason); + TextComponentString chatcomponenttext = new TextComponentString(reason); this.networkManager.sendPacket(new S00PacketDisconnect(chatcomponenttext)); this.networkManager.closeChannel(chatcomponenttext); } catch (Exception exception) { @@ -155,7 +155,7 @@ public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable * Invoked when disconnecting, the parameter is a ChatComponent * describing the reason for termination */ - public void onDisconnect(IChatComponent ichatcomponent) { + public void onDisconnect(ITextComponent ichatcomponent) { logger.info(this.getConnectionInfo() + " lost connection: " + ichatcomponent.getUnformattedText()); } diff --git a/src/main/java/net/minecraft/stats/Achievement.java b/src/main/java/net/minecraft/stats/Achievement.java index 8d6d6c2..d56f45f 100644 --- a/src/main/java/net/minecraft/stats/Achievement.java +++ b/src/main/java/net/minecraft/stats/Achievement.java @@ -3,11 +3,11 @@ package net.minecraft.stats; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; import net.minecraft.util.IJsonSerializable; import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -57,7 +57,7 @@ public class Achievement extends StatBase { public Achievement(String parString1, String parString2, int column, int row, ItemStack parItemStack, Achievement parent) { - super(parString1, new ChatComponentTranslation("achievement." + parString2, new Object[0])); + super(parString1, new TextComponentTranslation("achievement." + parString2, new Object[0])); this.theItemStack = parItemStack; this.achievementDescription = "achievement." + parString2 + ".desc"; this.displayColumn = column; @@ -121,8 +121,8 @@ public class Achievement extends StatBase { return true; } - public IChatComponent getStatName() { - IChatComponent ichatcomponent = super.getStatName(); + public ITextComponent getStatName() { + ITextComponent ichatcomponent = super.getStatName(); ichatcomponent.getChatStyle() .setColor(this.getSpecial() ? EnumChatFormatting.DARK_PURPLE : EnumChatFormatting.GREEN); return ichatcomponent; diff --git a/src/main/java/net/minecraft/stats/StatBase.java b/src/main/java/net/minecraft/stats/StatBase.java index 3fb2fb4..9c28bfc 100644 --- a/src/main/java/net/minecraft/stats/StatBase.java +++ b/src/main/java/net/minecraft/stats/StatBase.java @@ -4,12 +4,12 @@ import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Locale; -import net.minecraft.event.HoverEvent; import net.minecraft.scoreboard.IScoreObjectiveCriteria; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; import net.minecraft.util.IJsonSerializable; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.event.HoverEvent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -42,7 +42,7 @@ import net.minecraft.util.IJsonSerializable; */ public class StatBase { public final String statId; - private final IChatComponent statName; + private final ITextComponent statName; public boolean isIndependent; private final IStatType type; private final IScoreObjectiveCriteria field_150957_c; @@ -81,7 +81,7 @@ public class StatBase { } }; - public StatBase(String statIdIn, IChatComponent statNameIn, IStatType typeIn) { + public StatBase(String statIdIn, ITextComponent statNameIn, IStatType typeIn) { this.statId = statIdIn; this.statName = statNameIn; this.type = typeIn; @@ -89,7 +89,7 @@ public class StatBase { IScoreObjectiveCriteria.INSTANCES.put(this.field_150957_c.getName(), this.field_150957_c); } - public StatBase(String statIdIn, IChatComponent statNameIn) { + public StatBase(String statIdIn, ITextComponent statNameIn) { this(statIdIn, statNameIn, simpleStatType); } @@ -133,17 +133,17 @@ public class StatBase { return this.type.format(parInt1); } - public IChatComponent getStatName() { - IChatComponent ichatcomponent = this.statName.createCopy(); + public ITextComponent getStatName() { + ITextComponent ichatcomponent = this.statName.createCopy(); ichatcomponent.getChatStyle().setColor(EnumChatFormatting.GRAY); ichatcomponent.getChatStyle().setChatHoverEvent( - new HoverEvent(HoverEvent.Action.SHOW_ACHIEVEMENT, new ChatComponentText(this.statId))); + new HoverEvent(HoverEvent.Action.SHOW_ACHIEVEMENT, new TextComponentString(this.statId))); return ichatcomponent; } - public IChatComponent func_150955_j() { - IChatComponent ichatcomponent = this.getStatName(); - IChatComponent ichatcomponent1 = (new ChatComponentText("[")).appendSibling(ichatcomponent).appendText("]"); + public ITextComponent func_150955_j() { + ITextComponent ichatcomponent = this.getStatName(); + ITextComponent ichatcomponent1 = (new TextComponentString("[")).appendSibling(ichatcomponent).appendText("]"); ichatcomponent1.setChatStyle(ichatcomponent.getChatStyle()); return ichatcomponent1; } diff --git a/src/main/java/net/minecraft/stats/StatBasic.java b/src/main/java/net/minecraft/stats/StatBasic.java index ff6d2e5..ffb4d3f 100644 --- a/src/main/java/net/minecraft/stats/StatBasic.java +++ b/src/main/java/net/minecraft/stats/StatBasic.java @@ -1,6 +1,6 @@ package net.minecraft.stats; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -32,11 +32,11 @@ import net.minecraft.util.IChatComponent; * */ public class StatBasic extends StatBase { - public StatBasic(String statIdIn, IChatComponent statNameIn, IStatType typeIn) { + public StatBasic(String statIdIn, ITextComponent statNameIn, IStatType typeIn) { super(statIdIn, statNameIn, typeIn); } - public StatBasic(String statIdIn, IChatComponent statNameIn) { + public StatBasic(String statIdIn, ITextComponent statNameIn) { super(statIdIn, statNameIn); } diff --git a/src/main/java/net/minecraft/stats/StatCrafting.java b/src/main/java/net/minecraft/stats/StatCrafting.java index f9828e3..15b9e2d 100644 --- a/src/main/java/net/minecraft/stats/StatCrafting.java +++ b/src/main/java/net/minecraft/stats/StatCrafting.java @@ -2,7 +2,7 @@ package net.minecraft.stats; import net.minecraft.item.Item; import net.minecraft.scoreboard.IScoreObjectiveCriteria; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -36,7 +36,7 @@ import net.minecraft.util.IChatComponent; public class StatCrafting extends StatBase { private final Item field_150960_a; - public StatCrafting(String parString1, String parString2, IChatComponent statNameIn, Item parItem) { + public StatCrafting(String parString1, String parString2, ITextComponent statNameIn, Item parItem) { super(parString1 + parString2, statNameIn); this.field_150960_a = parItem; int i = Item.getIdFromItem(parItem); diff --git a/src/main/java/net/minecraft/stats/StatList.java b/src/main/java/net/minecraft/stats/StatList.java index d78b224..91983a5 100644 --- a/src/main/java/net/minecraft/stats/StatList.java +++ b/src/main/java/net/minecraft/stats/StatList.java @@ -17,8 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentTranslation; /** * + @@ -66,190 +66,190 @@ public class StatList { * number of times you've left a game */ public static StatBase leaveGameStat = (new StatBasic("stat.leaveGame", - new ChatComponentTranslation("stat.leaveGame", new Object[0]))).initIndependentStat().registerStat(); + new TextComponentTranslation("stat.leaveGame", new Object[0]))).initIndependentStat().registerStat(); /** * + * number of minutes you have played */ public static StatBase minutesPlayedStat = (new StatBasic("stat.playOneMinute", - new ChatComponentTranslation("stat.playOneMinute", new Object[0]), StatBase.timeStatType)) + new TextComponentTranslation("stat.playOneMinute", new Object[0]), StatBase.timeStatType)) .initIndependentStat().registerStat(); public static StatBase timeSinceDeathStat = (new StatBasic("stat.timeSinceDeath", - new ChatComponentTranslation("stat.timeSinceDeath", new Object[0]), StatBase.timeStatType)) + new TextComponentTranslation("stat.timeSinceDeath", new Object[0]), StatBase.timeStatType)) .initIndependentStat().registerStat(); /** * + * distance you've walked */ public static StatBase distanceWalkedStat = (new StatBasic("stat.walkOneCm", - new ChatComponentTranslation("stat.walkOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.walkOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); public static StatBase distanceCrouchedStat = (new StatBasic("stat.crouchOneCm", - new ChatComponentTranslation("stat.crouchOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.crouchOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); public static StatBase distanceSprintedStat = (new StatBasic("stat.sprintOneCm", - new ChatComponentTranslation("stat.sprintOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.sprintOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * distance you have swam */ public static StatBase distanceSwumStat = (new StatBasic("stat.swimOneCm", - new ChatComponentTranslation("stat.swimOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.swimOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you have fallen */ public static StatBase distanceFallenStat = (new StatBasic("stat.fallOneCm", - new ChatComponentTranslation("stat.fallOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.fallOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've climbed */ public static StatBase distanceClimbedStat = (new StatBasic("stat.climbOneCm", - new ChatComponentTranslation("stat.climbOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.climbOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've flown */ public static StatBase distanceFlownStat = (new StatBasic("stat.flyOneCm", - new ChatComponentTranslation("stat.flyOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.flyOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've dived */ public static StatBase distanceDoveStat = (new StatBasic("stat.diveOneCm", - new ChatComponentTranslation("stat.diveOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.diveOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've traveled by minecart */ public static StatBase distanceByMinecartStat = (new StatBasic("stat.minecartOneCm", - new ChatComponentTranslation("stat.minecartOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.minecartOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've traveled by boat */ public static StatBase distanceByBoatStat = (new StatBasic("stat.boatOneCm", - new ChatComponentTranslation("stat.boatOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.boatOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the distance you've traveled by pig */ public static StatBase distanceByPigStat = (new StatBasic("stat.pigOneCm", - new ChatComponentTranslation("stat.pigOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.pigOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); public static StatBase distanceByHorseStat = (new StatBasic("stat.horseOneCm", - new ChatComponentTranslation("stat.horseOneCm", new Object[0]), StatBase.distanceStatType)) + new TextComponentTranslation("stat.horseOneCm", new Object[0]), StatBase.distanceStatType)) .initIndependentStat().registerStat(); /** * + * the times you've jumped */ public static StatBase jumpStat = (new StatBasic("stat.jump", - new ChatComponentTranslation("stat.jump", new Object[0]))).initIndependentStat().registerStat(); + new TextComponentTranslation("stat.jump", new Object[0]))).initIndependentStat().registerStat(); /** * + * the distance you've dropped (or times you've fallen?) */ public static StatBase dropStat = (new StatBasic("stat.drop", - new ChatComponentTranslation("stat.drop", new Object[0]))).initIndependentStat().registerStat(); + new TextComponentTranslation("stat.drop", new Object[0]))).initIndependentStat().registerStat(); /** * + * the amount of damage you've dealt */ public static StatBase damageDealtStat = (new StatBasic("stat.damageDealt", - new ChatComponentTranslation("stat.damageDealt", new Object[0]), StatBase.field_111202_k)).registerStat(); + new TextComponentTranslation("stat.damageDealt", new Object[0]), StatBase.field_111202_k)).registerStat(); /** * + * the amount of damage you have taken */ public static StatBase damageTakenStat = (new StatBasic("stat.damageTaken", - new ChatComponentTranslation("stat.damageTaken", new Object[0]), StatBase.field_111202_k)).registerStat(); + new TextComponentTranslation("stat.damageTaken", new Object[0]), StatBase.field_111202_k)).registerStat(); /** * + * the number of times you have died */ public static StatBase deathsStat = (new StatBasic("stat.deaths", - new ChatComponentTranslation("stat.deaths", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.deaths", new Object[0]))).registerStat(); /** * + * the number of mobs you have killed */ public static StatBase mobKillsStat = (new StatBasic("stat.mobKills", - new ChatComponentTranslation("stat.mobKills", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.mobKills", new Object[0]))).registerStat(); /** * + * the number of animals you have bred */ public static StatBase animalsBredStat = (new StatBasic("stat.animalsBred", - new ChatComponentTranslation("stat.animalsBred", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.animalsBred", new Object[0]))).registerStat(); /** * + * counts the number of times you've killed a player */ public static StatBase playerKillsStat = (new StatBasic("stat.playerKills", - new ChatComponentTranslation("stat.playerKills", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.playerKills", new Object[0]))).registerStat(); public static StatBase fishCaughtStat = (new StatBasic("stat.fishCaught", - new ChatComponentTranslation("stat.fishCaught", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.fishCaught", new Object[0]))).registerStat(); public static StatBase junkFishedStat = (new StatBasic("stat.junkFished", - new ChatComponentTranslation("stat.junkFished", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.junkFished", new Object[0]))).registerStat(); public static StatBase treasureFishedStat = (new StatBasic("stat.treasureFished", - new ChatComponentTranslation("stat.treasureFished", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.treasureFished", new Object[0]))).registerStat(); public static StatBase timesTalkedToVillagerStat = (new StatBasic("stat.talkedToVillager", - new ChatComponentTranslation("stat.talkedToVillager", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.talkedToVillager", new Object[0]))).registerStat(); public static StatBase timesTradedWithVillagerStat = (new StatBasic("stat.tradedWithVillager", - new ChatComponentTranslation("stat.tradedWithVillager", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.tradedWithVillager", new Object[0]))).registerStat(); public static StatBase field_181724_H = (new StatBasic("stat.cakeSlicesEaten", - new ChatComponentTranslation("stat.cakeSlicesEaten", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.cakeSlicesEaten", new Object[0]))).registerStat(); public static StatBase CAULDRON_USED = (new StatBasic("stat.cauldronFilled", - new ChatComponentTranslation("stat.cauldronFilled", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.cauldronFilled", new Object[0]))).registerStat(); public static StatBase field_181726_J = (new StatBasic("stat.cauldronUsed", - new ChatComponentTranslation("stat.cauldronUsed", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.cauldronUsed", new Object[0]))).registerStat(); public static StatBase field_181727_K = (new StatBasic("stat.armorCleaned", - new ChatComponentTranslation("stat.armorCleaned", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.armorCleaned", new Object[0]))).registerStat(); public static StatBase field_181728_L = (new StatBasic("stat.bannerCleaned", - new ChatComponentTranslation("stat.bannerCleaned", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.bannerCleaned", new Object[0]))).registerStat(); public static StatBase field_181729_M = (new StatBasic("stat.brewingstandInteraction", - new ChatComponentTranslation("stat.brewingstandInteraction", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.brewingstandInteraction", new Object[0]))).registerStat(); public static StatBase field_181730_N = (new StatBasic("stat.beaconInteraction", - new ChatComponentTranslation("stat.beaconInteraction", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.beaconInteraction", new Object[0]))).registerStat(); public static StatBase field_181731_O = (new StatBasic("stat.dropperInspected", - new ChatComponentTranslation("stat.dropperInspected", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.dropperInspected", new Object[0]))).registerStat(); public static StatBase field_181732_P = (new StatBasic("stat.hopperInspected", - new ChatComponentTranslation("stat.hopperInspected", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.hopperInspected", new Object[0]))).registerStat(); public static StatBase field_181733_Q = (new StatBasic("stat.dispenserInspected", - new ChatComponentTranslation("stat.dispenserInspected", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.dispenserInspected", new Object[0]))).registerStat(); public static StatBase field_181734_R = (new StatBasic("stat.noteblockPlayed", - new ChatComponentTranslation("stat.noteblockPlayed", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.noteblockPlayed", new Object[0]))).registerStat(); public static StatBase field_181735_S = (new StatBasic("stat.noteblockTuned", - new ChatComponentTranslation("stat.noteblockTuned", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.noteblockTuned", new Object[0]))).registerStat(); public static StatBase field_181736_T = (new StatBasic("stat.flowerPotted", - new ChatComponentTranslation("stat.flowerPotted", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.flowerPotted", new Object[0]))).registerStat(); public static StatBase field_181737_U = (new StatBasic("stat.trappedChestTriggered", - new ChatComponentTranslation("stat.trappedChestTriggered", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.trappedChestTriggered", new Object[0]))).registerStat(); public static StatBase field_181738_V = (new StatBasic("stat.enderchestOpened", - new ChatComponentTranslation("stat.enderchestOpened", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.enderchestOpened", new Object[0]))).registerStat(); public static StatBase field_181739_W = (new StatBasic("stat.itemEnchanted", - new ChatComponentTranslation("stat.itemEnchanted", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.itemEnchanted", new Object[0]))).registerStat(); public static StatBase field_181740_X = (new StatBasic("stat.recordPlayed", - new ChatComponentTranslation("stat.recordPlayed", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.recordPlayed", new Object[0]))).registerStat(); public static StatBase field_181741_Y = (new StatBasic("stat.furnaceInteraction", - new ChatComponentTranslation("stat.furnaceInteraction", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.furnaceInteraction", new Object[0]))).registerStat(); public static StatBase field_181742_Z = (new StatBasic("stat.craftingTableInteraction", - new ChatComponentTranslation("stat.workbenchInteraction", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.workbenchInteraction", new Object[0]))).registerStat(); public static StatBase field_181723_aa = (new StatBasic("stat.chestOpened", - new ChatComponentTranslation("stat.chestOpened", new Object[0]))).registerStat(); + new TextComponentTranslation("stat.chestOpened", new Object[0]))).registerStat(); public static final StatBase AVIATE_ONE_CM = (new StatBasic("stat.aviateOneCm", - new ChatComponentTranslation("stat.aviateOneCm", new Object[0]))) + new TextComponentTranslation("stat.aviateOneCm", new Object[0]))) .initIndependentStat().registerStat(); public static final StatBase[] mineBlockStatArray = new StatBase[4096]; @@ -304,7 +304,7 @@ public class StatList { int i = Item.getIdFromItem(item); String s = func_180204_a(item); if (s != null) { - objectCraftStats[i] = (new StatCrafting("stat.craftItem.", s, new ChatComponentTranslation( + objectCraftStats[i] = (new StatCrafting("stat.craftItem.", s, new TextComponentTranslation( "stat.craftItem", new Object[] { (new ItemStack(item)).getChatComponent() }), item)) .registerStat(); } @@ -321,7 +321,7 @@ public class StatList { int i = Block.getIdFromBlock(block); String s = func_180204_a(item); if (s != null && block.getEnableStats()) { - mineBlockStatArray[i] = (new StatCrafting("stat.mineBlock.", s, new ChatComponentTranslation( + mineBlockStatArray[i] = (new StatCrafting("stat.mineBlock.", s, new TextComponentTranslation( "stat.mineBlock", new Object[] { (new ItemStack(block)).getChatComponent() }), item)) .registerStat(); objectMineStats.add((StatCrafting) mineBlockStatArray[i]); @@ -338,7 +338,7 @@ public class StatList { int i = Item.getIdFromItem(item); String s = func_180204_a(item); if (s != null) { - objectUseStats[i] = (new StatCrafting("stat.useItem.", s, new ChatComponentTranslation( + objectUseStats[i] = (new StatCrafting("stat.useItem.", s, new TextComponentTranslation( "stat.useItem", new Object[] { (new ItemStack(item)).getChatComponent() }), item)) .registerStat(); if (!(item instanceof ItemBlock)) { @@ -357,7 +357,7 @@ public class StatList { int i = Item.getIdFromItem(item); String s = func_180204_a(item); if (s != null && item.isDamageable()) { - objectBreakStats[i] = (new StatCrafting("stat.breakItem.", s, new ChatComponentTranslation( + objectBreakStats[i] = (new StatCrafting("stat.breakItem.", s, new TextComponentTranslation( "stat.breakItem", new Object[] { (new ItemStack(item)).getChatComponent() }), item)) .registerStat(); } @@ -415,8 +415,8 @@ public class StatList { String s = EntityList.getStringFromID(eggInfo.spawnedID); return s == null ? null : (new StatBase("stat.killEntity." + s, - new ChatComponentTranslation("stat.entityKill", - new Object[] { new ChatComponentTranslation("entity." + s + ".name", new Object[0]) }))) + new TextComponentTranslation("stat.entityKill", + new Object[] { new TextComponentTranslation("entity." + s + ".name", new Object[0]) }))) .registerStat(); } @@ -424,8 +424,8 @@ public class StatList { String s = EntityList.getStringFromID(eggInfo.spawnedID); return s == null ? null : (new StatBase("stat.entityKilledBy." + s, - new ChatComponentTranslation("stat.entityKilledBy", - new Object[] { new ChatComponentTranslation("entity." + s + ".name", new Object[0]) }))) + new TextComponentTranslation("stat.entityKilledBy", + new Object[] { new TextComponentTranslation("entity." + s + ".name", new Object[0]) }))) .registerStat(); } diff --git a/src/main/java/net/minecraft/stats/StatisticsFile.java b/src/main/java/net/minecraft/stats/StatisticsFile.java index a44ed5d..caab803 100644 --- a/src/main/java/net/minecraft/stats/StatisticsFile.java +++ b/src/main/java/net/minecraft/stats/StatisticsFile.java @@ -12,9 +12,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.S37PacketStatistics; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IJsonSerializable; import net.minecraft.util.TupleIntJsonSerializable; +import net.minecraft.util.text.TextComponentTranslation; + import org.json.JSONException; import org.json.JSONObject; @@ -92,7 +93,7 @@ public class StatisticsFile extends StatFileWriter { if (statIn.isAchievement() && i == 0 && parInt1 > 0) { this.field_150886_g = true; if (this.mcServer.isAnnouncingPlayerAchievements()) { - this.mcServer.getConfigurationManager().sendChatMsg(new ChatComponentTranslation( + this.mcServer.getConfigurationManager().sendChatMsg(new TextComponentTranslation( "chat.type.achievement", new Object[] { playerIn.getDisplayName(), statIn.func_150955_j() })); } } @@ -101,7 +102,7 @@ public class StatisticsFile extends StatFileWriter { this.field_150886_g = true; if (this.mcServer.isAnnouncingPlayerAchievements()) { this.mcServer.getConfigurationManager() - .sendChatMsg(new ChatComponentTranslation("chat.type.achievement.taken", + .sendChatMsg(new TextComponentTranslation("chat.type.achievement.taken", new Object[] { playerIn.getDisplayName(), statIn.func_150955_j() })); } } diff --git a/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java b/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java index 454c252..9ce5d5f 100644 --- a/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java +++ b/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java @@ -13,11 +13,11 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StringUtils; import net.minecraft.util.WeightedRandom; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/tileentity/TileEntity.java b/src/main/java/net/minecraft/tileentity/TileEntity.java index ce50696..9657b29 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntity.java +++ b/src/main/java/net/minecraft/tileentity/TileEntity.java @@ -16,7 +16,7 @@ import net.minecraft.crash.CrashReportCategory; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java b/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java index 99ea96b..021ab78 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java @@ -23,9 +23,9 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.AchievementList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; /** * + @@ -65,7 +65,7 @@ public class TileEntityBeacon extends TileEntityLockable implements ITickable, I { Potion.resistance, Potion.jump }, { Potion.damageBoost }, { Potion.regeneration } }; /** * + - * A list of beam segments for this + * A list of beam segments for this */ private final List beamSegments = Lists.newArrayList(); private long beamRenderCounter; diff --git a/src/main/java/net/minecraft/tileentity/TileEntityChest.java b/src/main/java/net/minecraft/tileentity/TileEntityChest.java index 41ee4f5..f820cff 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityChest.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityChest.java @@ -13,10 +13,10 @@ import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java b/src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java index 68437ae..a268d60 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityCommandBlock.java @@ -13,8 +13,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -57,8 +57,8 @@ public class TileEntityCommandBlock extends TileEntity { return TileEntityCommandBlock.this.pos; } - public Vec3 getPositionVector() { - return new Vec3((double) TileEntityCommandBlock.this.pos.getX() + 0.5D, + public Vec3d getPositionVector() { + return new Vec3d((double) TileEntityCommandBlock.this.pos.getX() + 0.5D, (double) TileEntityCommandBlock.this.pos.getY() + 0.5D, (double) TileEntityCommandBlock.this.pos.getZ() + 0.5D); } diff --git a/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java b/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java index 1d3405e..812671c 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityEnchantmentTable.java @@ -7,11 +7,11 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerEnchantment; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IInteractionObject; /** @@ -164,9 +164,9 @@ public class TileEntityEnchantmentTable extends TileEntity implements ITickable, * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } public Container createContainer(InventoryPlayer inventoryplayer, EntityPlayer var2) { diff --git a/src/main/java/net/minecraft/tileentity/TileEntityFurnace.java b/src/main/java/net/minecraft/tileentity/TileEntityFurnace.java index 3dfc2ab..c487583 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityFurnace.java @@ -23,7 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/tileentity/TileEntityHopper.java b/src/main/java/net/minecraft/tileentity/TileEntityHopper.java index e8199ad..d89d636 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityHopper.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityHopper.java @@ -15,12 +15,12 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/tileentity/TileEntityLockable.java b/src/main/java/net/minecraft/tileentity/TileEntityLockable.java index 02e1927..412da17 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityLockable.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityLockable.java @@ -1,9 +1,9 @@ package net.minecraft.tileentity; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.IInteractionObject; import net.minecraft.world.ILockableContainer; import net.minecraft.world.LockCode; @@ -70,8 +70,8 @@ public abstract class TileEntityLockable extends TileEntity implements IInteract * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - public IChatComponent getDisplayName() { - return (IChatComponent) (this.hasCustomName() ? new ChatComponentText(this.getName()) - : new ChatComponentTranslation(this.getName(), new Object[0])); + public ITextComponent getDisplayName() { + return (ITextComponent) (this.hasCustomName() ? new TextComponentString(this.getName()) + : new TextComponentTranslation(this.getName(), new Object[0])); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java b/src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java index 501999b..ee4d599 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityMobSpawner.java @@ -4,8 +4,8 @@ import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/tileentity/TileEntityNote.java b/src/main/java/net/minecraft/tileentity/TileEntityNote.java index 3689517..5e6a7aa 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityNote.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityNote.java @@ -3,8 +3,8 @@ package net.minecraft.tileentity; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** @@ -43,7 +43,7 @@ public class TileEntityNote extends TileEntity { public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); nbttagcompound.setByte("note", this.note); - nbttagcompound.setBoolean("powered", this.previousRedstoneState); + nbttagcompound.setBoolean("powered", this.previousRedstoneState); } public void readFromNBT(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/tileentity/TileEntityPiston.java b/src/main/java/net/minecraft/tileentity/TileEntityPiston.java index d9b9ceb..1bb308e 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntityPiston.java +++ b/src/main/java/net/minecraft/tileentity/TileEntityPiston.java @@ -9,9 +9,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; /** * + diff --git a/src/main/java/net/minecraft/tileentity/TileEntitySign.java b/src/main/java/net/minecraft/tileentity/TileEntitySign.java index dfbb053..f168433 100644 --- a/src/main/java/net/minecraft/tileentity/TileEntitySign.java +++ b/src/main/java/net/minecraft/tileentity/TileEntitySign.java @@ -5,17 +5,17 @@ import net.minecraft.command.CommandResultStats; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.event.ClickEvent; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S33PacketUpdateSign; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentProcessor; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentUtils; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import org.json.JSONException; @@ -50,8 +50,8 @@ import org.json.JSONException; * */ public class TileEntitySign extends TileEntity { - public final IChatComponent[] signText = new IChatComponent[] { new ChatComponentText(""), - new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText("") }; + public final ITextComponent[] signText = new ITextComponent[] { new TextComponentString(""), + new TextComponentString(""), new TextComponentString(""), new TextComponentString("") }; /** * + * The index of the line currently being edited. Only used on @@ -67,7 +67,7 @@ public class TileEntitySign extends TileEntity { super.writeToNBT(nbttagcompound); for (int i = 0; i < 4; ++i) { - String s = IChatComponent.Serializer.componentToJson(this.signText[i]); + String s = ITextComponent.Serializer.componentToJson(this.signText[i]); nbttagcompound.setString("Text" + (i + 1), s); } @@ -82,11 +82,11 @@ public class TileEntitySign extends TileEntity { return "Sign"; } - public IChatComponent getDisplayName() { - return new ChatComponentText(this.getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(this.getName()); } - public void addChatMessage(IChatComponent var1) { + public void addChatMessage(ITextComponent var1) { } public boolean canCommandSenderUseCommand(int var1, String var2) { @@ -97,8 +97,8 @@ public class TileEntitySign extends TileEntity { return TileEntitySign.this.pos; } - public Vec3 getPositionVector() { - return new Vec3((double) TileEntitySign.this.pos.getX() + 0.5D, + public Vec3d getPositionVector() { + return new Vec3d((double) TileEntitySign.this.pos.getX() + 0.5D, (double) TileEntitySign.this.pos.getY() + 0.5D, (double) TileEntitySign.this.pos.getZ() + 0.5D); } @@ -122,16 +122,16 @@ public class TileEntitySign extends TileEntity { String s = nbttagcompound.getString("Text" + (i + 1)); try { - IChatComponent ichatcomponent = IChatComponent.Serializer.jsonToComponent(s); + ITextComponent ichatcomponent = ITextComponent.Serializer.jsonToComponent(s); try { - this.signText[i] = ChatComponentProcessor.processComponent(icommandsender, ichatcomponent, + this.signText[i] = TextComponentUtils.processComponent(icommandsender, ichatcomponent, (Entity) null); } catch (CommandException var7) { this.signText[i] = ichatcomponent; } } catch (JSONException var8) { - this.signText[i] = new ChatComponentText(s); + this.signText[i] = new TextComponentString(s); } } @@ -146,7 +146,7 @@ public class TileEntitySign extends TileEntity { * synchronise the text to be displayed. */ public Packet getDescriptionPacket() { - IChatComponent[] aichatcomponent = new IChatComponent[4]; + ITextComponent[] aichatcomponent = new ITextComponent[4]; System.arraycopy(this.signText, 0, aichatcomponent, 0, 4); return new S33PacketUpdateSign(this.worldObj, this.pos, aichatcomponent); } @@ -185,11 +185,11 @@ public class TileEntitySign extends TileEntity { return playerIn.getName(); } - public IChatComponent getDisplayName() { + public ITextComponent getDisplayName() { return playerIn.getDisplayName(); } - public void addChatMessage(IChatComponent var1) { + public void addChatMessage(ITextComponent var1) { } public boolean canCommandSenderUseCommand(int j, String var2) { @@ -200,8 +200,8 @@ public class TileEntitySign extends TileEntity { return TileEntitySign.this.pos; } - public Vec3 getPositionVector() { - return new Vec3((double) TileEntitySign.this.pos.getX() + 0.5D, + public Vec3d getPositionVector() { + return new Vec3d((double) TileEntitySign.this.pos.getX() + 0.5D, (double) TileEntitySign.this.pos.getY() + 0.5D, (double) TileEntitySign.this.pos.getZ() + 0.5D); } @@ -223,7 +223,7 @@ public class TileEntitySign extends TileEntity { }; for (int i = 0; i < this.signText.length; ++i) { - ChatStyle chatstyle = this.signText[i] == null ? null : this.signText[i].getChatStyle(); + Style chatstyle = this.signText[i] == null ? null : this.signText[i].getChatStyle(); if (chatstyle != null && chatstyle.getChatClickEvent() != null) { ClickEvent clickevent = chatstyle.getChatClickEvent(); if (clickevent.getAction() == ClickEvent.Action.RUN_COMMAND) { diff --git a/src/main/java/net/minecraft/util/CombatEntry.java b/src/main/java/net/minecraft/util/CombatEntry.java index 6ae2ed0..1903698 100644 --- a/src/main/java/net/minecraft/util/CombatEntry.java +++ b/src/main/java/net/minecraft/util/CombatEntry.java @@ -1,6 +1,7 @@ package net.minecraft.util; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.text.ITextComponent; /** * + @@ -75,7 +76,7 @@ public class CombatEntry { return this.field_94566_e; } - public IChatComponent getDamageSrcDisplayName() { + public ITextComponent getDamageSrcDisplayName() { return this.getDamageSrc().getEntity() == null ? null : this.getDamageSrc().getEntity().getDisplayName(); } diff --git a/src/main/java/net/minecraft/util/CombatRules.java b/src/main/java/net/minecraft/util/CombatRules.java index 097b9f3..2b066f2 100644 --- a/src/main/java/net/minecraft/util/CombatRules.java +++ b/src/main/java/net/minecraft/util/CombatRules.java @@ -1,16 +1,15 @@ package net.minecraft.util; -public class CombatRules -{ - public static float func_189427_a(float p_189427_0_, float p_189427_1_, float p_189427_2_) - { +import net.minecraft.util.math.MathHelper; + +public class CombatRules { + public static float func_189427_a(float p_189427_0_, float p_189427_1_, float p_189427_2_) { float f = 2.0F + p_189427_2_ / 4.0F; float f1 = MathHelper.clamp_float(p_189427_1_ - p_189427_0_ / f, p_189427_1_ * 0.2F, 20.0F); return p_189427_0_ * (1.0F - f1 / 25.0F); } - public static float getDamageAfterMagicAbsorb(float p_188401_0_, float p_188401_1_) - { + public static float getDamageAfterMagicAbsorb(float p_188401_0_, float p_188401_1_) { float f = MathHelper.clamp_float(p_188401_1_, 0.0F, 20.0F); return p_188401_0_ * (1.0F - f / 25.0F); } diff --git a/src/main/java/net/minecraft/util/CombatTracker.java b/src/main/java/net/minecraft/util/CombatTracker.java index 06d3330..68bf093 100644 --- a/src/main/java/net/minecraft/util/CombatTracker.java +++ b/src/main/java/net/minecraft/util/CombatTracker.java @@ -10,6 +10,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -96,17 +99,17 @@ public class CombatTracker { } - public IChatComponent getDeathMessage() { + public ITextComponent getDeathMessage() { if (this.combatEntries.size() == 0) { - return new ChatComponentTranslation("death.attack.generic", new Object[] { this.fighter.getDisplayName() }); + return new TextComponentTranslation("death.attack.generic", new Object[] { this.fighter.getDisplayName() }); } else { CombatEntry combatentry = this.func_94544_f(); CombatEntry combatentry1 = (CombatEntry) this.combatEntries.get(this.combatEntries.size() - 1); - IChatComponent ichatcomponent = combatentry1.getDamageSrcDisplayName(); + ITextComponent ichatcomponent = combatentry1.getDamageSrcDisplayName(); Entity entity = combatentry1.getDamageSrc().getEntity(); Object object; if (combatentry != null && combatentry1.getDamageSrc() == DamageSource.fall) { - IChatComponent ichatcomponent1 = combatentry.getDamageSrcDisplayName(); + ITextComponent ichatcomponent1 = combatentry.getDamageSrcDisplayName(); if (combatentry.getDamageSrc() != DamageSource.fall && combatentry.getDamageSrc() != DamageSource.outOfWorld) { if (ichatcomponent1 != null @@ -116,10 +119,10 @@ public class CombatTracker { ? ((EntityLivingBase) entity1).getHeldItem() : null; if (itemstack1 != null && itemstack1.hasDisplayName()) { - object = new ChatComponentTranslation("death.fell.assist.item", new Object[] { + object = new TextComponentTranslation("death.fell.assist.item", new Object[] { this.fighter.getDisplayName(), ichatcomponent1, itemstack1.getChatComponent() }); } else { - object = new ChatComponentTranslation("death.fell.assist", + object = new TextComponentTranslation("death.fell.assist", new Object[] { this.fighter.getDisplayName(), ichatcomponent1 }); } } else if (ichatcomponent != null) { @@ -127,25 +130,25 @@ public class CombatTracker { ? ((EntityLivingBase) entity).getHeldItem() : null; if (itemstack != null && itemstack.hasDisplayName()) { - object = new ChatComponentTranslation("death.fell.finish.item", new Object[] { + object = new TextComponentTranslation("death.fell.finish.item", new Object[] { this.fighter.getDisplayName(), ichatcomponent, itemstack.getChatComponent() }); } else { - object = new ChatComponentTranslation("death.fell.finish", + object = new TextComponentTranslation("death.fell.finish", new Object[] { this.fighter.getDisplayName(), ichatcomponent }); } } else { - object = new ChatComponentTranslation("death.fell.killer", + object = new TextComponentTranslation("death.fell.killer", new Object[] { this.fighter.getDisplayName() }); } } else { - object = new ChatComponentTranslation("death.fell.accident." + this.func_94548_b(combatentry), + object = new TextComponentTranslation("death.fell.accident." + this.func_94548_b(combatentry), new Object[] { this.fighter.getDisplayName() }); } } else { object = combatentry1.getDamageSrc().getDeathMessage(this.fighter); } - return (IChatComponent) object; + return (ITextComponent) object; } } diff --git a/src/main/java/net/minecraft/util/CooldownTracker.java b/src/main/java/net/minecraft/util/CooldownTracker.java index 4c17e1f..ce784bd 100644 --- a/src/main/java/net/minecraft/util/CooldownTracker.java +++ b/src/main/java/net/minecraft/util/CooldownTracker.java @@ -7,6 +7,7 @@ import java.util.Map.Entry; import com.google.common.collect.Maps; import net.minecraft.item.Item; +import net.minecraft.util.math.MathHelper; public class CooldownTracker { private final Map cooldowns = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/util/DamageSource.java b/src/main/java/net/minecraft/util/DamageSource.java index 0227ec9..605ca25 100644 --- a/src/main/java/net/minecraft/util/DamageSource.java +++ b/src/main/java/net/minecraft/util/DamageSource.java @@ -5,6 +5,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityFireball; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.Explosion; /** @@ -220,14 +222,14 @@ public class DamageSource { * + * Gets the death message that is displayed when the player dies */ - public IChatComponent getDeathMessage(EntityLivingBase parEntityLivingBase) { + public ITextComponent getDeathMessage(EntityLivingBase parEntityLivingBase) { EntityLivingBase entitylivingbase = parEntityLivingBase.func_94060_bK(); String s = "death.attack." + this.damageType; String s1 = s + ".player"; return entitylivingbase != null && StatCollector.canTranslate(s1) - ? new ChatComponentTranslation(s1, + ? new TextComponentTranslation(s1, new Object[] { parEntityLivingBase.getDisplayName(), entitylivingbase.getDisplayName() }) - : new ChatComponentTranslation(s, new Object[] { parEntityLivingBase.getDisplayName() }); + : new TextComponentTranslation(s, new Object[] { parEntityLivingBase.getDisplayName() }); } /** diff --git a/src/main/java/net/minecraft/util/EntityDamageSource.java b/src/main/java/net/minecraft/util/EntityDamageSource.java index 749b18f..ad53347 100644 --- a/src/main/java/net/minecraft/util/EntityDamageSource.java +++ b/src/main/java/net/minecraft/util/EntityDamageSource.java @@ -4,6 +4,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -69,17 +71,17 @@ public class EntityDamageSource extends DamageSource { * + * Gets the death message that is displayed when the player dies */ - public IChatComponent getDeathMessage(EntityLivingBase entitylivingbase) { + public ITextComponent getDeathMessage(EntityLivingBase entitylivingbase) { ItemStack itemstack = this.damageSourceEntity instanceof EntityLivingBase ? ((EntityLivingBase) this.damageSourceEntity).getHeldItem() : null; String s = "death.attack." + this.damageType; String s1 = s + ".item"; return itemstack != null && itemstack.hasDisplayName() && StatCollector.canTranslate(s1) - ? new ChatComponentTranslation(s1, + ? new TextComponentTranslation(s1, new Object[] { entitylivingbase.getDisplayName(), this.damageSourceEntity.getDisplayName(), itemstack.getChatComponent() }) - : new ChatComponentTranslation(s, + : new TextComponentTranslation(s, new Object[] { entitylivingbase.getDisplayName(), this.damageSourceEntity.getDisplayName() }); } diff --git a/src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java b/src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java index 9f0f071..eb3f960 100644 --- a/src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java +++ b/src/main/java/net/minecraft/util/EntityDamageSourceIndirect.java @@ -3,6 +3,8 @@ package net.minecraft.util; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.ITextComponent; /** * + @@ -53,8 +55,8 @@ public class EntityDamageSourceIndirect extends EntityDamageSource { * + * Gets the death message that is displayed when the player dies */ - public IChatComponent getDeathMessage(EntityLivingBase entitylivingbase) { - IChatComponent ichatcomponent = this.indirectEntity == null ? this.damageSourceEntity.getDisplayName() + public ITextComponent getDeathMessage(EntityLivingBase entitylivingbase) { + ITextComponent ichatcomponent = this.indirectEntity == null ? this.damageSourceEntity.getDisplayName() : this.indirectEntity.getDisplayName(); ItemStack itemstack = this.indirectEntity instanceof EntityLivingBase ? ((EntityLivingBase) this.indirectEntity).getHeldItem() @@ -62,9 +64,9 @@ public class EntityDamageSourceIndirect extends EntityDamageSource { String s = "death.attack." + this.damageType; String s1 = s + ".item"; return itemstack != null && itemstack.hasDisplayName() && StatCollector.canTranslate(s1) - ? new ChatComponentTranslation(s1, + ? new TextComponentTranslation(s1, new Object[] { entitylivingbase.getDisplayName(), ichatcomponent, itemstack.getChatComponent() }) - : new ChatComponentTranslation(s, new Object[] { entitylivingbase.getDisplayName(), ichatcomponent }); + : new TextComponentTranslation(s, new Object[] { entitylivingbase.getDisplayName(), ichatcomponent }); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/EnumFacing.java b/src/main/java/net/minecraft/util/EnumFacing.java index dab8619..010fa55 100644 --- a/src/main/java/net/minecraft/util/EnumFacing.java +++ b/src/main/java/net/minecraft/util/EnumFacing.java @@ -3,6 +3,8 @@ package net.minecraft.util; import java.util.Iterator; import java.util.Map; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; diff --git a/src/main/java/net/minecraft/util/ScreenShotHelper.java b/src/main/java/net/minecraft/util/ScreenShotHelper.java index c56de39..50a6f08 100644 --- a/src/main/java/net/minecraft/util/ScreenShotHelper.java +++ b/src/main/java/net/minecraft/util/ScreenShotHelper.java @@ -1,6 +1,8 @@ package net.minecraft.util; import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; /** * + @@ -39,7 +41,7 @@ public class ScreenShotHelper { * filename. Args: gameDirectory, requestedWidthInPixels, * requestedHeightInPixels, frameBuffer */ - public static IChatComponent saveScreenshot() { - return new ChatComponentText("Saved Screenshot As: " + PlatformApplication.saveScreenshot()); + public static ITextComponent saveScreenshot() { + return new TextComponentString("Saved Screenshot As: " + PlatformApplication.saveScreenshot()); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/TabCompleter.java b/src/main/java/net/minecraft/util/TabCompleter.java index 1e1c5a3..df827c2 100644 --- a/src/main/java/net/minecraft/util/TabCompleter.java +++ b/src/main/java/net/minecraft/util/TabCompleter.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.network.play.client.C14PacketTabComplete; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public abstract class TabCompleter { /** The {@link GuiTextField} that is backing this {@link TabCompleter} */ diff --git a/src/main/java/net/minecraft/util/Timer.java b/src/main/java/net/minecraft/util/Timer.java index 4ad0d9d..d3ea3f9 100644 --- a/src/main/java/net/minecraft/util/Timer.java +++ b/src/main/java/net/minecraft/util/Timer.java @@ -1,6 +1,7 @@ package net.minecraft.util; import net.minecraft.client.Minecraft; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/util/AxisAlignedBB.java b/src/main/java/net/minecraft/util/math/AxisAlignedBB.java similarity index 93% rename from src/main/java/net/minecraft/util/AxisAlignedBB.java rename to src/main/java/net/minecraft/util/math/AxisAlignedBB.java index 691d66e..45f825c 100644 --- a/src/main/java/net/minecraft/util/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/util/math/AxisAlignedBB.java @@ -1,4 +1,6 @@ -package net.minecraft.util; +package net.minecraft.util.math; + +import net.minecraft.util.EnumFacing; /** * + @@ -244,7 +246,7 @@ public class AxisAlignedBB { * Returns if the supplied Vec3D is completely inside the * bounding box */ - public boolean isVecInside(Vec3 vec) { + public boolean isVecInside(Vec3d vec) { return vec.xCoord > this.minX && vec.xCoord < this.maxX ? (vec.yCoord > this.minY && vec.yCoord < this.maxY ? vec.zCoord > this.minZ && vec.zCoord < this.maxZ : false) @@ -276,13 +278,13 @@ public class AxisAlignedBB { return new AxisAlignedBB(d0, d1, d2, d3, d4, d5); } - public MovingObjectPosition calculateIntercept(Vec3 vecA, Vec3 vecB) { - Vec3 vec3 = vecA.getIntermediateWithXValue(vecB, this.minX); - Vec3 vec31 = vecA.getIntermediateWithXValue(vecB, this.maxX); - Vec3 vec32 = vecA.getIntermediateWithYValue(vecB, this.minY); - Vec3 vec33 = vecA.getIntermediateWithYValue(vecB, this.maxY); - Vec3 vec34 = vecA.getIntermediateWithZValue(vecB, this.minZ); - Vec3 vec35 = vecA.getIntermediateWithZValue(vecB, this.maxZ); + public RayTraceResult calculateIntercept(Vec3d vecA, Vec3d vecB) { + Vec3d vec3 = vecA.getIntermediateWithXValue(vecB, this.minX); + Vec3d vec31 = vecA.getIntermediateWithXValue(vecB, this.maxX); + Vec3d vec32 = vecA.getIntermediateWithYValue(vecB, this.minY); + Vec3d vec33 = vecA.getIntermediateWithYValue(vecB, this.maxY); + Vec3d vec34 = vecA.getIntermediateWithZValue(vecB, this.minZ); + Vec3d vec35 = vecA.getIntermediateWithZValue(vecB, this.maxZ); if (!this.isVecInYZ(vec3)) { vec3 = null; } @@ -307,7 +309,7 @@ public class AxisAlignedBB { vec35 = null; } - Vec3 vec36 = null; + Vec3d vec36 = null; if (vec3 != null) { vec36 = vec3; } @@ -350,7 +352,7 @@ public class AxisAlignedBB { enumfacing = EnumFacing.SOUTH; } - return new MovingObjectPosition(vec36, enumfacing); + return new RayTraceResult(vec36, enumfacing); } } @@ -359,7 +361,7 @@ public class AxisAlignedBB { * Checks if the specified vector is within the YZ dimensions of * the bounding box. Args: Vec3D */ - private boolean isVecInYZ(Vec3 vec) { + private boolean isVecInYZ(Vec3d vec) { return vec == null ? false : vec.yCoord >= this.minY && vec.yCoord <= this.maxY && vec.zCoord >= this.minZ && vec.zCoord <= this.maxZ; @@ -370,7 +372,7 @@ public class AxisAlignedBB { * Checks if the specified vector is within the XZ dimensions of * the bounding box. Args: Vec3D */ - private boolean isVecInXZ(Vec3 vec) { + private boolean isVecInXZ(Vec3d vec) { return vec == null ? false : vec.xCoord >= this.minX && vec.xCoord <= this.maxX && vec.zCoord >= this.minZ && vec.zCoord <= this.maxZ; @@ -381,7 +383,7 @@ public class AxisAlignedBB { * Checks if the specified vector is within the XY dimensions of * the bounding box. Args: Vec3D */ - private boolean isVecInXY(Vec3 vec) { + private boolean isVecInXY(Vec3d vec) { return vec == null ? false : vec.xCoord >= this.minX && vec.xCoord <= this.maxX && vec.yCoord >= this.minY && vec.yCoord <= this.maxY; diff --git a/src/main/java/net/minecraft/util/BlockPos.java b/src/main/java/net/minecraft/util/math/BlockPos.java similarity index 99% rename from src/main/java/net/minecraft/util/BlockPos.java rename to src/main/java/net/minecraft/util/math/BlockPos.java index 7ae4952..11f7506 100644 --- a/src/main/java/net/minecraft/util/BlockPos.java +++ b/src/main/java/net/minecraft/util/math/BlockPos.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; import java.util.Iterator; import java.util.List; @@ -7,6 +7,7 @@ import com.google.common.collect.AbstractIterator; import com.google.common.collect.Lists; import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; /** * + @@ -67,7 +68,7 @@ public class BlockPos extends Vec3i { this(source.posX, source.posY, source.posZ); } - public BlockPos(Vec3 source) { + public BlockPos(Vec3d source) { this(source.xCoord, source.yCoord, source.zCoord); } diff --git a/src/main/java/net/minecraft/util/Cartesian.java b/src/main/java/net/minecraft/util/math/Cartesian.java similarity index 99% rename from src/main/java/net/minecraft/util/Cartesian.java rename to src/main/java/net/minecraft/util/math/Cartesian.java index 3b80016..63cca2b 100644 --- a/src/main/java/net/minecraft/util/Cartesian.java +++ b/src/main/java/net/minecraft/util/math/Cartesian.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/src/main/java/net/minecraft/util/MathHelper.java b/src/main/java/net/minecraft/util/math/MathHelper.java similarity index 99% rename from src/main/java/net/minecraft/util/MathHelper.java rename to src/main/java/net/minecraft/util/math/MathHelper.java index 9c32ec4..7b200eb 100644 --- a/src/main/java/net/minecraft/util/MathHelper.java +++ b/src/main/java/net/minecraft/util/math/MathHelper.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; import net.jafama.FastMath; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; diff --git a/src/main/java/net/minecraft/util/MovingObjectPosition.java b/src/main/java/net/minecraft/util/math/RayTraceResult.java similarity index 66% rename from src/main/java/net/minecraft/util/MovingObjectPosition.java rename to src/main/java/net/minecraft/util/math/RayTraceResult.java index 0290337..9eb2036 100644 --- a/src/main/java/net/minecraft/util/MovingObjectPosition.java +++ b/src/main/java/net/minecraft/util/math/RayTraceResult.java @@ -1,6 +1,7 @@ -package net.minecraft.util; +package net.minecraft.util.math; import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; /** * + @@ -31,35 +32,35 @@ import net.minecraft.entity.Entity; * POSSIBILITY OF SUCH DAMAGE. * */ -public class MovingObjectPosition { +public class RayTraceResult { private BlockPos blockPos; - public MovingObjectPosition.MovingObjectType typeOfHit; + public RayTraceResult.MovingObjectType typeOfHit; public EnumFacing sideHit; - public Vec3 hitVec; + public Vec3d hitVec; public Entity entityHit; - public MovingObjectPosition(Vec3 hitVecIn, EnumFacing facing, BlockPos blockPosIn) { - this(MovingObjectPosition.MovingObjectType.BLOCK, hitVecIn, facing, blockPosIn); + public RayTraceResult(Vec3d hitVecIn, EnumFacing facing, BlockPos blockPosIn) { + this(RayTraceResult.MovingObjectType.BLOCK, hitVecIn, facing, blockPosIn); } - public MovingObjectPosition(Vec3 parVec3_1, EnumFacing facing) { - this(MovingObjectPosition.MovingObjectType.BLOCK, parVec3_1, facing, BlockPos.ORIGIN); + public RayTraceResult(Vec3d parVec3_1, EnumFacing facing) { + this(RayTraceResult.MovingObjectType.BLOCK, parVec3_1, facing, BlockPos.ORIGIN); } - public MovingObjectPosition(Entity parEntity) { - this(parEntity, new Vec3(parEntity.posX, parEntity.posY, parEntity.posZ)); + public RayTraceResult(Entity parEntity) { + this(parEntity, new Vec3d(parEntity.posX, parEntity.posY, parEntity.posZ)); } - public MovingObjectPosition(MovingObjectPosition.MovingObjectType typeOfHitIn, Vec3 hitVecIn, EnumFacing sideHitIn, + public RayTraceResult(RayTraceResult.MovingObjectType typeOfHitIn, Vec3d hitVecIn, EnumFacing sideHitIn, BlockPos blockPosIn) { this.typeOfHit = typeOfHitIn; this.blockPos = blockPosIn; this.sideHit = sideHitIn; - this.hitVec = new Vec3(hitVecIn.xCoord, hitVecIn.yCoord, hitVecIn.zCoord); + this.hitVec = new Vec3d(hitVecIn.xCoord, hitVecIn.yCoord, hitVecIn.zCoord); } - public MovingObjectPosition(Entity entityHitIn, Vec3 hitVecIn) { - this.typeOfHit = MovingObjectPosition.MovingObjectType.ENTITY; + public RayTraceResult(Entity entityHitIn, Vec3d hitVecIn) { + this.typeOfHit = RayTraceResult.MovingObjectType.ENTITY; this.entityHit = entityHitIn; this.hitVec = hitVecIn; } diff --git a/src/main/java/net/minecraft/util/Vec3.java b/src/main/java/net/minecraft/util/math/Vec3d.java similarity index 77% rename from src/main/java/net/minecraft/util/Vec3.java rename to src/main/java/net/minecraft/util/math/Vec3d.java index c84c006..f8dd0f0 100644 --- a/src/main/java/net/minecraft/util/Vec3.java +++ b/src/main/java/net/minecraft/util/math/Vec3d.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; /** * + @@ -29,12 +29,12 @@ package net.minecraft.util; * POSSIBILITY OF SUCH DAMAGE. * */ -public class Vec3 { +public class Vec3d { public final double xCoord; public final double yCoord; public final double zCoord; - public Vec3(double x, double y, double z) { + public Vec3d(double x, double y, double z) { if (x == -0.0D) { x = 0.0D; } @@ -52,7 +52,7 @@ public class Vec3 { this.zCoord = z; } - public Vec3(Vec3i parVec3i) { + public Vec3d(Vec3i parVec3i) { this((double) parVec3i.getX(), (double) parVec3i.getY(), (double) parVec3i.getZ()); } @@ -61,8 +61,8 @@ public class Vec3 { * Returns a new vector with the result of the specified vector * minus this. */ - public Vec3 subtractReverse(Vec3 vec) { - return new Vec3(vec.xCoord - this.xCoord, vec.yCoord - this.yCoord, vec.zCoord - this.zCoord); + public Vec3d subtractReverse(Vec3d vec) { + return new Vec3d(vec.xCoord - this.xCoord, vec.yCoord - this.yCoord, vec.zCoord - this.zCoord); } /** @@ -70,14 +70,14 @@ public class Vec3 { * Normalizes the vector to a length of 1 (except if it is the * zero vector) */ - public Vec3 normalize() { + public Vec3d normalize() { double d0 = (double) MathHelper .sqrt_double(this.xCoord * this.xCoord + this.yCoord * this.yCoord + this.zCoord * this.zCoord); - return d0 < 1.0E-4D ? new Vec3(0.0D, 0.0D, 0.0D) - : new Vec3(this.xCoord / d0, this.yCoord / d0, this.zCoord / d0); + return d0 < 1.0E-4D ? new Vec3d(0.0D, 0.0D, 0.0D) + : new Vec3d(this.xCoord / d0, this.yCoord / d0, this.zCoord / d0); } - public double dotProduct(Vec3 vec) { + public double dotProduct(Vec3d vec) { return this.xCoord * vec.xCoord + this.yCoord * vec.yCoord + this.zCoord * vec.zCoord; } @@ -86,21 +86,21 @@ public class Vec3 { * Returns a new vector with the result of this vector x the * specified vector. */ - public Vec3 crossProduct(Vec3 vec) { - return new Vec3(this.yCoord * vec.zCoord - this.zCoord * vec.yCoord, + public Vec3d crossProduct(Vec3d vec) { + return new Vec3d(this.yCoord * vec.zCoord - this.zCoord * vec.yCoord, this.zCoord * vec.xCoord - this.xCoord * vec.zCoord, this.xCoord * vec.yCoord - this.yCoord * vec.xCoord); } - public Vec3 subtract(Vec3 vec) { + public Vec3d subtract(Vec3d vec) { return this.subtract(vec.xCoord, vec.yCoord, vec.zCoord); } - public Vec3 subtract(double x, double y, double z) { + public Vec3d subtract(double x, double y, double z) { return this.addVector(-x, -y, -z); } - public Vec3 add(Vec3 vec) { + public Vec3d add(Vec3d vec) { return this.addVector(vec.xCoord, vec.yCoord, vec.zCoord); } @@ -109,8 +109,8 @@ public class Vec3 { * Adds the specified x,y,z vector components to this vector and * returns the resulting vector. Does not change this vector. */ - public Vec3 addVector(double x, double y, double z) { - return new Vec3(this.xCoord + x, this.yCoord + y, this.zCoord + z); + public Vec3d addVector(double x, double y, double z) { + return new Vec3d(this.xCoord + x, this.yCoord + y, this.zCoord + z); } /** @@ -118,7 +118,7 @@ public class Vec3 { * Euclidean distance between this and the specified vector, * returned as double. */ - public double distanceTo(Vec3 vec) { + public double distanceTo(Vec3d vec) { double d0 = vec.xCoord - this.xCoord; double d1 = vec.yCoord - this.yCoord; double d2 = vec.zCoord - this.zCoord; @@ -130,7 +130,7 @@ public class Vec3 { * The square of the Euclidean distance between this and the * specified vector. */ - public double squareDistanceTo(Vec3 vec) { + public double squareDistanceTo(Vec3d vec) { double d0 = vec.xCoord - this.xCoord; double d1 = vec.yCoord - this.yCoord; double d2 = vec.zCoord - this.zCoord; @@ -152,7 +152,7 @@ public class Vec3 { * parameter, along the line between this vector and the passed * in vector, or null if not possible. */ - public Vec3 getIntermediateWithXValue(Vec3 vec, double x) { + public Vec3d getIntermediateWithXValue(Vec3d vec, double x) { double d0 = vec.xCoord - this.xCoord; double d1 = vec.yCoord - this.yCoord; double d2 = vec.zCoord - this.zCoord; @@ -161,7 +161,7 @@ public class Vec3 { } else { double d3 = (x - this.xCoord) / d0; return d3 >= 0.0D && d3 <= 1.0D - ? new Vec3(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) + ? new Vec3d(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) : null; } } @@ -172,7 +172,7 @@ public class Vec3 { * parameter, along the line between this vector and the passed * in vector, or null if not possible. */ - public Vec3 getIntermediateWithYValue(Vec3 vec, double y) { + public Vec3d getIntermediateWithYValue(Vec3d vec, double y) { double d0 = vec.xCoord - this.xCoord; double d1 = vec.yCoord - this.yCoord; double d2 = vec.zCoord - this.zCoord; @@ -181,7 +181,7 @@ public class Vec3 { } else { double d3 = (y - this.yCoord) / d1; return d3 >= 0.0D && d3 <= 1.0D - ? new Vec3(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) + ? new Vec3d(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) : null; } } @@ -192,7 +192,7 @@ public class Vec3 { * parameter, along the line between this vector and the passed * in vector, or null if not possible. */ - public Vec3 getIntermediateWithZValue(Vec3 vec, double z) { + public Vec3d getIntermediateWithZValue(Vec3d vec, double z) { double d0 = vec.xCoord - this.xCoord; double d1 = vec.yCoord - this.yCoord; double d2 = vec.zCoord - this.zCoord; @@ -201,7 +201,7 @@ public class Vec3 { } else { double d3 = (z - this.zCoord) / d2; return d3 >= 0.0D && d3 <= 1.0D - ? new Vec3(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) + ? new Vec3d(this.xCoord + d0 * d3, this.yCoord + d1 * d3, this.zCoord + d2 * d3) : null; } } @@ -210,21 +210,21 @@ public class Vec3 { return "(" + this.xCoord + ", " + this.yCoord + ", " + this.zCoord + ")"; } - public Vec3 rotatePitch(float pitch) { + public Vec3d rotatePitch(float pitch) { float f = MathHelper.cos(pitch); float f1 = MathHelper.sin(pitch); double d0 = this.xCoord; double d1 = this.yCoord * (double) f + this.zCoord * (double) f1; double d2 = this.zCoord * (double) f - this.yCoord * (double) f1; - return new Vec3(d0, d1, d2); + return new Vec3d(d0, d1, d2); } - public Vec3 rotateYaw(float yaw) { + public Vec3d rotateYaw(float yaw) { float f = MathHelper.cos(yaw); float f1 = MathHelper.sin(yaw); double d0 = this.xCoord * (double) f + this.zCoord * (double) f1; double d1 = this.yCoord; double d2 = this.zCoord * (double) f - this.xCoord * (double) f1; - return new Vec3(d0, d1, d2); + return new Vec3d(d0, d1, d2); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/Vec3i.java b/src/main/java/net/minecraft/util/math/Vec3i.java similarity index 99% rename from src/main/java/net/minecraft/util/Vec3i.java rename to src/main/java/net/minecraft/util/math/Vec3i.java index d33b51a..9b74839 100644 --- a/src/main/java/net/minecraft/util/Vec3i.java +++ b/src/main/java/net/minecraft/util/math/Vec3i.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; import com.google.common.base.Objects; diff --git a/src/main/java/net/minecraft/util/Vec4b.java b/src/main/java/net/minecraft/util/math/Vec4b.java similarity index 98% rename from src/main/java/net/minecraft/util/Vec4b.java rename to src/main/java/net/minecraft/util/math/Vec4b.java index fff20fb..e94aee9 100644 --- a/src/main/java/net/minecraft/util/Vec4b.java +++ b/src/main/java/net/minecraft/util/math/Vec4b.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.math; /** * + diff --git a/src/main/java/net/minecraft/util/IRegistry.java b/src/main/java/net/minecraft/util/registry/IRegistry.java similarity index 97% rename from src/main/java/net/minecraft/util/IRegistry.java rename to src/main/java/net/minecraft/util/registry/IRegistry.java index 5272a6e..4ef0131 100644 --- a/src/main/java/net/minecraft/util/IRegistry.java +++ b/src/main/java/net/minecraft/util/registry/IRegistry.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.registry; import java.util.Set; diff --git a/src/main/java/net/minecraft/util/RegistryDefaulted.java b/src/main/java/net/minecraft/util/registry/RegistryDefaulted.java similarity index 97% rename from src/main/java/net/minecraft/util/RegistryDefaulted.java rename to src/main/java/net/minecraft/util/registry/RegistryDefaulted.java index 7103605..9607f3a 100644 --- a/src/main/java/net/minecraft/util/RegistryDefaulted.java +++ b/src/main/java/net/minecraft/util/registry/RegistryDefaulted.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.registry; /** * + diff --git a/src/main/java/net/minecraft/util/RegistryNamespaced.java b/src/main/java/net/minecraft/util/registry/RegistryNamespaced.java similarity index 95% rename from src/main/java/net/minecraft/util/RegistryNamespaced.java rename to src/main/java/net/minecraft/util/registry/RegistryNamespaced.java index c5ab8a3..4239d16 100644 --- a/src/main/java/net/minecraft/util/RegistryNamespaced.java +++ b/src/main/java/net/minecraft/util/registry/RegistryNamespaced.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.registry; import java.util.Iterator; import java.util.Map; @@ -6,6 +6,9 @@ import java.util.Map; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import net.minecraft.util.IObjectIntIterable; +import net.minecraft.util.ObjectIntIdentityMap; + /** * + * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. diff --git a/src/main/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java b/src/main/java/net/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java similarity index 98% rename from src/main/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java rename to src/main/java/net/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java index 5d18788..5e40000 100644 --- a/src/main/java/net/minecraft/util/RegistryNamespacedDefaultedByKey.java +++ b/src/main/java/net/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.registry; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/net/minecraft/util/RegistrySimple.java b/src/main/java/net/minecraft/util/registry/RegistrySimple.java similarity index 98% rename from src/main/java/net/minecraft/util/RegistrySimple.java rename to src/main/java/net/minecraft/util/registry/RegistrySimple.java index 91f0111..57ff70f 100644 --- a/src/main/java/net/minecraft/util/RegistrySimple.java +++ b/src/main/java/net/minecraft/util/registry/RegistrySimple.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.registry; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/net/minecraft/util/IChatComponent.java b/src/main/java/net/minecraft/util/text/ITextComponent.java similarity index 70% rename from src/main/java/net/minecraft/util/IChatComponent.java rename to src/main/java/net/minecraft/util/text/ITextComponent.java index 05ad77f..8738980 100644 --- a/src/main/java/net/minecraft/util/IChatComponent.java +++ b/src/main/java/net/minecraft/util/text/ITextComponent.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.List; @@ -38,22 +38,22 @@ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; * POSSIBILITY OF SUCH DAMAGE. * */ -public interface IChatComponent extends Iterable { - IChatComponent setChatStyle(ChatStyle var1); +public interface ITextComponent extends Iterable { + ITextComponent setChatStyle(Style var1); - ChatStyle getChatStyle(); + Style getChatStyle(); /** * + * Appends the given text to the end of this component. */ - IChatComponent appendText(String var1); + ITextComponent appendText(String var1); /** * + * Appends the given component to the end of this one. */ - IChatComponent appendSibling(IChatComponent var1); + ITextComponent appendSibling(ITextComponent var1); /** * + @@ -81,27 +81,27 @@ public interface IChatComponent extends Iterable { * + * Gets the sibling components of this one. */ - List getSiblings(); + List getSiblings(); /** * + * Creates a copy of this component. Almost a deep copy, except * the style is shallow-copied. */ - IChatComponent createCopy(); + ITextComponent createCopy(); - public static class Serializer implements JSONTypeCodec { + public static class Serializer implements JSONTypeCodec { - public IChatComponent deserialize(Object parJsonElement) throws JSONException { + public ITextComponent deserialize(Object parJsonElement) throws JSONException { if (parJsonElement instanceof String) { - return new ChatComponentText((String) parJsonElement); + return new TextComponentString((String) parJsonElement); } else if (!(parJsonElement instanceof JSONObject)) { if (parJsonElement instanceof JSONArray) { JSONArray jsonarray1 = (JSONArray) parJsonElement; - IChatComponent ichatcomponent = null; + ITextComponent ichatcomponent = null; for (int i = 0, l = jsonarray1.length(); i < l; ++i) { - IChatComponent ichatcomponent1 = this.deserialize(jsonarray1.get(i)); + ITextComponent ichatcomponent1 = this.deserialize(jsonarray1.get(i)); if (ichatcomponent == null) { ichatcomponent = ichatcomponent1; } else { @@ -118,7 +118,7 @@ public interface IChatComponent extends Iterable { JSONObject jsonobject = (JSONObject) parJsonElement; Object object; if (jsonobject.has("text")) { - object = new ChatComponentText(jsonobject.getString("text")); + object = new TextComponentString(jsonobject.getString("text")); } else if (jsonobject.has("translate")) { String s = jsonobject.getString("translate"); if (jsonobject.has("with")) { @@ -127,8 +127,8 @@ public interface IChatComponent extends Iterable { for (int i = 0; i < aobject.length; ++i) { aobject[i] = this.deserialize(jsonarray.get(i)); - if (aobject[i] instanceof ChatComponentText) { - ChatComponentText chatcomponenttext = (ChatComponentText) aobject[i]; + if (aobject[i] instanceof TextComponentString) { + TextComponentString chatcomponenttext = (TextComponentString) aobject[i]; if (chatcomponenttext.getChatStyle().isEmpty() && chatcomponenttext.getSiblings().isEmpty()) { aobject[i] = chatcomponenttext.getChatComponentText_TextValue(); @@ -136,9 +136,9 @@ public interface IChatComponent extends Iterable { } } - object = new ChatComponentTranslation(s, aobject); + object = new TextComponentTranslation(s, aobject); } else { - object = new ChatComponentTranslation(s, new Object[0]); + object = new TextComponentTranslation(s, new Object[0]); } } else if (jsonobject.has("score")) { JSONObject jsonobject1 = jsonobject.getJSONObject("score"); @@ -146,9 +146,9 @@ public interface IChatComponent extends Iterable { throw new JSONException("A score component needs a least a name and an objective"); } - object = new ChatComponentScore(jsonobject1.getString("name"), jsonobject1.getString("objective")); + object = new TextComponentScore(jsonobject1.getString("name"), jsonobject1.getString("objective")); if (jsonobject1.has("value")) { - ((ChatComponentScore) object).setValue(jsonobject1.getString("value")); + ((TextComponentScore) object).setValue(jsonobject1.getString("value")); } } else { if (!jsonobject.has("selector")) { @@ -156,7 +156,7 @@ public interface IChatComponent extends Iterable { "Don\'t know how to turn " + parJsonElement.toString() + " into a Component"); } - object = new ChatComponentSelector(jsonobject.getString("selector")); + object = new TextComponentSelector(jsonobject.getString("selector")); } if (jsonobject.has("extra")) { @@ -166,26 +166,26 @@ public interface IChatComponent extends Iterable { } for (int j = 0; j < jsonarray2.length(); ++j) { - ((IChatComponent) object).appendSibling(this.deserialize(jsonarray2.get(j))); + ((ITextComponent) object).appendSibling(this.deserialize(jsonarray2.get(j))); } } - ((IChatComponent) object).setChatStyle(JSONTypeProvider.deserialize(parJsonElement, ChatStyle.class)); - return (IChatComponent) object; + ((ITextComponent) object).setChatStyle(JSONTypeProvider.deserialize(parJsonElement, Style.class)); + return (ITextComponent) object; } } - private void serializeChatStyle(ChatStyle style, JSONObject object) { + private void serializeChatStyle(Style style, JSONObject object) { JSONObject jsonelement = JSONTypeProvider.serialize(style); for (String entry : jsonelement.keySet()) { object.put(entry, jsonelement.get(entry)); } } - public Object serialize(IChatComponent ichatcomponent) { - if (ichatcomponent instanceof ChatComponentText && ichatcomponent.getChatStyle().isEmpty() + public Object serialize(ITextComponent ichatcomponent) { + if (ichatcomponent instanceof TextComponentString && ichatcomponent.getChatStyle().isEmpty() && ichatcomponent.getSiblings().isEmpty()) { - return ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue(); + return ((TextComponentString) ichatcomponent).getChatComponentText_TextValue(); } else { JSONObject jsonobject = new JSONObject(); if (!ichatcomponent.getChatStyle().isEmpty()) { @@ -195,7 +195,7 @@ public interface IChatComponent extends Iterable { if (!ichatcomponent.getSiblings().isEmpty()) { JSONArray jsonarray = new JSONArray(); - List lst = ichatcomponent.getSiblings(); + List lst = ichatcomponent.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { jsonarray.put(this.serialize(lst.get(i))); } @@ -203,10 +203,10 @@ public interface IChatComponent extends Iterable { jsonobject.put("extra", jsonarray); } - if (ichatcomponent instanceof ChatComponentText) { - jsonobject.put("text", ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue()); - } else if (ichatcomponent instanceof ChatComponentTranslation) { - ChatComponentTranslation chatcomponenttranslation = (ChatComponentTranslation) ichatcomponent; + if (ichatcomponent instanceof TextComponentString) { + jsonobject.put("text", ((TextComponentString) ichatcomponent).getChatComponentText_TextValue()); + } else if (ichatcomponent instanceof TextComponentTranslation) { + TextComponentTranslation chatcomponenttranslation = (TextComponentTranslation) ichatcomponent; jsonobject.put("translate", chatcomponenttranslation.getKey()); if (chatcomponenttranslation.getFormatArgs() != null && chatcomponenttranslation.getFormatArgs().length > 0) { @@ -215,8 +215,8 @@ public interface IChatComponent extends Iterable { Object[] arr = chatcomponenttranslation.getFormatArgs(); for (int i = 0; i < arr.length; ++i) { Object object = arr[i]; - if (object instanceof IChatComponent) { - jsonarray1.put(this.serialize((IChatComponent) object)); + if (object instanceof ITextComponent) { + jsonarray1.put(this.serialize((ITextComponent) object)); } else { jsonarray1.put(String.valueOf(object)); } @@ -224,20 +224,20 @@ public interface IChatComponent extends Iterable { jsonobject.put("with", jsonarray1); } - } else if (ichatcomponent instanceof ChatComponentScore) { - ChatComponentScore chatcomponentscore = (ChatComponentScore) ichatcomponent; + } else if (ichatcomponent instanceof TextComponentScore) { + TextComponentScore chatcomponentscore = (TextComponentScore) ichatcomponent; JSONObject jsonobject1 = new JSONObject(); jsonobject1.put("name", chatcomponentscore.getName()); jsonobject1.put("objective", chatcomponentscore.getObjective()); jsonobject1.put("value", chatcomponentscore.getUnformattedTextForChat()); jsonobject.put("score", jsonobject1); } else { - if (!(ichatcomponent instanceof ChatComponentSelector)) { + if (!(ichatcomponent instanceof TextComponentSelector)) { throw new IllegalArgumentException( "Don\'t know how to serialize " + ichatcomponent + " as a Component"); } - ChatComponentSelector chatcomponentselector = (ChatComponentSelector) ichatcomponent; + TextComponentSelector chatcomponentselector = (TextComponentSelector) ichatcomponent; jsonobject.put("selector", chatcomponentselector.getSelector()); } @@ -248,8 +248,8 @@ public interface IChatComponent extends Iterable { /** * So sorry for this implementation */ - public static String componentToJson(IChatComponent component) { - if ((component instanceof ChatComponentText) && component.getChatStyle().isEmpty() + public static String componentToJson(ITextComponent component) { + if ((component instanceof TextComponentString) && component.getChatStyle().isEmpty() && component.getSiblings().isEmpty()) { String escaped = new JSONObject().put("E", component.getUnformattedTextForChat()).toString(); return escaped.substring(5, escaped.length() - 1); @@ -258,16 +258,16 @@ public interface IChatComponent extends Iterable { } } - public static IChatComponent jsonToComponent(String json) { + public static ITextComponent jsonToComponent(String json) { if (json.equals("null")) { - return new ChatComponentText(""); + return new TextComponentString(""); } - return (IChatComponent) JSONTypeProvider.deserialize(json, IChatComponent.class); + return (ITextComponent) JSONTypeProvider.deserialize(json, ITextComponent.class); } } - public static IChatComponent join(List components) { - ChatComponentText chatcomponenttext = new ChatComponentText(""); + public static ITextComponent join(List components) { + TextComponentString chatcomponenttext = new TextComponentString(""); for (int i = 0; i < components.size(); ++i) { if (i > 0) { @@ -278,7 +278,7 @@ public interface IChatComponent extends Iterable { } } - chatcomponenttext.appendSibling((IChatComponent) components.get(i)); + chatcomponenttext.appendSibling((ITextComponent) components.get(i)); } return chatcomponenttext; diff --git a/src/main/java/net/minecraft/util/ChatStyle.java b/src/main/java/net/minecraft/util/text/Style.java similarity index 90% rename from src/main/java/net/minecraft/util/ChatStyle.java rename to src/main/java/net/minecraft/util/text/Style.java index 1014b0e..4b0b555 100644 --- a/src/main/java/net/minecraft/util/ChatStyle.java +++ b/src/main/java/net/minecraft/util/text/Style.java @@ -1,12 +1,13 @@ -package net.minecraft.util; +package net.minecraft.util.text; import org.json.JSONException; import org.json.JSONObject; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -import net.minecraft.event.ClickEvent; -import net.minecraft.event.HoverEvent; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.event.HoverEvent; /** * + @@ -37,8 +38,8 @@ import net.minecraft.event.HoverEvent; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatStyle { - private ChatStyle parentStyle; +public class Style { + private Style parentStyle; private EnumChatFormatting color; private Boolean bold; private Boolean italic; @@ -53,7 +54,7 @@ public class ChatStyle { * The base of the ChatStyle hierarchy. All ChatStyle instances * are implicitly children of this. */ - private static final ChatStyle rootStyle = new ChatStyle() { + private static final Style rootStyle = new Style() { /** * + * Gets the effective color of this ChatStyle. @@ -134,7 +135,7 @@ public class ChatStyle { * use color values for this; set other values using the * specific methods. */ - public ChatStyle setColor(EnumChatFormatting color) { + public Style setColor(EnumChatFormatting color) { throw new UnsupportedOperationException(); } @@ -144,7 +145,7 @@ public class ChatStyle { * Set to false if, e.g., the parent style is bold and you want * text of this style to be unbolded. */ - public ChatStyle setBold(Boolean boldIn) { + public Style setBold(Boolean boldIn) { throw new UnsupportedOperationException(); } @@ -154,7 +155,7 @@ public class ChatStyle { * italicized. Set to false if, e.g., the parent style is * italicized and you want to override that for this style. */ - public ChatStyle setItalic(Boolean italic) { + public Style setItalic(Boolean italic) { throw new UnsupportedOperationException(); } @@ -164,7 +165,7 @@ public class ChatStyle { * strikethrough. Set to false if, e.g., the parent style uses * strikethrough and you want to override that for this style. */ - public ChatStyle setStrikethrough(Boolean strikethrough) { + public Style setStrikethrough(Boolean strikethrough) { throw new UnsupportedOperationException(); } @@ -174,7 +175,7 @@ public class ChatStyle { * underlined. Set to false if, e.g., the parent style is * underlined and you want to override that for this style. */ - public ChatStyle setUnderlined(Boolean underlined) { + public Style setUnderlined(Boolean underlined) { throw new UnsupportedOperationException(); } @@ -184,7 +185,7 @@ public class ChatStyle { * obfuscated. Set to false if, e.g., the parent style is * obfuscated and you want to override that for this style. */ - public ChatStyle setObfuscated(Boolean obfuscated) { + public Style setObfuscated(Boolean obfuscated) { throw new UnsupportedOperationException(); } @@ -193,7 +194,7 @@ public class ChatStyle { * Sets the event that should be run when text of this ChatStyle * is clicked on. */ - public ChatStyle setChatClickEvent(ClickEvent event) { + public Style setChatClickEvent(ClickEvent event) { throw new UnsupportedOperationException(); } @@ -202,7 +203,7 @@ public class ChatStyle { * Sets the event that should be run when text of this ChatStyle * is hovered over. */ - public ChatStyle setChatHoverEvent(HoverEvent event) { + public Style setChatHoverEvent(HoverEvent event) { throw new UnsupportedOperationException(); } @@ -212,7 +213,7 @@ public class ChatStyle { * override some value. Without a parent, obvious defaults are * used (bold: false, underlined: false, etc). */ - public ChatStyle setParentStyle(ChatStyle parent) { + public Style setParentStyle(Style parent) { throw new UnsupportedOperationException(); } @@ -228,7 +229,7 @@ public class ChatStyle { * both this instance and the copy, wherever either does not * override a value. */ - public ChatStyle createShallowCopy() { + public Style createShallowCopy() { return this; } @@ -237,7 +238,7 @@ public class ChatStyle { * Creates a deep copy of this style. No changes to this * instance or its parent style will be reflected in the copy. */ - public ChatStyle createDeepCopy() { + public Style createDeepCopy() { return this; } @@ -342,7 +343,7 @@ public class ChatStyle { * use color values for this; set other values using the * specific methods. */ - public ChatStyle setColor(EnumChatFormatting enumchatformatting) { + public Style setColor(EnumChatFormatting enumchatformatting) { this.color = enumchatformatting; return this; } @@ -353,7 +354,7 @@ public class ChatStyle { * Set to false if, e.g., the parent style is bold and you want * text of this style to be unbolded. */ - public ChatStyle setBold(Boolean obool) { + public Style setBold(Boolean obool) { this.bold = obool; return this; } @@ -364,7 +365,7 @@ public class ChatStyle { * italicized. Set to false if, e.g., the parent style is * italicized and you want to override that for this style. */ - public ChatStyle setItalic(Boolean obool) { + public Style setItalic(Boolean obool) { this.italic = obool; return this; } @@ -375,7 +376,7 @@ public class ChatStyle { * strikethrough. Set to false if, e.g., the parent style uses * strikethrough and you want to override that for this style. */ - public ChatStyle setStrikethrough(Boolean obool) { + public Style setStrikethrough(Boolean obool) { this.strikethrough = obool; return this; } @@ -386,7 +387,7 @@ public class ChatStyle { * underlined. Set to false if, e.g., the parent style is * underlined and you want to override that for this style. */ - public ChatStyle setUnderlined(Boolean obool) { + public Style setUnderlined(Boolean obool) { this.underlined = obool; return this; } @@ -397,7 +398,7 @@ public class ChatStyle { * obfuscated. Set to false if, e.g., the parent style is * obfuscated and you want to override that for this style. */ - public ChatStyle setObfuscated(Boolean obool) { + public Style setObfuscated(Boolean obool) { this.obfuscated = obool; return this; } @@ -407,7 +408,7 @@ public class ChatStyle { * Sets the event that should be run when text of this ChatStyle * is clicked on. */ - public ChatStyle setChatClickEvent(ClickEvent clickevent) { + public Style setChatClickEvent(ClickEvent clickevent) { this.chatClickEvent = clickevent; return this; } @@ -417,7 +418,7 @@ public class ChatStyle { * Sets the event that should be run when text of this ChatStyle * is hovered over. */ - public ChatStyle setChatHoverEvent(HoverEvent hoverevent) { + public Style setChatHoverEvent(HoverEvent hoverevent) { this.chatHoverEvent = hoverevent; return this; } @@ -427,7 +428,7 @@ public class ChatStyle { * Set a text to be inserted into Chat when the component is * shift-clicked */ - public ChatStyle setInsertion(String insertion) { + public Style setInsertion(String insertion) { this.insertion = insertion; return this; } @@ -438,7 +439,7 @@ public class ChatStyle { * override some value. Without a parent, obvious defaults are * used (bold: false, underlined: false, etc). */ - public ChatStyle setParentStyle(ChatStyle chatstyle) { + public Style setParentStyle(Style chatstyle) { this.parentStyle = chatstyle; return this; } @@ -485,7 +486,7 @@ public class ChatStyle { * + * Gets the immediate parent of this ChatStyle. */ - private ChatStyle getParent() { + private Style getParent() { return this.parentStyle == null ? rootStyle : this.parentStyle; } @@ -499,12 +500,12 @@ public class ChatStyle { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatStyle)) { + } else if (!(object instanceof Style)) { return false; } else { boolean flag; label0: { - ChatStyle chatstyle = (ChatStyle) object; + Style chatstyle = (Style) object; if (this.getBold() == chatstyle.getBold() && this.getColor() == chatstyle.getColor() && this.getItalic() == chatstyle.getItalic() && this.getObfuscated() == chatstyle.getObfuscated() @@ -567,8 +568,8 @@ public class ChatStyle { * both this instance and the copy, wherever either does not * override a value. */ - public ChatStyle createShallowCopy() { - ChatStyle chatstyle = new ChatStyle(); + public Style createShallowCopy() { + Style chatstyle = new Style(); chatstyle.bold = this.bold; chatstyle.italic = this.italic; chatstyle.strikethrough = this.strikethrough; @@ -587,8 +588,8 @@ public class ChatStyle { * Creates a deep copy of this style. No changes to this * instance or its parent style will be reflected in the copy. */ - public ChatStyle createDeepCopy() { - ChatStyle chatstyle = new ChatStyle(); + public Style createDeepCopy() { + Style chatstyle = new Style(); chatstyle.setBold(Boolean.valueOf(this.getBold())); chatstyle.setItalic(Boolean.valueOf(this.getItalic())); chatstyle.setStrikethrough(Boolean.valueOf(this.getStrikethrough())); @@ -601,9 +602,9 @@ public class ChatStyle { return chatstyle; } - public static class Serializer implements JSONTypeCodec { - public ChatStyle deserialize(JSONObject jsonobject) throws JSONException { - ChatStyle chatstyle = new ChatStyle(); + public static class Serializer implements JSONTypeCodec { + public Style deserialize(JSONObject jsonobject) throws JSONException { + Style chatstyle = new Style(); if (jsonobject == null) { return null; } else { @@ -655,8 +656,8 @@ public class ChatStyle { String jsonprimitive2 = jsonobject2.getString("action"); HoverEvent.Action hoverevent$action = jsonprimitive2 == null ? null : HoverEvent.Action.getValueByCanonicalName(jsonprimitive2); - IChatComponent ichatcomponent = JSONTypeProvider.deserializeNoCast(jsonobject2.get("value"), - IChatComponent.class); + ITextComponent ichatcomponent = JSONTypeProvider.deserializeNoCast(jsonobject2.get("value"), + ITextComponent.class); if (hoverevent$action != null && ichatcomponent != null && hoverevent$action.shouldAllowInChat()) { chatstyle.chatHoverEvent = new HoverEvent(hoverevent$action, ichatcomponent); @@ -668,7 +669,7 @@ public class ChatStyle { } } - public JSONObject serialize(ChatStyle chatstyle) { + public JSONObject serialize(Style chatstyle) { if (chatstyle.isEmpty()) { return null; } else { diff --git a/src/main/java/net/minecraft/util/ChatComponentStyle.java b/src/main/java/net/minecraft/util/text/TextComponentBase.java similarity index 74% rename from src/main/java/net/minecraft/util/ChatComponentStyle.java rename to src/main/java/net/minecraft/util/text/TextComponentBase.java index 3579c6b..abfe0ef 100644 --- a/src/main/java/net/minecraft/util/ChatComponentStyle.java +++ b/src/main/java/net/minecraft/util/text/TextComponentBase.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.Iterator; import java.util.List; @@ -7,6 +7,8 @@ import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; +import net.minecraft.util.EnumChatFormatting; + /** * + * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. @@ -36,21 +38,21 @@ import com.google.common.collect.Lists; * POSSIBILITY OF SUCH DAMAGE. * */ -public abstract class ChatComponentStyle implements IChatComponent { +public abstract class TextComponentBase implements ITextComponent { /** * + * The later siblings of this component. If this component turns * the text bold, that will apply to all the siblings until a * later sibling turns the text something else. */ - protected List siblings = Lists.newArrayList(); - private ChatStyle style; + protected List siblings = Lists.newArrayList(); + private Style style; /** * + * Appends the given component to the end of this one. */ - public IChatComponent appendSibling(IChatComponent component) { + public ITextComponent appendSibling(ITextComponent component) { component.getChatStyle().setParentStyle(this.getChatStyle()); this.siblings.add(component); return this; @@ -60,7 +62,7 @@ public abstract class ChatComponentStyle implements IChatComponent { * + * Gets the sibling components of this one. */ - public List getSiblings() { + public List getSiblings() { return this.siblings; } @@ -68,11 +70,11 @@ public abstract class ChatComponentStyle implements IChatComponent { * + * Appends the given text to the end of this component. */ - public IChatComponent appendText(String text) { - return this.appendSibling(new ChatComponentText(text)); + public ITextComponent appendText(String text) { + return this.appendSibling(new TextComponentString(text)); } - public IChatComponent setChatStyle(ChatStyle style) { + public ITextComponent setChatStyle(Style style) { this.style = style; for (int i = 0, l = this.siblings.size(); i < l; ++i) { @@ -82,9 +84,9 @@ public abstract class ChatComponentStyle implements IChatComponent { return this; } - public ChatStyle getChatStyle() { + public Style getChatStyle() { if (this.style == null) { - this.style = new ChatStyle(); + this.style = new Style(); for (int i = 0, l = this.siblings.size(); i < l; ++i) { this.siblings.get(i).getChatStyle().setParentStyle(this.style); @@ -94,8 +96,8 @@ public abstract class ChatComponentStyle implements IChatComponent { return this.style; } - public Iterator iterator() { - return Iterators.concat(Iterators.forArray(new ChatComponentStyle[] { this }), + public Iterator iterator() { + return Iterators.concat(Iterators.forArray(new TextComponentBase[] { this }), createDeepCopyIterator(this.siblings)); } @@ -107,7 +109,7 @@ public abstract class ChatComponentStyle implements IChatComponent { public final String getUnformattedText() { StringBuilder stringbuilder = new StringBuilder(); - for (IChatComponent ichatcomponent : this) { + for (ITextComponent ichatcomponent : this) { stringbuilder.append(ichatcomponent.getUnformattedTextForChat()); } @@ -122,7 +124,7 @@ public abstract class ChatComponentStyle implements IChatComponent { public final String getFormattedText() { StringBuilder stringbuilder = new StringBuilder(); - for (IChatComponent ichatcomponent : this) { + for (ITextComponent ichatcomponent : this) { stringbuilder.append(ichatcomponent.getChatStyle().getFormattingCode()); stringbuilder.append(ichatcomponent.getUnformattedTextForChat()); stringbuilder.append(EnumChatFormatting.RESET); @@ -138,16 +140,16 @@ public abstract class ChatComponentStyle implements IChatComponent { * properties of the returned objects will remain externally * consistent after being returned. */ - public static Iterator createDeepCopyIterator(Iterable components) { + public static Iterator createDeepCopyIterator(Iterable components) { Iterator iterator = Iterators.concat( - Iterators.transform(components.iterator(), new Function>() { - public Iterator apply(IChatComponent ichatcomponent) { + Iterators.transform(components.iterator(), new Function>() { + public Iterator apply(ITextComponent ichatcomponent) { return ichatcomponent.iterator(); } })); - iterator = Iterators.transform(iterator, new Function() { - public IChatComponent apply(IChatComponent ichatcomponent) { - IChatComponent ichatcomponent1 = ichatcomponent.createCopy(); + iterator = Iterators.transform(iterator, new Function() { + public ITextComponent apply(ITextComponent ichatcomponent) { + ITextComponent ichatcomponent1 = ichatcomponent.createCopy(); ichatcomponent1.setChatStyle(ichatcomponent1.getChatStyle().createDeepCopy()); return ichatcomponent1; } @@ -158,10 +160,10 @@ public abstract class ChatComponentStyle implements IChatComponent { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatComponentStyle)) { + } else if (!(object instanceof TextComponentBase)) { return false; } else { - ChatComponentStyle chatcomponentstyle = (ChatComponentStyle) object; + TextComponentBase chatcomponentstyle = (TextComponentBase) object; return this.siblings.equals(chatcomponentstyle.siblings) && this.getChatStyle().equals(chatcomponentstyle.getChatStyle()); } diff --git a/src/main/java/net/minecraft/util/ChatComponentScore.java b/src/main/java/net/minecraft/util/text/TextComponentScore.java similarity index 88% rename from src/main/java/net/minecraft/util/ChatComponentScore.java rename to src/main/java/net/minecraft/util/text/TextComponentScore.java index 78c6c71..8c336ca 100644 --- a/src/main/java/net/minecraft/util/ChatComponentScore.java +++ b/src/main/java/net/minecraft/util/text/TextComponentScore.java @@ -1,9 +1,10 @@ -package net.minecraft.util; +package net.minecraft.util.text; import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.StringUtils; import java.util.List; @@ -38,7 +39,7 @@ import net.lax1dude.eaglercraft.v1_8.HString; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentScore extends ChatComponentStyle { +public class TextComponentScore extends TextComponentBase { private final String name; private final String objective; /** @@ -47,7 +48,7 @@ public class ChatComponentScore extends ChatComponentStyle { */ private String value = ""; - public ChatComponentScore(String nameIn, String objectiveIn) { + public TextComponentScore(String nameIn, String objectiveIn) { this.name = nameIn; this.objective = objectiveIn; } @@ -95,12 +96,12 @@ public class ChatComponentScore extends ChatComponentStyle { * Creates a copy of this component. Almost a deep copy, except * the style is shallow-copied. */ - public ChatComponentScore createCopy() { - ChatComponentScore chatcomponentscore = new ChatComponentScore(this.name, this.objective); + public TextComponentScore createCopy() { + TextComponentScore chatcomponentscore = new TextComponentScore(this.name, this.objective); chatcomponentscore.setValue(this.value); chatcomponentscore.setChatStyle(this.getChatStyle().createShallowCopy()); - List lst = this.getSiblings(); + List lst = this.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { chatcomponentscore.appendSibling(lst.get(i).createCopy()); } @@ -111,10 +112,10 @@ public class ChatComponentScore extends ChatComponentStyle { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatComponentScore)) { + } else if (!(object instanceof TextComponentScore)) { return false; } else { - ChatComponentScore chatcomponentscore = (ChatComponentScore) object; + TextComponentScore chatcomponentscore = (TextComponentScore) object; return this.name.equals(chatcomponentscore.name) && this.objective.equals(chatcomponentscore.objective) && super.equals(object); } diff --git a/src/main/java/net/minecraft/util/ChatComponentSelector.java b/src/main/java/net/minecraft/util/text/TextComponentSelector.java similarity index 84% rename from src/main/java/net/minecraft/util/ChatComponentSelector.java rename to src/main/java/net/minecraft/util/text/TextComponentSelector.java index 61f82ad..f1b76ea 100644 --- a/src/main/java/net/minecraft/util/ChatComponentSelector.java +++ b/src/main/java/net/minecraft/util/text/TextComponentSelector.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.List; @@ -31,10 +31,10 @@ import java.util.List; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentSelector extends ChatComponentStyle { +public class TextComponentSelector extends TextComponentBase { private final String selector; - public ChatComponentSelector(String selectorIn) { + public TextComponentSelector(String selectorIn) { this.selector = selectorIn; } @@ -61,11 +61,11 @@ public class ChatComponentSelector extends ChatComponentStyle { * Creates a copy of this component. Almost a deep copy, except * the style is shallow-copied. */ - public ChatComponentSelector createCopy() { - ChatComponentSelector chatcomponentselector = new ChatComponentSelector(this.selector); + public TextComponentSelector createCopy() { + TextComponentSelector chatcomponentselector = new TextComponentSelector(this.selector); chatcomponentselector.setChatStyle(this.getChatStyle().createShallowCopy()); - List lst = this.getSiblings(); + List lst = this.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { chatcomponentselector.appendSibling(lst.get(i).createCopy()); } @@ -76,10 +76,10 @@ public class ChatComponentSelector extends ChatComponentStyle { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatComponentSelector)) { + } else if (!(object instanceof TextComponentSelector)) { return false; } else { - ChatComponentSelector chatcomponentselector = (ChatComponentSelector) object; + TextComponentSelector chatcomponentselector = (TextComponentSelector) object; return this.selector.equals(chatcomponentselector.selector) && super.equals(object); } } diff --git a/src/main/java/net/minecraft/util/ChatComponentText.java b/src/main/java/net/minecraft/util/text/TextComponentString.java similarity index 85% rename from src/main/java/net/minecraft/util/ChatComponentText.java rename to src/main/java/net/minecraft/util/text/TextComponentString.java index 53e79c4..45504a8 100644 --- a/src/main/java/net/minecraft/util/ChatComponentText.java +++ b/src/main/java/net/minecraft/util/text/TextComponentString.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.List; @@ -31,10 +31,10 @@ import java.util.List; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentText extends ChatComponentStyle { +public class TextComponentString extends TextComponentBase { private final String text; - public ChatComponentText(String msg) { + public TextComponentString(String msg) { this.text = msg; } @@ -64,11 +64,11 @@ public class ChatComponentText extends ChatComponentStyle { * Creates a copy of this component. Almost a deep copy, except * the style is shallow-copied. */ - public ChatComponentText createCopy() { - ChatComponentText chatcomponenttext = new ChatComponentText(this.text); + public TextComponentString createCopy() { + TextComponentString chatcomponenttext = new TextComponentString(this.text); chatcomponenttext.setChatStyle(this.getChatStyle().createShallowCopy()); - List lst = this.getSiblings(); + List lst = this.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { chatcomponenttext.appendSibling(lst.get(i).createCopy()); } @@ -79,10 +79,10 @@ public class ChatComponentText extends ChatComponentStyle { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatComponentText)) { + } else if (!(object instanceof TextComponentString)) { return false; } else { - ChatComponentText chatcomponenttext = (ChatComponentText) object; + TextComponentString chatcomponenttext = (TextComponentString) object; return this.text.equals(chatcomponenttext.getChatComponentText_TextValue()) && super.equals(object); } } diff --git a/src/main/java/net/minecraft/util/ChatComponentTranslation.java b/src/main/java/net/minecraft/util/text/TextComponentTranslation.java similarity index 78% rename from src/main/java/net/minecraft/util/ChatComponentTranslation.java rename to src/main/java/net/minecraft/util/text/TextComponentTranslation.java index 34e48eb..1fbb4b9 100644 --- a/src/main/java/net/minecraft/util/ChatComponentTranslation.java +++ b/src/main/java/net/minecraft/util/text/TextComponentTranslation.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.Arrays; import java.util.IllegalFormatException; @@ -11,6 +11,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import net.lax1dude.eaglercraft.v1_8.HString; +import net.minecraft.util.StatCollector; /** * + @@ -41,22 +42,22 @@ import net.lax1dude.eaglercraft.v1_8.HString; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentTranslation extends ChatComponentStyle { +public class TextComponentTranslation extends TextComponentBase { private final String key; private final Object[] formatArgs; private final Object syncLock = new Object(); private long lastTranslationUpdateTimeInMilliseconds = -1L; - List children = Lists.newArrayList(); + List children = Lists.newArrayList(); public static final Pattern stringVariablePattern = Pattern.compile("%(?:(\\d+)\\$)?([A-Za-z%]|$)"); - public ChatComponentTranslation(String translationKey, Object... args) { + public TextComponentTranslation(String translationKey, Object... args) { this.key = translationKey; this.formatArgs = args; for (int i = 0; i < args.length; ++i) { Object object = args[i]; - if (object instanceof IChatComponent) { - ((IChatComponent) object).getChatStyle().setParentStyle(this.getChatStyle()); + if (object instanceof ITextComponent) { + ((ITextComponent) object).getChatStyle().setParentStyle(this.getChatStyle()); } } @@ -80,12 +81,12 @@ public class ChatComponentTranslation extends ChatComponentStyle { try { this.initializeFromFormat(StatCollector.translateToLocal(this.key)); - } catch (ChatComponentTranslationFormatException chatcomponenttranslationformatexception) { + } catch (TextComponentTranslationFormatException chatcomponenttranslationformatexception) { this.children.clear(); try { this.initializeFromFormat(StatCollector.translateToFallback(this.key)); - } catch (ChatComponentTranslationFormatException var5) { + } catch (TextComponentTranslationFormatException var5) { throw chatcomponenttranslationformatexception; } } @@ -109,7 +110,7 @@ public class ChatComponentTranslation extends ChatComponentStyle { int k = matcher.start(); l = matcher.end(); if (k > j) { - ChatComponentText chatcomponenttext = new ChatComponentText( + TextComponentString chatcomponenttext = new TextComponentString( HString.format(format.substring(j, k), new Object[0])); chatcomponenttext.getChatStyle().setParentStyle(this.getChatStyle()); this.children.add(chatcomponenttext); @@ -118,12 +119,12 @@ public class ChatComponentTranslation extends ChatComponentStyle { String s2 = matcher.group(2); String s = format.substring(k, l); if ("%".equals(s2) && "%%".equals(s)) { - ChatComponentText chatcomponenttext2 = new ChatComponentText("%"); + TextComponentString chatcomponenttext2 = new TextComponentString("%"); chatcomponenttext2.getChatStyle().setParentStyle(this.getChatStyle()); this.children.add(chatcomponenttext2); } else { if (!"s".equals(s2)) { - throw new ChatComponentTranslationFormatException(this, "Unsupported format: \'" + s + "\'"); + throw new TextComponentTranslationFormatException(this, "Unsupported format: \'" + s + "\'"); } String s1 = matcher.group(1); @@ -135,41 +136,41 @@ public class ChatComponentTranslation extends ChatComponentStyle { } if (j < format.length()) { - ChatComponentText chatcomponenttext1 = new ChatComponentText( + TextComponentString chatcomponenttext1 = new TextComponentString( HString.format(format.substring(j), new Object[0])); chatcomponenttext1.getChatStyle().setParentStyle(this.getChatStyle()); this.children.add(chatcomponenttext1); } } catch (IllegalFormatException illegalformatexception) { - throw new ChatComponentTranslationFormatException(this, illegalformatexception); + throw new TextComponentTranslationFormatException(this, illegalformatexception); } } - private IChatComponent getFormatArgumentAsComponent(int index) { + private ITextComponent getFormatArgumentAsComponent(int index) { if (index >= this.formatArgs.length) { - throw new ChatComponentTranslationFormatException(this, index); + throw new TextComponentTranslationFormatException(this, index); } else { Object object = this.formatArgs[index]; Object object1; - if (object instanceof IChatComponent) { - object1 = (IChatComponent) object; + if (object instanceof ITextComponent) { + object1 = (ITextComponent) object; } else { - object1 = new ChatComponentText(object == null ? "null" : object.toString()); - ((IChatComponent) object1).getChatStyle().setParentStyle(this.getChatStyle()); + object1 = new TextComponentString(object == null ? "null" : object.toString()); + ((ITextComponent) object1).getChatStyle().setParentStyle(this.getChatStyle()); } - return (IChatComponent) object1; + return (ITextComponent) object1; } } - public IChatComponent setChatStyle(ChatStyle chatstyle) { + public ITextComponent setChatStyle(Style chatstyle) { super.setChatStyle(chatstyle); for (int i = 0; i < this.formatArgs.length; ++i) { Object object = this.formatArgs[i]; - if (object instanceof IChatComponent) { - ((IChatComponent) object).getChatStyle().setParentStyle(this.getChatStyle()); + if (object instanceof ITextComponent) { + ((ITextComponent) object).getChatStyle().setParentStyle(this.getChatStyle()); } } @@ -182,7 +183,7 @@ public class ChatComponentTranslation extends ChatComponentStyle { return this; } - public Iterator iterator() { + public Iterator iterator() { this.ensureInitialized(); return Iterators.concat(createDeepCopyIterator(this.children), createDeepCopyIterator(this.siblings)); } @@ -209,21 +210,21 @@ public class ChatComponentTranslation extends ChatComponentStyle { * Creates a copy of this component. Almost a deep copy, except * the style is shallow-copied. */ - public ChatComponentTranslation createCopy() { + public TextComponentTranslation createCopy() { Object[] aobject = new Object[this.formatArgs.length]; for (int i = 0; i < this.formatArgs.length; ++i) { - if (this.formatArgs[i] instanceof IChatComponent) { - aobject[i] = ((IChatComponent) this.formatArgs[i]).createCopy(); + if (this.formatArgs[i] instanceof ITextComponent) { + aobject[i] = ((ITextComponent) this.formatArgs[i]).createCopy(); } else { aobject[i] = this.formatArgs[i]; } } - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation(this.key, aobject); + TextComponentTranslation chatcomponenttranslation = new TextComponentTranslation(this.key, aobject); chatcomponenttranslation.setChatStyle(this.getChatStyle().createShallowCopy()); - List lst = this.getSiblings(); + List lst = this.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { chatcomponenttranslation.appendSibling(lst.get(i).createCopy()); } @@ -234,10 +235,10 @@ public class ChatComponentTranslation extends ChatComponentStyle { public boolean equals(Object object) { if (this == object) { return true; - } else if (!(object instanceof ChatComponentTranslation)) { + } else if (!(object instanceof TextComponentTranslation)) { return false; } else { - ChatComponentTranslation chatcomponenttranslation = (ChatComponentTranslation) object; + TextComponentTranslation chatcomponenttranslation = (TextComponentTranslation) object; return Arrays.equals(this.formatArgs, chatcomponenttranslation.formatArgs) && this.key.equals(chatcomponenttranslation.key) && super.equals(object); } diff --git a/src/main/java/net/minecraft/util/ChatComponentTranslationFormatException.java b/src/main/java/net/minecraft/util/text/TextComponentTranslationFormatException.java similarity index 85% rename from src/main/java/net/minecraft/util/ChatComponentTranslationFormatException.java rename to src/main/java/net/minecraft/util/text/TextComponentTranslationFormatException.java index ba0ad96..e099981 100644 --- a/src/main/java/net/minecraft/util/ChatComponentTranslationFormatException.java +++ b/src/main/java/net/minecraft/util/text/TextComponentTranslationFormatException.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import net.lax1dude.eaglercraft.v1_8.HString; @@ -31,16 +31,16 @@ import net.lax1dude.eaglercraft.v1_8.HString; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentTranslationFormatException extends IllegalArgumentException { - public ChatComponentTranslationFormatException(ChatComponentTranslation component, String message) { +public class TextComponentTranslationFormatException extends IllegalArgumentException { + public TextComponentTranslationFormatException(TextComponentTranslation component, String message) { super(HString.format("Error parsing: %s: %s", new Object[] { component, message })); } - public ChatComponentTranslationFormatException(ChatComponentTranslation component, int index) { + public TextComponentTranslationFormatException(TextComponentTranslation component, int index) { super(HString.format("Invalid index %d requested for %s", new Object[] { Integer.valueOf(index), component })); } - public ChatComponentTranslationFormatException(ChatComponentTranslation component, Throwable cause) { + public TextComponentTranslationFormatException(TextComponentTranslation component, Throwable cause) { super(HString.format("Error while parsing: %s", new Object[] { component }), cause); } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/ChatComponentProcessor.java b/src/main/java/net/minecraft/util/text/TextComponentUtils.java similarity index 63% rename from src/main/java/net/minecraft/util/ChatComponentProcessor.java rename to src/main/java/net/minecraft/util/text/TextComponentUtils.java index d97691b..e2b97bb 100644 --- a/src/main/java/net/minecraft/util/ChatComponentProcessor.java +++ b/src/main/java/net/minecraft/util/text/TextComponentUtils.java @@ -1,4 +1,4 @@ -package net.minecraft.util; +package net.minecraft.util.text; import java.util.List; @@ -37,12 +37,12 @@ import net.minecraft.entity.Entity; * POSSIBILITY OF SUCH DAMAGE. * */ -public class ChatComponentProcessor { - public static IChatComponent processComponent(ICommandSender commandSender, IChatComponent component, +public class TextComponentUtils { + public static ITextComponent processComponent(ICommandSender commandSender, ITextComponent component, Entity entityIn) throws CommandException { Object object = null; - if (component instanceof ChatComponentScore) { - ChatComponentScore chatcomponentscore = (ChatComponentScore) component; + if (component instanceof TextComponentScore) { + TextComponentScore chatcomponentscore = (TextComponentScore) component; String s = chatcomponentscore.getName(); if (PlayerSelector.hasArguments(s)) { List list = PlayerSelector.matchEntities(commandSender, s, Entity.class); @@ -54,44 +54,44 @@ public class ChatComponentProcessor { } object = entityIn != null && s.equals("*") - ? new ChatComponentScore(entityIn.getName(), chatcomponentscore.getObjective()) - : new ChatComponentScore(s, chatcomponentscore.getObjective()); - ((ChatComponentScore) object).setValue(chatcomponentscore.getUnformattedTextForChat()); - } else if (component instanceof ChatComponentSelector) { - String s1 = ((ChatComponentSelector) component).getSelector(); + ? new TextComponentScore(entityIn.getName(), chatcomponentscore.getObjective()) + : new TextComponentScore(s, chatcomponentscore.getObjective()); + ((TextComponentScore) object).setValue(chatcomponentscore.getUnformattedTextForChat()); + } else if (component instanceof TextComponentSelector) { + String s1 = ((TextComponentSelector) component).getSelector(); object = PlayerSelector.matchEntitiesToChatComponent(commandSender, s1); if (object == null) { - object = new ChatComponentText(""); + object = new TextComponentString(""); } - } else if (component instanceof ChatComponentText) { - object = new ChatComponentText(((ChatComponentText) component).getChatComponentText_TextValue()); + } else if (component instanceof TextComponentString) { + object = new TextComponentString(((TextComponentString) component).getChatComponentText_TextValue()); } else { - if (!(component instanceof ChatComponentTranslation)) { + if (!(component instanceof TextComponentTranslation)) { return component; } - Object[] aobject = ((ChatComponentTranslation) component).getFormatArgs(); + Object[] aobject = ((TextComponentTranslation) component).getFormatArgs(); for (int i = 0; i < aobject.length; ++i) { Object object1 = aobject[i]; - if (object1 instanceof IChatComponent) { - aobject[i] = processComponent(commandSender, (IChatComponent) object1, entityIn); + if (object1 instanceof ITextComponent) { + aobject[i] = processComponent(commandSender, (ITextComponent) object1, entityIn); } } - object = new ChatComponentTranslation(((ChatComponentTranslation) component).getKey(), aobject); + object = new TextComponentTranslation(((TextComponentTranslation) component).getKey(), aobject); } - ChatStyle chatstyle = component.getChatStyle(); + Style chatstyle = component.getChatStyle(); if (chatstyle != null) { - ((IChatComponent) object).setChatStyle(chatstyle.createShallowCopy()); + ((ITextComponent) object).setChatStyle(chatstyle.createShallowCopy()); } - List lst = component.getSiblings(); + List lst = component.getSiblings(); for (int i = 0, l = lst.size(); i < l; ++i) { - ((IChatComponent) object).appendSibling(processComponent(commandSender, lst.get(i), entityIn)); + ((ITextComponent) object).appendSibling(processComponent(commandSender, lst.get(i), entityIn)); } - return (IChatComponent) object; + return (ITextComponent) object; } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/event/ClickEvent.java b/src/main/java/net/minecraft/util/text/event/ClickEvent.java similarity index 98% rename from src/main/java/net/minecraft/event/ClickEvent.java rename to src/main/java/net/minecraft/util/text/event/ClickEvent.java index e2254e6..3f66c83 100644 --- a/src/main/java/net/minecraft/event/ClickEvent.java +++ b/src/main/java/net/minecraft/util/text/event/ClickEvent.java @@ -1,4 +1,4 @@ -package net.minecraft.event; +package net.minecraft.util.text.event; import java.util.Map; diff --git a/src/main/java/net/minecraft/event/HoverEvent.java b/src/main/java/net/minecraft/util/text/event/HoverEvent.java similarity index 93% rename from src/main/java/net/minecraft/event/HoverEvent.java rename to src/main/java/net/minecraft/util/text/event/HoverEvent.java index 52fa203..2977290 100644 --- a/src/main/java/net/minecraft/event/HoverEvent.java +++ b/src/main/java/net/minecraft/util/text/event/HoverEvent.java @@ -1,10 +1,10 @@ -package net.minecraft.event; +package net.minecraft.util.text.event; import java.util.Map; import com.google.common.collect.Maps; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -37,9 +37,9 @@ import net.minecraft.util.IChatComponent; */ public class HoverEvent { private final HoverEvent.Action action; - private final IChatComponent value; + private final ITextComponent value; - public HoverEvent(HoverEvent.Action actionIn, IChatComponent valueIn) { + public HoverEvent(HoverEvent.Action actionIn, ITextComponent valueIn) { this.action = actionIn; this.value = valueIn; } @@ -58,7 +58,7 @@ public class HoverEvent { * raised. For example, if the action is "show item", this would * be the item to show. */ - public IChatComponent getValue() { + public ITextComponent getValue() { return this.value; } diff --git a/src/main/java/net/minecraft/village/Village.java b/src/main/java/net/minecraft/village/Village.java index 1759335..1b11d84 100644 --- a/src/main/java/net/minecraft/village/Village.java +++ b/src/main/java/net/minecraft/village/Village.java @@ -13,10 +13,10 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** @@ -104,7 +104,7 @@ public class Village { int i = this.numVillagers / 10; if (this.numIronGolems < i && this.villageDoorInfoList.size() > 20 && this.worldObj.rand.nextInt(7000) == 0) { - Vec3 vec3 = this.func_179862_a(this.center, 2, 4, 2); + Vec3d vec3 = this.func_179862_a(this.center, 2, 4, 2); if (vec3 != null) { EntityIronGolem entityirongolem = new EntityIronGolem(this.worldObj); entityirongolem.setPosition(vec3.xCoord, vec3.yCoord, vec3.zCoord); @@ -115,12 +115,12 @@ public class Village { } - private Vec3 func_179862_a(BlockPos parBlockPos, int parInt1, int parInt2, int parInt3) { + private Vec3d func_179862_a(BlockPos parBlockPos, int parInt1, int parInt2, int parInt3) { for (int i = 0; i < 10; ++i) { BlockPos blockpos = parBlockPos.add(this.worldObj.rand.nextInt(16) - 8, this.worldObj.rand.nextInt(6) - 3, this.worldObj.rand.nextInt(16) - 8); if (this.func_179866_a(blockpos) && this.func_179861_a(new BlockPos(parInt1, parInt2, parInt3), blockpos)) { - return new Vec3((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ()); + return new Vec3d((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ()); } } diff --git a/src/main/java/net/minecraft/village/VillageCollection.java b/src/main/java/net/minecraft/village/VillageCollection.java index 21e237b..9567e99 100644 --- a/src/main/java/net/minecraft/village/VillageCollection.java +++ b/src/main/java/net/minecraft/village/VillageCollection.java @@ -8,8 +8,8 @@ import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldSavedData; diff --git a/src/main/java/net/minecraft/village/VillageDoorInfo.java b/src/main/java/net/minecraft/village/VillageDoorInfo.java index 2a185f4..abda165 100644 --- a/src/main/java/net/minecraft/village/VillageDoorInfo.java +++ b/src/main/java/net/minecraft/village/VillageDoorInfo.java @@ -1,7 +1,7 @@ package net.minecraft.village; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/village/VillageSiege.java b/src/main/java/net/minecraft/village/VillageSiege.java index 28254f0..1a12616 100644 --- a/src/main/java/net/minecraft/village/VillageSiege.java +++ b/src/main/java/net/minecraft/village/VillageSiege.java @@ -8,9 +8,9 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; @@ -149,7 +149,7 @@ public class VillageSiege { return false; } - Vec3 vec3 = this + Vec3d vec3 = this .func_179867_a(new BlockPos(this.field_75532_g, this.field_75538_h, this.field_75539_i)); if (vec3 != null) { break; @@ -164,7 +164,7 @@ public class VillageSiege { } private boolean spawnZombie() { - Vec3 vec3 = this.func_179867_a(new BlockPos(this.field_75532_g, this.field_75538_h, this.field_75539_i)); + Vec3d vec3 = this.func_179867_a(new BlockPos(this.field_75532_g, this.field_75538_h, this.field_75539_i)); if (vec3 == null) { return false; } else { @@ -188,13 +188,13 @@ public class VillageSiege { } } - private Vec3 func_179867_a(BlockPos parBlockPos) { + private Vec3d func_179867_a(BlockPos parBlockPos) { for (int i = 0; i < 10; ++i) { BlockPos blockpos = parBlockPos.add(this.worldObj.rand.nextInt(16) - 8, this.worldObj.rand.nextInt(6) - 3, this.worldObj.rand.nextInt(16) - 8); if (this.theVillage.func_179866_a(blockpos) && SpawnerAnimals.canCreatureTypeSpawnAtLocation( EntityLiving.SpawnPlacementType.ON_GROUND, this.worldObj, blockpos)) { - return new Vec3((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ()); + return new Vec3d((double) blockpos.getX(), (double) blockpos.getY(), (double) blockpos.getZ()); } } diff --git a/src/main/java/net/minecraft/world/ChunkCache.java b/src/main/java/net/minecraft/world/ChunkCache.java index 4ed8802..1d677d4 100644 --- a/src/main/java/net/minecraft/world/ChunkCache.java +++ b/src/main/java/net/minecraft/world/ChunkCache.java @@ -6,8 +6,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/world/ChunkCoordIntPair.java b/src/main/java/net/minecraft/world/ChunkCoordIntPair.java index 919f3b4..ef181bb 100644 --- a/src/main/java/net/minecraft/world/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/world/ChunkCoordIntPair.java @@ -1,6 +1,6 @@ package net.minecraft.world; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/world/DifficultyInstance.java b/src/main/java/net/minecraft/world/DifficultyInstance.java index 7b7d218..0200064 100644 --- a/src/main/java/net/minecraft/world/DifficultyInstance.java +++ b/src/main/java/net/minecraft/world/DifficultyInstance.java @@ -1,6 +1,6 @@ package net.minecraft.world; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/world/Explosion.java b/src/main/java/net/minecraft/world/Explosion.java index 92304ff..402b845 100644 --- a/src/main/java/net/minecraft/world/Explosion.java +++ b/src/main/java/net/minecraft/world/Explosion.java @@ -18,13 +18,13 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; /** * + @@ -66,7 +66,7 @@ public class Explosion { private final Entity exploder; private final float explosionSize; private final List affectedBlockPositions; - private final Map playerKnockbackMap; + private final Map playerKnockbackMap; public Explosion(World worldIn, Entity parEntity, double parDouble1, double parDouble2, double parDouble3, float parFloat1, List parList) { @@ -153,7 +153,7 @@ public class Explosion { int i1 = MathHelper.floor_double(this.explosionZ + (double) f3 + 1.0D); List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this.exploder, new AxisAlignedBB((double) j1, (double) l1, (double) i2, (double) k1, (double) l, (double) i1)); - Vec3 vec3 = new Vec3(this.explosionX, this.explosionY, this.explosionZ); + Vec3d vec3 = new Vec3d(this.explosionX, this.explosionY, this.explosionZ); for (int j2 = 0; j2 < list.size(); ++j2) { Entity entity = (Entity) list.get(j2); @@ -177,7 +177,7 @@ public class Explosion { entity.motionY += d7 * d11; entity.motionZ += d9 * d11; if (entity instanceof EntityPlayer && !((EntityPlayer) entity).capabilities.disableDamage) { - this.playerKnockbackMap.put((EntityPlayer) entity, new Vec3(d5 * d10, d7 * d10, d9 * d10)); + this.playerKnockbackMap.put((EntityPlayer) entity, new Vec3d(d5 * d10, d7 * d10, d9 * d10)); } } } @@ -254,7 +254,7 @@ public class Explosion { } - public Map getPlayerKnockbackMap() { + public Map getPlayerKnockbackMap() { return this.playerKnockbackMap; } diff --git a/src/main/java/net/minecraft/world/IBlockAccess.java b/src/main/java/net/minecraft/world/IBlockAccess.java index 96bd5cc..aa51254 100644 --- a/src/main/java/net/minecraft/world/IBlockAccess.java +++ b/src/main/java/net/minecraft/world/IBlockAccess.java @@ -2,8 +2,8 @@ package net.minecraft.world; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.BiomeGenBase; /** diff --git a/src/main/java/net/minecraft/world/IWorldAccess.java b/src/main/java/net/minecraft/world/IWorldAccess.java index 20076dd..c6d0b22 100644 --- a/src/main/java/net/minecraft/world/IWorldAccess.java +++ b/src/main/java/net/minecraft/world/IWorldAccess.java @@ -2,7 +2,7 @@ package net.minecraft.world; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/world/IWorldNameable.java b/src/main/java/net/minecraft/world/IWorldNameable.java index 95e65d9..b3e1b48 100644 --- a/src/main/java/net/minecraft/world/IWorldNameable.java +++ b/src/main/java/net/minecraft/world/IWorldNameable.java @@ -1,6 +1,6 @@ package net.minecraft.world; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; /** * + @@ -50,5 +50,5 @@ public interface IWorldNameable { * Get the formatted ChatComponent that will be used for the * sender's username in chat */ - IChatComponent getDisplayName(); + ITextComponent getDisplayName(); } \ No newline at end of file diff --git a/src/main/java/net/minecraft/world/NextTickListEntry.java b/src/main/java/net/minecraft/world/NextTickListEntry.java index 0aff0e2..aee3b66 100644 --- a/src/main/java/net/minecraft/world/NextTickListEntry.java +++ b/src/main/java/net/minecraft/world/NextTickListEntry.java @@ -1,7 +1,7 @@ package net.minecraft.world; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/world/SpawnerAnimals.java b/src/main/java/net/minecraft/world/SpawnerAnimals.java index 8423d8b..984551a 100644 --- a/src/main/java/net/minecraft/world/SpawnerAnimals.java +++ b/src/main/java/net/minecraft/world/SpawnerAnimals.java @@ -15,9 +15,9 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.WeightedRandom; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/world/Teleporter.java b/src/main/java/net/minecraft/world/Teleporter.java index 7edb642..c488ee7 100644 --- a/src/main/java/net/minecraft/world/Teleporter.java +++ b/src/main/java/net/minecraft/world/Teleporter.java @@ -9,10 +9,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockPattern; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.LongHashMap; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java index 9914acd..b34e046 100644 --- a/src/main/java/net/minecraft/world/World.java +++ b/src/main/java/net/minecraft/world/World.java @@ -47,17 +47,17 @@ import net.minecraft.profiler.Profiler; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EntitySelectors; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.IntHashMap; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ReportedException; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.village.VillageCollection; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; @@ -211,7 +211,8 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL crashreportcategory.addCrashSectionCallable("Location", new Callable() { public String call() throws Exception { return CrashReportCategory - .getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); + .getCoordinateInfo( + new net.minecraft.util.math.BlockPos(pos.getX(), pos.getY(), pos.getZ())); } }); throw new ReportedException(crashreport); @@ -694,7 +695,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL * + * ray traces all blocks, including non-collideable ones */ - public MovingObjectPosition rayTraceBlocks(Vec3 parVec3_1, Vec3 parVec3_2) { + public RayTraceResult rayTraceBlocks(Vec3d parVec3_1, Vec3d parVec3_2) { return this.rayTraceBlocks(parVec3_1, parVec3_2, false, false, false); } @@ -702,7 +703,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL * + * ray traces all blocks, including non-collideable ones */ - public MovingObjectPosition rayTraceBlocks(Vec3 start, Vec3 end, boolean stopOnLiquid) { + public RayTraceResult rayTraceBlocks(Vec3d start, Vec3d end, boolean stopOnLiquid) { return this.rayTraceBlocks(start, end, stopOnLiquid, false, false); } @@ -710,7 +711,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL * + * ray traces all blocks, including non-collideable ones */ - public MovingObjectPosition rayTraceBlocks(Vec3 vec31, Vec3 vec32, boolean stopOnLiquid, + public RayTraceResult rayTraceBlocks(Vec3d vec31, Vec3d vec32, boolean stopOnLiquid, boolean ignoreBlockWithoutBoundingBox, boolean returnLastUncollidableBlock) { if (!Double.isNaN(vec31.xCoord) && !Double.isNaN(vec31.yCoord) && !Double.isNaN(vec31.zCoord)) { if (!Double.isNaN(vec32.xCoord) && !Double.isNaN(vec32.yCoord) && !Double.isNaN(vec32.zCoord)) { @@ -726,13 +727,13 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL if ((!ignoreBlockWithoutBoundingBox || block.getCollisionBoundingBox(this, blockpos, iblockstate) != null) && block.canCollideCheck(iblockstate, stopOnLiquid)) { - MovingObjectPosition movingobjectposition = block.collisionRayTrace(this, blockpos, vec31, vec32); + RayTraceResult movingobjectposition = block.collisionRayTrace(this, blockpos, vec31, vec32); if (movingobjectposition != null) { return movingobjectposition; } } - MovingObjectPosition movingobjectposition2 = null; + RayTraceResult movingobjectposition2 = null; int k1 = 200; while (k1-- >= 0) { @@ -807,13 +808,13 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL EnumFacing enumfacing; if (d3 < d4 && d3 < d5) { enumfacing = i > l ? EnumFacing.WEST : EnumFacing.EAST; - vec31 = new Vec3(d0, vec31.yCoord + d7 * d3, vec31.zCoord + d8 * d3); + vec31 = new Vec3d(d0, vec31.yCoord + d7 * d3, vec31.zCoord + d8 * d3); } else if (d4 < d5) { enumfacing = j > i1 ? EnumFacing.DOWN : EnumFacing.UP; - vec31 = new Vec3(vec31.xCoord + d6 * d4, d1, vec31.zCoord + d8 * d4); + vec31 = new Vec3d(vec31.xCoord + d6 * d4, d1, vec31.zCoord + d8 * d4); } else { enumfacing = k > j1 ? EnumFacing.NORTH : EnumFacing.SOUTH; - vec31 = new Vec3(vec31.xCoord + d6 * d5, vec31.yCoord + d7 * d5, d2); + vec31 = new Vec3d(vec31.xCoord + d6 * d5, vec31.yCoord + d7 * d5, d2); } l = MathHelper.floor_double(vec31.xCoord) - (enumfacing == EnumFacing.EAST ? 1 : 0); @@ -825,13 +826,13 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL if (!ignoreBlockWithoutBoundingBox || block1.getCollisionBoundingBox(this, blockpos, iblockstate1) != null) { if (block1.canCollideCheck(iblockstate1, stopOnLiquid)) { - MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(this, blockpos, vec31, + RayTraceResult movingobjectposition1 = block1.collisionRayTrace(this, blockpos, vec31, vec32); if (movingobjectposition1 != null) { return movingobjectposition1; } } else { - movingobjectposition2 = new MovingObjectPosition(MovingObjectPosition.MovingObjectType.MISS, + movingobjectposition2 = new RayTraceResult(RayTraceResult.MovingObjectType.MISS, vec31, enumfacing, blockpos); } } @@ -1195,7 +1196,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL * + * Calculates the color for the skybox */ - public Vec3 getSkyColor(Entity entityIn, float partialTicks) { + public Vec3d getSkyColor(Entity entityIn, float partialTicks) { float f = this.getCelestialAngle(partialTicks); float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); @@ -1242,7 +1243,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL f5 = f5 * (1.0F - f12) + 1.0F * f12; } - return new Vec3((double) f3, (double) f4, (double) f5); + return new Vec3d((double) f3, (double) f4, (double) f5); } /** @@ -1275,7 +1276,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL return f * 3.1415927F * 2.0F; } - public Vec3 getCloudColour(float partialTicks) { + public Vec3d getCloudColour(float partialTicks) { float f = this.getCelestialAngle(partialTicks); float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); @@ -1303,14 +1304,14 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL f4 = f4 * f8 + f10 * (1.0F - f8); } - return new Vec3((double) f2, (double) f3, (double) f4); + return new Vec3d((double) f2, (double) f3, (double) f4); } /** * + * Returns vector(ish) with R/G/B for fog */ - public Vec3 getFogColor(float partialTicks) { + public Vec3d getFogColor(float partialTicks) { float f = this.getCelestialAngle(partialTicks); return this.provider.getFogColor(f, partialTicks); } @@ -1774,7 +1775,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL return false; } else { boolean flag = false; - Vec3 vec3 = new Vec3(0.0D, 0.0D, 0.0D); + Vec3d vec3 = new Vec3d(0.0D, 0.0D, 0.0D); BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); for (int k1 = i; k1 < j; ++k1) { @@ -1898,7 +1899,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL * Gets the percentage of real blocks within within a bounding * box, along a specified vector. */ - public float getBlockDensity(Vec3 vec, AxisAlignedBB bb) { + public float getBlockDensity(Vec3d vec, AxisAlignedBB bb) { double d0 = 1.0D / ((bb.maxX - bb.minX) * 2.0D + 1.0D); double d1 = 1.0D / ((bb.maxY - bb.minY) * 2.0D + 1.0D); double d2 = 1.0D / ((bb.maxZ - bb.minZ) * 2.0D + 1.0D); @@ -1914,7 +1915,7 @@ public abstract class World implements IBlockAccess, ILightingEngineProvider, IL double d5 = bb.minX + (bb.maxX - bb.minX) * (double) f; double d6 = bb.minY + (bb.maxY - bb.minY) * (double) f1; double d7 = bb.minZ + (bb.maxZ - bb.minZ) * (double) f2; - if (this.rayTraceBlocks(new Vec3(d5 + d3, d6, d7 + d4), vec) == null) { + if (this.rayTraceBlocks(new Vec3d(d5 + d3, d6, d7 + d4), vec) == null) { ++i; } diff --git a/src/main/java/net/minecraft/world/WorldManager.java b/src/main/java/net/minecraft/world/WorldManager.java index 37ece74..ced6c2b 100644 --- a/src/main/java/net/minecraft/world/WorldManager.java +++ b/src/main/java/net/minecraft/world/WorldManager.java @@ -7,7 +7,7 @@ import net.minecraft.network.play.server.S25PacketBlockBreakAnim; import net.minecraft.network.play.server.S28PacketEffect; import net.minecraft.network.play.server.S29PacketSoundEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/world/WorldProvider.java b/src/main/java/net/minecraft/world/WorldProvider.java index 52c3351..aeeb4b7 100644 --- a/src/main/java/net/minecraft/world/WorldProvider.java +++ b/src/main/java/net/minecraft/world/WorldProvider.java @@ -1,9 +1,9 @@ package net.minecraft.world; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.biome.WorldChunkManagerHell; @@ -197,7 +197,7 @@ public abstract class WorldProvider { * + * Return Vec3D with biome specific fog color */ - public Vec3 getFogColor(float parFloat1, float parFloat2) { + public Vec3d getFogColor(float parFloat1, float parFloat2) { float f = MathHelper.cos(parFloat1 * 3.1415927F * 2.0F) * 2.0F + 0.5F; f = MathHelper.clamp_float(f, 0.0F, 1.0F); float f1 = 0.7529412F; @@ -206,7 +206,7 @@ public abstract class WorldProvider { f1 = f1 * (f * 0.94F + 0.06F); f2 = f2 * (f * 0.94F + 0.06F); f3 = f3 * (f * 0.91F + 0.09F); - return new Vec3((double) f1, (double) f2, (double) f3); + return new Vec3d((double) f1, (double) f2, (double) f3); } /** diff --git a/src/main/java/net/minecraft/world/WorldProviderEnd.java b/src/main/java/net/minecraft/world/WorldProviderEnd.java index 9153758..1cb4a2e 100644 --- a/src/main/java/net/minecraft/world/WorldProviderEnd.java +++ b/src/main/java/net/minecraft/world/WorldProviderEnd.java @@ -1,8 +1,8 @@ package net.minecraft.world; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.chunk.IChunkProvider; @@ -78,7 +78,7 @@ public class WorldProviderEnd extends WorldProvider { * + * Return Vec3D with biome specific fog color */ - public Vec3 getFogColor(float f, float var2) { + public Vec3d getFogColor(float f, float var2) { int i = 10518688; float f1 = MathHelper.cos(f * 3.1415927F * 2.0F) * 2.0F + 0.5F; f1 = MathHelper.clamp_float(f1, 0.0F, 1.0F); @@ -88,7 +88,7 @@ public class WorldProviderEnd extends WorldProvider { f2 = f2 * (f1 * 0.0F + 0.15F); f3 = f3 * (f1 * 0.0F + 0.15F); f4 = f4 * (f1 * 0.0F + 0.15F); - return new Vec3((double) f2, (double) f3, (double) f4); + return new Vec3d((double) f2, (double) f3, (double) f4); } public boolean isSkyColored() { diff --git a/src/main/java/net/minecraft/world/WorldProviderHell.java b/src/main/java/net/minecraft/world/WorldProviderHell.java index 0fb18ea..660e820 100644 --- a/src/main/java/net/minecraft/world/WorldProviderHell.java +++ b/src/main/java/net/minecraft/world/WorldProviderHell.java @@ -1,6 +1,6 @@ package net.minecraft.world; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.border.WorldBorder; @@ -52,8 +52,8 @@ public class WorldProviderHell extends WorldProvider { * + * Return Vec3D with biome specific fog color */ - public Vec3 getFogColor(float var1, float var2) { - return new Vec3(0.20000000298023224D, 0.029999999329447746D, 0.029999999329447746D); + public Vec3d getFogColor(float var1, float var2) { + return new Vec3d(0.20000000298023224D, 0.029999999329447746D, 0.029999999329447746D); } /** diff --git a/src/main/java/net/minecraft/world/WorldServer.java b/src/main/java/net/minecraft/world/WorldServer.java index 53baab1..9ab385d 100644 --- a/src/main/java/net/minecraft/world/WorldServer.java +++ b/src/main/java/net/minecraft/world/WorldServer.java @@ -44,15 +44,15 @@ import net.minecraft.scoreboard.ServerScoreboard; import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.PlayerManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.IThreadListener; import net.minecraft.util.ReportedException; -import net.minecraft.util.Vec3; import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.village.VillageCollection; import net.minecraft.village.VillageSiege; import net.minecraft.world.biome.BiomeGenBase; @@ -944,7 +944,7 @@ public class WorldServer extends World implements IThreadListener { if (entityplayer.getDistanceSq(d0, d1, d2) < 4096.0D) { ((EntityPlayerMP) entityplayer).playerNetServerHandler .sendPacket(new S27PacketExplosion(d0, d1, d2, f, explosion.getAffectedBlockPositions(), - (Vec3) explosion.getPlayerKnockbackMap().get(entityplayer))); + (Vec3d) explosion.getPlayerKnockbackMap().get(entityplayer))); } } diff --git a/src/main/java/net/minecraft/world/biome/BiomeColorHelper.java b/src/main/java/net/minecraft/world/biome/BiomeColorHelper.java index e5c4344..6885d77 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeColorHelper.java +++ b/src/main/java/net/minecraft/world/biome/BiomeColorHelper.java @@ -2,7 +2,7 @@ package net.minecraft.world.biome; import net.hoosiertransfer.Config; import net.hoosiertransfer.Sodium.SodiumBlockAccess; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/world/biome/BiomeDecorator.java b/src/main/java/net/minecraft/world/biome/BiomeDecorator.java index 7220250..2a70fb1 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeDecorator.java +++ b/src/main/java/net/minecraft/world/biome/BiomeDecorator.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockStone; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.ChunkProviderSettings; import net.minecraft.world.gen.GeneratorBushFeature; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java index 6835e99..9d99206 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java @@ -31,9 +31,9 @@ import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntitySquid; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.WeightedRandom; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenDesert.java b/src/main/java/net/minecraft/world/biome/BiomeGenDesert.java index 8ae66f3..6ce3444 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenDesert.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenDesert.java @@ -2,7 +2,7 @@ package net.minecraft.world.biome; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenDesertWells; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenForest.java b/src/main/java/net/minecraft/world/biome/BiomeGenForest.java index e7471d9..8d0b541 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenForest.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenForest.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenBigMushroom; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenHills.java b/src/main/java/net/minecraft/world/biome/BiomeGenHills.java index f9f309e..80598fa 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenHills.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenHills.java @@ -3,7 +3,7 @@ package net.minecraft.world.biome; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockSilverfish; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.feature.WorldGenAbstractTree; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenJungle.java b/src/main/java/net/minecraft/world/biome/BiomeGenJungle.java index 3689704..e2d60a7 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenJungle.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenJungle.java @@ -10,7 +10,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenMegaJungle; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java b/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java index 0e01358..5b93e0a 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java @@ -9,7 +9,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.NoiseGeneratorPerlin; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMutated.java b/src/main/java/net/minecraft/world/biome/BiomeGenMutated.java index c163ef5..593c16a 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenMutated.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenMutated.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import com.google.common.collect.Lists; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.feature.WorldGenAbstractTree; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java b/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java index 88947c6..38f8cec 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenPlains.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java b/src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java index a3b6efa..222cf77 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenSavanna.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockDoublePlant; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.feature.WorldGenAbstractTree; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSnow.java b/src/main/java/net/minecraft/world/biome/BiomeGenSnow.java index efd88d0..13fb599 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenSnow.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenSnow.java @@ -2,7 +2,7 @@ package net.minecraft.world.biome; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenIcePath; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java b/src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java index 1ea6fdd..db861bd 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.feature.WorldGenAbstractTree; diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java b/src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java index 47f22b3..b66e611 100644 --- a/src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java +++ b/src/main/java/net/minecraft/world/biome/BiomeGenTaiga.java @@ -6,7 +6,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.feature.WorldGenAbstractTree; diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManager.java b/src/main/java/net/minecraft/world/biome/WorldChunkManager.java index 81ff74a..971631b 100644 --- a/src/main/java/net/minecraft/world/biome/WorldChunkManager.java +++ b/src/main/java/net/minecraft/world/biome/WorldChunkManager.java @@ -5,8 +5,8 @@ import java.util.List; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.util.BlockPos; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.gen.layer.GenLayer; diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java b/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java index b4e1c89..3bffb21 100644 --- a/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java +++ b/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java @@ -3,7 +3,7 @@ package net.minecraft.world.biome; import java.util.Arrays; import java.util.List; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * + diff --git a/src/main/java/net/minecraft/world/border/WorldBorder.java b/src/main/java/net/minecraft/world/border/WorldBorder.java index c79fa96..6f4647a 100644 --- a/src/main/java/net/minecraft/world/border/WorldBorder.java +++ b/src/main/java/net/minecraft/world/border/WorldBorder.java @@ -5,8 +5,8 @@ import java.util.List; import com.google.common.collect.Lists; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; /** diff --git a/src/main/java/net/minecraft/world/chunk/Chunk.java b/src/main/java/net/minecraft/world/chunk/Chunk.java index 5a1544f..b215407 100644 --- a/src/main/java/net/minecraft/world/chunk/Chunk.java +++ b/src/main/java/net/minecraft/world/chunk/Chunk.java @@ -27,12 +27,12 @@ import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.ClassInheritanceMultiMap; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/world/chunk/EmptyChunk.java b/src/main/java/net/minecraft/world/chunk/EmptyChunk.java index 3a8d0a7..355cd20 100644 --- a/src/main/java/net/minecraft/world/chunk/EmptyChunk.java +++ b/src/main/java/net/minecraft/world/chunk/EmptyChunk.java @@ -9,8 +9,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/world/chunk/IChunkProvider.java b/src/main/java/net/minecraft/world/chunk/IChunkProvider.java index e0d2c22..a0854f2 100644 --- a/src/main/java/net/minecraft/world/chunk/IChunkProvider.java +++ b/src/main/java/net/minecraft/world/chunk/IChunkProvider.java @@ -3,8 +3,8 @@ package net.minecraft.world.chunk; import java.util.List; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java b/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java index 0e70e8b..eec1df3 100644 --- a/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java +++ b/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java @@ -8,8 +8,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagShort; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.NextTickListEntry; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java b/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java index 1e31426..062eed7 100644 --- a/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java +++ b/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java @@ -2,7 +2,7 @@ package net.minecraft.world.chunk.storage; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.NibbleArray; diff --git a/src/main/java/net/minecraft/world/demo/DemoWorldManager.java b/src/main/java/net/minecraft/world/demo/DemoWorldManager.java index 93fb8b9..2b780a8 100644 --- a/src/main/java/net/minecraft/world/demo/DemoWorldManager.java +++ b/src/main/java/net/minecraft/world/demo/DemoWorldManager.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.server.management.ItemInWorldManager; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; /** @@ -65,7 +65,7 @@ public class DemoWorldManager extends ItemInWorldManager { if (i % 24000L == 500L) { if (j <= 6L) { - this.thisPlayerMP.addChatMessage(new ChatComponentTranslation("demo.day." + j, new Object[0])); + this.thisPlayerMP.addChatMessage(new TextComponentTranslation("demo.day." + j, new Object[0])); } } else if (j == 1L) { if (i == 100L) { @@ -76,7 +76,7 @@ public class DemoWorldManager extends ItemInWorldManager { this.thisPlayerMP.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(5, 103.0F)); } } else if (j == 5L && i % 24000L == 22000L) { - this.thisPlayerMP.addChatMessage(new ChatComponentTranslation("demo.day.warning", new Object[0])); + this.thisPlayerMP.addChatMessage(new TextComponentTranslation("demo.day.warning", new Object[0])); } } @@ -88,7 +88,7 @@ public class DemoWorldManager extends ItemInWorldManager { */ private void sendDemoReminder() { if (this.field_73104_e > 100) { - this.thisPlayerMP.addChatMessage(new ChatComponentTranslation("demo.reminder", new Object[0])); + this.thisPlayerMP.addChatMessage(new TextComponentTranslation("demo.reminder", new Object[0])); this.field_73104_e = 0; } diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java b/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java index 9fa71c7..96e70c4 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java @@ -6,9 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java b/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java index 757d187..c596c3d 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java @@ -7,9 +7,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java b/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java index 81fef48..ed79e8c 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java @@ -7,8 +7,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java index 5bee652..69988f9 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java @@ -6,9 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java b/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java index 3799a24..1cba6df 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java @@ -8,9 +8,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java index d05ab4b..012ef45 100644 --- a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java @@ -11,10 +11,10 @@ import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.LongHashMap; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.MinecraftException; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java b/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java index e990868..7184f65 100644 --- a/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java +++ b/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java @@ -12,7 +12,7 @@ import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.BiomeGenBase; /** diff --git a/src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java b/src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java index 06adf1d..5d92336 100644 --- a/src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java +++ b/src/main/java/net/minecraft/world/gen/GeneratorBushFeature.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockBush; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/net/minecraft/world/gen/MapGenCaves.java b/src/main/java/net/minecraft/world/gen/MapGenCaves.java index 651403f..2aac6db 100644 --- a/src/main/java/net/minecraft/world/gen/MapGenCaves.java +++ b/src/main/java/net/minecraft/world/gen/MapGenCaves.java @@ -6,8 +6,8 @@ import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; diff --git a/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java b/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java index 484bda9..4326e8e 100644 --- a/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java +++ b/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; diff --git a/src/main/java/net/minecraft/world/gen/MapGenRavine.java b/src/main/java/net/minecraft/world/gen/MapGenRavine.java index cb8a3ac..fa36c1e 100644 --- a/src/main/java/net/minecraft/world/gen/MapGenRavine.java +++ b/src/main/java/net/minecraft/world/gen/MapGenRavine.java @@ -3,8 +3,8 @@ package net.minecraft.world.gen; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; diff --git a/src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java b/src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java index 0383ac8..8cdd892 100644 --- a/src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java +++ b/src/main/java/net/minecraft/world/gen/NoiseGeneratorOctaves.java @@ -1,8 +1,7 @@ package net.minecraft.world.gen; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java index af863de..ed20b8a 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java index 7ea4c2b..33c717b 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java @@ -5,7 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockHugeMushroom; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java index 7f09f28..11dcb4a 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java @@ -9,8 +9,8 @@ import net.minecraft.block.BlockLog; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java index 23d578d..7719237 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java index 824e04e..0627cfb 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java index 1dbb9e6..eb9b609 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java @@ -9,8 +9,8 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java index 66eaf9a..bb8db4e 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java index 7c78e7e..6192c27 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java index 547116f..eec8100 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java @@ -8,8 +8,8 @@ import net.minecraft.block.BlockStoneSlab; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateHelper; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java index 25b865b..86b865b 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockDoublePlant; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java index 3182738..b100b61 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java @@ -9,9 +9,9 @@ import net.minecraft.init.Items; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java index 971649e..f7c06f9 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java index e00e9c5..0b77f61 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java index 6f69d35..6fe28ea 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java @@ -8,7 +8,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java index 52b74b6..0e67483 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java @@ -3,8 +3,8 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java index a889c0a..a9f9a08 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java @@ -3,8 +3,8 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java index 19fb622..989aaf7 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java index 7086a50..0ddbe32 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java @@ -5,7 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java index 3867cc9..e7b2c16 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java index 1315c53..c8f84b4 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java index 95f47b1..14873ea 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java index 0776af7..bee29ff 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java index 1539772..467e132 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java @@ -5,8 +5,8 @@ import net.minecraft.block.BlockVine; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java index cb4ce0b..a1d0a4b 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java @@ -10,8 +10,8 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java index 5689f79..150afbe 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java index 40bedc6..285b7d0 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java @@ -5,8 +5,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java index 3277ff7..2529e2c 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java @@ -3,8 +3,8 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockPumpkin; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java index d360fd9..2049ddc 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java @@ -3,7 +3,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java index 7d88a9b..8a15825 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java index 0e01215..d577bef 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java @@ -9,8 +9,8 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java index 61102ee..f82fc83 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java @@ -5,7 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java index 049ee85..2892143 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java index a749f51..12a2773 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java @@ -10,7 +10,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java index 3990dc1..adf1ad9 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java @@ -9,7 +9,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java index ea0f083..30ed2bd 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java @@ -9,7 +9,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java index 0af913f..2660e27 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java @@ -6,7 +6,7 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java index a82d7a1..20c5959 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java @@ -12,8 +12,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java index 39803ab..9eb8248 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java @@ -4,8 +4,8 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.BlockVine; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java index 5bc91ad..a55e168 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java index 44a5d1b..cf1d039 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java @@ -2,7 +2,7 @@ package net.minecraft.world.gen.feature; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java b/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java index a529dda..8518b8d 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java @@ -7,8 +7,8 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java b/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java index e21d6f4..82e79f2 100644 --- a/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java @@ -17,9 +17,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java b/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java index 5a1f3ca..931c8ad 100644 --- a/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java +++ b/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java @@ -2,7 +2,8 @@ package net.minecraft.world.gen.structure; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.util.MathHelper; + +import net.minecraft.util.math.MathHelper; /** * + diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java b/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java index 776331a..168c24d 100644 --- a/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java +++ b/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java @@ -7,8 +7,8 @@ import java.util.Map; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import java.util.Map.Entry; import net.minecraft.entity.monster.EntityWitch; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java index 63230bb..a694a42 100644 --- a/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java +++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java @@ -6,8 +6,9 @@ import java.util.List; import java.util.Map; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import java.util.Map.Entry; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java index b6cc95f..168cf60 100644 --- a/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java +++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java @@ -13,8 +13,8 @@ import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.ReportedException; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkPrimer; diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java b/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java index 2109c1b..83fb1d9 100644 --- a/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java +++ b/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java @@ -6,7 +6,7 @@ import java.util.Map; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import java.util.Map.Entry; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java b/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java index cc003f5..b6f0811 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java @@ -2,9 +2,9 @@ package net.minecraft.world.gen.structure; import com.google.common.base.Objects; import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; /** * + diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java b/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java index e0942f5..a94de33 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java @@ -13,9 +13,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityDispenser; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java index aa7cae7..c0c42f3 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java @@ -14,9 +14,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java index b1b5f1f..1f58b1d 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java @@ -9,9 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java index 9c25544..f829492 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java @@ -11,9 +11,9 @@ import java.util.Map.Entry; import net.minecraft.entity.monster.EntityGuardian; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java index 02334ff..5c0c65c 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java @@ -14,8 +14,8 @@ import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.monster.EntityGuardian; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java index 2392fb0..e400635 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java @@ -12,9 +12,9 @@ import net.minecraft.init.Items; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java index 2792eb4..e4345b6 100644 --- a/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java +++ b/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java @@ -18,10 +18,10 @@ import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; diff --git a/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java index 965de1d..2bd7436 100644 --- a/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java +++ b/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java @@ -3,7 +3,7 @@ package net.minecraft.world.pathfinder; import net.minecraft.entity.Entity; import net.minecraft.pathfinding.PathPoint; import net.minecraft.util.IntHashMap; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java index 532f7c8..97a4fd5 100644 --- a/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java +++ b/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java @@ -4,9 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java index 0869777..ed56dc2 100644 --- a/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java +++ b/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java @@ -10,8 +10,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java b/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java index 9817593..1510f53 100644 --- a/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java +++ b/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java @@ -1,7 +1,7 @@ package net.minecraft.world.storage; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.GameRules; import net.minecraft.world.WorldSettings; diff --git a/src/main/java/net/minecraft/world/storage/MapData.java b/src/main/java/net/minecraft/world/storage/MapData.java index b71e9cd..2893e16 100644 --- a/src/main/java/net/minecraft/world/storage/MapData.java +++ b/src/main/java/net/minecraft/world/storage/MapData.java @@ -13,9 +13,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S34PacketMaps; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec4b; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec4b; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; diff --git a/src/main/java/net/minecraft/world/storage/WorldInfo.java b/src/main/java/net/minecraft/world/storage/WorldInfo.java index 44959fd..4aa58d4 100644 --- a/src/main/java/net/minecraft/world/storage/WorldInfo.java +++ b/src/main/java/net/minecraft/world/storage/WorldInfo.java @@ -4,7 +4,7 @@ import java.util.concurrent.Callable; import net.minecraft.crash.CrashReportCategory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.GameRules; import net.minecraft.world.WorldSettings; diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java index c2a1a56..5410919 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java @@ -6,6 +6,8 @@ import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundCategory; +import net.minecraft.util.math.MathHelper; + import org.teavm.interop.Async; import org.teavm.interop.AsyncCallback; import org.teavm.jso.JSObject; @@ -27,7 +29,6 @@ import org.teavm.jso.webaudio.PannerNode; import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -import net.minecraft.util.MathHelper; /** * Copyright (c) 2022-2023 lax1dude, hoosiertransfer. All Rights Reserved.