+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/BoundingBox.java src copy/minecraft/com/irtimaled/bbor/BoundingBox.java
---- src/minecraft/com/irtimaled/bbor/BoundingBox.java 2015-02-05 22:46:15.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/BoundingBox.java 2015-02-23 16:05:40.000000000 +0000
-@@ -51,12 +51,12 @@
- }
-
- public AxisAlignedBB toAxisAlignedBB(boolean extendMaxByOne) {
-- AxisAlignedBB axisAlignedBB = AxisAlignedBB.fromBounds(minBlockPos.getX(),
-- minBlockPos.getY(),
-- minBlockPos.getZ(),
-- maxBlockPos.getX(),
-- maxBlockPos.getY(),
-- maxBlockPos.getZ());
-+ AxisAlignedBB axisAlignedBB = AxisAlignedBB.getBoundingBox(minBlockPos.posX,
-+ minBlockPos.posY,
-+ minBlockPos.posZ,
-+ maxBlockPos.posX,
-+ maxBlockPos.posY,
-+ maxBlockPos.posZ);
- if (extendMaxByOne)
- return axisAlignedBB.addCoord(1, 1, 1);
- return axisAlignedBB;
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/BoundingBoxSlimeChunk.java src copy/minecraft/com/irtimaled/bbor/BoundingBoxSlimeChunk.java
---- src/minecraft/com/irtimaled/bbor/BoundingBoxSlimeChunk.java 2015-02-05 22:46:15.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/BoundingBoxSlimeChunk.java 2015-02-23 16:05:40.000000000 +0000
-@@ -11,8 +11,10 @@
- }
-
- public static BoundingBoxSlimeChunk from(ChunkCoordIntPair chunkCoordIntPair, Color color) {
-- BlockPos minBlockPos = new BlockPos(chunkCoordIntPair.getXStart(), 1, chunkCoordIntPair.getZStart());
-- BlockPos maxBlockPos = new BlockPos(chunkCoordIntPair.getXEnd(), 38, chunkCoordIntPair.getZEnd());
-+ int chunkXStart = chunkCoordIntPair.chunkXPos << 4;
-+ int chunkZStart = chunkCoordIntPair.chunkZPos << 4;
-+ BlockPos minBlockPos = new BlockPos(chunkXStart, 1, chunkZStart);
-+ BlockPos maxBlockPos = new BlockPos(chunkXStart + 15, 38, chunkZStart + 15);
- return new BoundingBoxSlimeChunk(minBlockPos, maxBlockPos, color);
- }
-
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/BoundingBoxVillage.java src copy/minecraft/com/irtimaled/bbor/BoundingBoxVillage.java
---- src/minecraft/com/irtimaled/bbor/BoundingBoxVillage.java 2015-02-23 15:07:53.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/BoundingBoxVillage.java 2015-02-23 16:05:40.000000000 +0000
-@@ -29,12 +29,12 @@
- }
-
- public static BoundingBoxVillage from(BlockPos center, Integer radius, Color color, boolean spawnsIronGolems, Set<BlockPos> doors) {
-- BlockPos minBlockPos = new BlockPos(center.getX() - radius,
-- center.getY() - 4,
-- center.getZ() - radius);
-- BlockPos maxBlockPos = new BlockPos(center.getX() + radius,
-- center.getY() + 4,
-- center.getZ() + radius);
-+ BlockPos minBlockPos = new BlockPos(center.posX - radius,
-+ center.posY - 4,
-+ center.posZ - radius);
-+ BlockPos maxBlockPos = new BlockPos(center.posX + radius,
-+ center.posY + 4,
-+ center.posZ + radius);
- if (color == null)
- color = getNextColor();
- return new BoundingBoxVillage(center, radius, color, spawnsIronGolems, doors, minBlockPos, maxBlockPos);
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/ClientProxy.java src copy/minecraft/com/irtimaled/bbor/ClientProxy.java
---- src/minecraft/com/irtimaled/bbor/ClientProxy.java 2015-02-23 15:36:23.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/ClientProxy.java 2015-02-23 16:16:23.000000000 +0000
-@@ -70,7 +70,7 @@
- playerZ = entityPlayer.lastTickPosZ + (entityPlayer.posZ - entityPlayer.lastTickPosZ) * (double) partialTicks;
-
- if (this.active) {
-- int activeDimensionId = entityPlayer.worldObj.provider.getDimensionId();
-+ int activeDimensionId = entityPlayer.worldObj.provider.dimensionId;
- if (boundingBoxCacheMap.containsKey(activeDimensionId)) {
- renderBoundingBoxes(boundingBoxCacheMap.get(activeDimensionId).getBoundingBoxes());
- }
-@@ -114,9 +114,6 @@
- if (configManager.drawWitchHuts.getBoolean()) {
- loadStructureNbtFile(localStructuresFolder, cache, "Temple.dat", StructureType.WitchHut.getColor(), "TeSH");
- }
-- if (configManager.drawOceanMonuments.getBoolean()) {
-- loadStructureNbtFile(localStructuresFolder, cache, "Monument.dat", StructureType.OceanMonument.getColor(), "*");
-- }
- if (configManager.drawMineShafts.getBoolean()) {
- loadStructureNbtFile(localStructuresFolder, cache, "Mineshaft.dat", StructureType.MineShaft.getColor(), "*");
- }
-@@ -274,8 +271,8 @@
- Set activeChunks = getActiveChunks(world);
- for (BoundingBox bb : bbList) {
-
-- if (activeChunks.contains(world.getChunkFromBlockCoords(bb.getMinBlockPos()).getChunkCoordIntPair()) ||
-- activeChunks.contains(world.getChunkFromBlockCoords(bb.getMaxBlockPos()).getChunkCoordIntPair())) {
-+ if (activeChunks.contains(world.getChunkFromBlockCoords(bb.getMinBlockPos().posX, bb.getMinBlockPos().posZ).getChunkCoordIntPair()) ||
-+ activeChunks.contains(world.getChunkFromBlockCoords(bb.getMaxBlockPos().posX, bb.getMaxBlockPos().posZ).getChunkCoordIntPair())) {
-
- if (bb instanceof BoundingBoxVillage) {
- BoundingBoxVillage villageBB = (BoundingBoxVillage) bb;
-@@ -341,7 +338,7 @@
- }
-
- private void renderRectangle(AxisAlignedBB aaBB, double minY, double maxY, Color color, Boolean fill) {
-- aaBB = new AxisAlignedBB(aaBB.minX, minY, aaBB.minZ, aaBB.maxX, maxY, aaBB.maxZ);
-+ aaBB = AxisAlignedBB.getBoundingBox(aaBB.minX, minY, aaBB.minZ, aaBB.maxX, maxY, aaBB.maxZ);
- renderCuboid(aaBB, color, fill);
- }
-
-@@ -351,12 +348,12 @@
-
- private void renderIronGolemSpawnArea(BoundingBoxVillage villageBB) {
- BlockPos center = villageBB.getCenter();
-- AxisAlignedBB abb = new AxisAlignedBB(new BlockPos(center.getX() - 8,
-- center.getY() - 3,
-- center.getZ() - 8),
-- new BlockPos(center.getX() + 8,
-- center.getY() + 3,
-- center.getZ() + 8));
-+ AxisAlignedBB abb = AxisAlignedBB.getBoundingBox(center.posX - 8,
-+ center.posY - 3,
-+ center.posZ - 8,
-+ center.posX + 8,
-+ center.posY + 3,
-+ center.posZ + 8);
- renderCuboid(abb.addCoord(1, 1, 1), villageBB.getColor(), false);
- }
-
-@@ -364,21 +361,20 @@
- OffsetPoint center = new OffsetPoint(villageBB.getCenter());
- Color color = villageBB.getColor();
- GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
-- Tessellator tessellator = Tessellator.getInstance();
-- WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-+ Tessellator tessellator = Tessellator.instance;
-
- int colorR = color.getRed();
- int colorG = color.getGreen();
- int colorB = color.getBlue();
-
-- worldRenderer.startDrawing(GL11.GL_LINES);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, 255);
-+ tessellator.startDrawing(GL11.GL_LINES);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, 255);
- for (BlockPos door : villageBB.getDoors()) {
- OffsetPoint point = new OffsetPoint(door);
-
-
-- worldRenderer.addVertex(point.getX(), point.getY(), point.getZ());
-- worldRenderer.addVertex(center.getX(), center.getY(), center.getZ());
-+ tessellator.addVertex(point.getX(), point.getY(), point.getZ());
-+ tessellator.addVertex(center.getX(), center.getY(), center.getZ());
- }
- tessellator.draw();
- }
-@@ -406,63 +402,62 @@
- }
-
- private void renderCuboid(AxisAlignedBB bb, int alphaChannel, Color color) {
-- Tessellator tessellator = Tessellator.getInstance();
-- WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-+ Tessellator tessellator = Tessellator.instance;
-
- int colorR = color.getRed();
- int colorG = color.getGreen();
- int colorB = color.getBlue();
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.maxZ);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.maxZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.maxZ);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.maxZ);
- tessellator.draw();
-
- if (bb.minY == bb.maxY) {
- return;
- }
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.maxZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.maxZ);
- tessellator.draw();
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.maxZ);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.maxZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.maxZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.maxZ);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.maxZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.maxZ);
- tessellator.draw();
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.minZ);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.minZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.minZ);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.minZ);
- tessellator.draw();
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.minZ);
-- worldRenderer.addVertex(bb.minX, bb.minY, bb.maxZ);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.maxZ);
-- worldRenderer.addVertex(bb.minX, bb.maxY, bb.minZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.minZ);
-+ tessellator.addVertex(bb.minX, bb.minY, bb.maxZ);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.maxZ);
-+ tessellator.addVertex(bb.minX, bb.maxY, bb.minZ);
- tessellator.draw();
-
-- worldRenderer.startDrawing(GL11.GL_QUADS);
-- worldRenderer.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.minZ);
-- worldRenderer.addVertex(bb.maxX, bb.minY, bb.maxZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-- worldRenderer.addVertex(bb.maxX, bb.maxY, bb.minZ);
-+ tessellator.startDrawing(GL11.GL_QUADS);
-+ tessellator.setColorRGBA(colorR, colorG, colorB, alphaChannel);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.minZ);
-+ tessellator.addVertex(bb.maxX, bb.minY, bb.maxZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.maxZ);
-+ tessellator.addVertex(bb.maxX, bb.maxY, bb.minZ);
- tessellator.draw();
- }
-
-@@ -488,12 +483,11 @@
- GL11.glEnable(GL11.GL_POINT_SMOOTH);
- GL11.glPointSize(2f);
-
-- Tessellator tessellator = Tessellator.getInstance();
-- WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-- worldRenderer.startDrawing(GL11.GL_POINTS);
-- worldRenderer.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 255);
-+ Tessellator tessellator = Tessellator.instance;
-+ tessellator.startDrawing(GL11.GL_POINTS);
-+ tessellator.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 255);
- for (OffsetPoint point : buildPoints(center, radius)) {
-- worldRenderer.addVertex(point.getX(), point.getY(), point.getZ());
-+ tessellator.addVertex(point.getX(), point.getY(), point.getZ());
- }
- tessellator.draw();
- }
-@@ -510,9 +504,9 @@
- }
-
- public OffsetPoint(BlockPos blockPos) {
-- x = blockPos.getX();
-- y = blockPos.getY();
-- z = blockPos.getZ();
-+ x = blockPos.posX;
-+ y = blockPos.posY;
-+ z = blockPos.posZ;
- }
-
- public double getX() {
-@@ -555,7 +549,7 @@
- Set<BoundingBox> boundingBoxes = new HashSet<BoundingBox>();
- if (worldData != null) {
- World world = Minecraft.getMinecraft().theWorld;
-- int dimensionId = world.provider.getDimensionId();
-+ int dimensionId = world.provider.dimensionId;
- if (dimensionId == 0) {
- if (configManager.drawWorldSpawn.getBoolean()) {
- boundingBoxes.add(getWorldSpawnBoundingBox(worldData.getSpawnX(), worldData.getSpawnZ()));
-@@ -606,9 +600,9 @@
-
- private BoundingBox getSpawnChunksBoundingBox(int spawnX, int spawnZ, int size, Color color) {
- double chunkSize = 16;
-- double midOffset = chunkSize * (size / 2);
-- double midX = Math.round((float) (spawnX / chunkSize)) * chunkSize;
-- double midZ = Math.round((float) (spawnZ / chunkSize)) * chunkSize;
-+ int midOffset = (int) chunkSize * (size / 2);
-+ int midX = Math.round((float) (spawnX / chunkSize)) * (int) chunkSize;
-+ int midZ = Math.round((float) (spawnZ / chunkSize)) * (int) chunkSize;
- BlockPos minBlockPos = new BlockPos(midX - midOffset, 0, midZ - midOffset);
- if (spawnX / chunkSize % 0.5D == 0.0D && spawnZ / chunkSize % 0.5D == 0.0D) {
- midX += chunkSize;
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/CommonProxy.java src copy/minecraft/com/irtimaled/bbor/CommonProxy.java
---- src/minecraft/com/irtimaled/bbor/CommonProxy.java 2015-02-23 14:01:07.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/CommonProxy.java 2015-02-23 16:05:40.000000000 +0000
-@@ -25,14 +25,14 @@
- if (chunkProvider instanceof ChunkProviderServer) {
- chunkProvider = ReflectionHelper.getPrivateValue(ChunkProviderServer.class, (ChunkProviderServer) chunkProvider, IChunkProvider.class);
- setWorldData(new WorldData(world.getSeed(), world.getWorldInfo().getSpawnX(), world.getWorldInfo().getSpawnZ()));
-- int dimensionId = world.provider.getDimensionId();
-+ int dimensionId = world.provider.dimensionId;
- Logger.info("create world dimension: %d, %s (chunkprovider: %s) (seed: %d)", dimensionId, world.getClass().toString(), chunkProvider.getClass().toString(), worldData.getSeed());
- boundingBoxCacheMap.put(dimensionId, new DimensionProcessor(eventHandler, configManager, world, dimensionId, chunkProvider));
- }
- }
-
- public void chunkLoaded(Chunk chunk) {
-- int dimensionId = chunk.getWorld().provider.getDimensionId();
-+ int dimensionId = chunk.worldObj.provider.dimensionId;
- if (boundingBoxCacheMap.containsKey(dimensionId)) {
- boundingBoxCacheMap.get(dimensionId).refresh();
- }
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/ConfigManager.java src copy/minecraft/com/irtimaled/bbor/ConfigManager.java
---- src/minecraft/com/irtimaled/bbor/ConfigManager.java 2015-02-23 15:36:23.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/ConfigManager.java 2015-02-23 16:05:40.000000000 +0000
-@@ -16,7 +16,6 @@
- public Setting drawStrongholds;
- public Setting drawMineShafts;
- public Setting drawNetherFortresses;
-- public Setting drawOceanMonuments;
- public Setting alwaysVisible;
- public Setting renderVillageAsSphere;
- public Setting drawIronGolemSpawnArea;
-@@ -48,7 +47,6 @@
- drawStrongholds = SetupBooleanProperty(config, "features", "drawStrongholds", false, "If set to true stronghold bounding boxes are drawn. (default: false)");
- drawMineShafts = SetupBooleanProperty(config, "features", "drawMineShafts", false, "If set to true mineshaft bounding boxes are drawn. (default: false)");
- drawNetherFortresses = SetupBooleanProperty(config, "features", "drawNetherFortresses", true, "If set to true nether fortress bounding boxes are drawn. (default: true)");
-- drawOceanMonuments = SetupBooleanProperty(config, "features", "drawOceanMonuments", true, "If set to true ocean monument bounding boxes are drawn. (default: true)");
- drawSlimeChunks = SetupBooleanProperty(config, "features", "drawSlimeChunks", true, "If set to true slime chunks bounding boxes are drawn. (default: true)");
- slimeChunkMaxY = SetupIntegerProperty(config, "features", "slimeChunkMaxY", -1, "The maximum top of the slime chunk bounding box. If set to -1 it will use the value when activated, if set to 0 it will always track the player's feet. (default: -1)");
- drawWorldSpawn = SetupBooleanProperty(config, "features", "drawWorldSpawn", true, "If set to true world spawn and spawn chunks bounding boxes are drawn. (default: true)");
+++ /dev/null
-diff -r -U 3 src/minecraft/com/irtimaled/bbor/DimensionProcessor.java src copy/minecraft/com/irtimaled/bbor/DimensionProcessor.java
---- src/minecraft/com/irtimaled/bbor/DimensionProcessor.java 2015-02-23 15:07:53.000000000 +0000
-+++ src copy/minecraft/com/irtimaled/bbor/DimensionProcessor.java 2015-02-23 16:05:40.000000000 +0000
-@@ -75,10 +75,6 @@
- structureMap.put(StructureType.WitchHut, getStructuresWithComponent(getStructures(chunkProvider, MapGenScatteredFeature.class), ComponentScatteredFeaturePieces.SwampHut.class));
- }
-
-- if (configManager.drawOceanMonuments.getBoolean()) {
-- structureMap.put(StructureType.OceanMonument, getStructures(chunkProvider, StructureOceanMonument.class));
-- }
--
- if (configManager.drawStrongholds.getBoolean()) {
- structureMap.put(StructureType.Stronghold, getStructures(chunkProvider, MapGenStronghold.class));
- }
-@@ -129,10 +125,10 @@
- }
-
- if (configManager.drawVillages.getBoolean() &&
-- (world.getVillageCollection() != null)) {
-+ (world.villageCollectionObj != null)) {
-
- Map<Integer, BoundingBoxVillage> villageBoundingBoxes = new HashMap<Integer, BoundingBoxVillage>();
-- List<Village> villages = world.getVillageCollection().getVillageList();
-+ List<Village> villages = world.villageCollectionObj.getVillageList();
- for (Village village : villages) {
- int villageId = village.hashCode();
- BlockPos center = village.getCenter();
-@@ -160,7 +156,8 @@
- private Set<BlockPos> getDoorsFromVillage(Village village) {
- Set<BlockPos> doors = new HashSet<BlockPos>();
- for (Object doorInfo : village.getVillageDoorInfoList()) {
- VillageDoorInfo villageDoorInfo = (VillageDoorInfo) doorInfo;
-- doors.add(villageDoorInfo.getDoorBlockPos());
-+ doors.add(new BlockPos(villageDoorInfo.posX, villageDoorInfo.posY, villageDoorInfo.posZ));
- }
- return doors;
- }
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/Minecraft.java src copy/minecraft/net/minecraft/client/Minecraft.java
---- src/minecraft/net/minecraft/client/Minecraft.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/client/Minecraft.java 2015-02-22 21:24:58.000000000 +0000
-@@ -639,6 +639,7 @@
- this.gameSettings.enableVsync = false;
- this.gameSettings.saveOptions();
- }
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.init();
- }
-
- public boolean func_152349_b()
-@@ -1963,6 +1964,7 @@
- }
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.keyPressed();
- for (var9 = 0; var9 < 9; ++var9)
- {
- if (this.gameSettings.keyBindsHotbar[var9].isPressed())
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/multiplayer/WorldClient.java src copy/minecraft/net/minecraft/client/multiplayer/WorldClient.java
---- src/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2015-02-22 21:24:01.000000000 +0000
-@@ -293,6 +293,7 @@
- public void sendQuittingDisconnectingPacket()
- {
- this.sendQueue.getNetworkManager().closeChannel(new ChatComponentText("Quitting"));
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerDisconnectedFromServer();
- }
-
- /**
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/renderer/EntityRenderer.java src copy/minecraft/net/minecraft/client/renderer/EntityRenderer.java
---- src/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2015-02-22 21:23:17.000000000 +0000
-@@ -1442,6 +1442,7 @@
- this.renderCloudsCheck(var5, p_78471_1_);
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.render(p_78471_1_);
- this.mc.mcProfiler.endStartSection("hand");
-
- if (this.cameraZoom == 1.0D)
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/network/NetworkManager.java src copy/minecraft/net/minecraft/network/NetworkManager.java
---- src/minecraft/net/minecraft/network/NetworkManager.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/network/NetworkManager.java 2015-02-23 16:23:21.000000000 +0000
-@@ -22,6 +22,8 @@
- import java.net.SocketAddress;
- import java.util.Queue;
- import javax.crypto.SecretKey;
-+
-+import net.minecraft.network.login.client.C00PacketLoginStart;
- import net.minecraft.util.ChatComponentTranslation;
- import net.minecraft.util.CryptManager;
- import net.minecraft.util.IChatComponent;
-@@ -166,6 +168,10 @@
- {
- this.outboundPacketsQueue.add(new NetworkManager.InboundHandlerTuplePacketListener(p_150725_1_, p_150725_2_));
- }
-+
-+ if (p_150725_1_ instanceof C00PacketLoginStart) {
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerConnectedToServer(this);
-+ }
- }
-
- /**
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/server/integrated/IntegratedServer.java src copy/minecraft/net/minecraft/server/integrated/IntegratedServer.java
---- src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2015-02-22 21:21:45.000000000 +0000
-@@ -86,6 +86,7 @@
- this.worldServers[var8] = new WorldServerMulti(this, var7, p_71247_2_, var9, this.theWorldSettings, this.worldServers[0], this.theProfiler);
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.worldLoaded(this.worldServers[var8]);
- this.worldServers[var8].addWorldAccess(new WorldManager(this, this.worldServers[var8]));
- this.getConfigurationManager().setPlayerManager(this.worldServers);
- }
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/world/chunk/Chunk.java src copy/minecraft/net/minecraft/world/chunk/Chunk.java
---- src/minecraft/net/minecraft/world/chunk/Chunk.java 2015-02-23 16:20:20.000000000 +0000
-+++ src copy/minecraft/net/minecraft/world/chunk/Chunk.java 2015-02-22 21:21:06.000000000 +0000
-@@ -1029,6 +1029,7 @@
-
- this.worldObj.addLoadedEntities(this.entityLists[var1]);
- }
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.chunkLoaded(this);
- }
-
- /**
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/Minecraft.java src 2/minecraft/net/minecraft/client/Minecraft.java
---- src/minecraft/net/minecraft/client/Minecraft.java 2015-02-20 10:21:35.000000000 +0000
-+++ src 2/minecraft/net/minecraft/client/Minecraft.java 2015-02-19 21:44:51.000000000 +0000
-@@ -584,6 +584,8 @@
- }
-
- this.renderGlobal.func_174966_b();
-+
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.init();
- }
-
- private void func_175608_ak()
-@@ -2051,6 +2053,8 @@
- }
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.keyPressed();
-+
- for (var1 = 0; var1 < 9; ++var1)
- {
- if (this.gameSettings.keyBindsHotbar[var1].isPressed())
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/multiplayer/WorldClient.java src 2/minecraft/net/minecraft/client/multiplayer/WorldClient.java
---- src/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2015-02-20 10:21:35.000000000 +0000
-+++ src 2/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2015-02-19 21:36:03.000000000 +0000
-@@ -287,6 +287,7 @@
- public void sendQuittingDisconnectingPacket()
- {
- this.sendQueue.getNetworkManager().closeChannel(new ChatComponentText("Quitting"));
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerDisconnectedFromServer();
- }
-
- /**
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/client/renderer/EntityRenderer.java src 2/minecraft/net/minecraft/client/renderer/EntityRenderer.java
---- src/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2015-02-20 10:21:35.000000000 +0000
-+++ src 2/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2015-02-19 21:35:39.000000000 +0000
-@@ -1469,6 +1469,7 @@
- this.func_180437_a(var5, p_175068_2_, p_175068_1_);
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.render(p_175068_2_);
- this.mc.mcProfiler.endStartSection("hand");
-
- if (this.field_175074_C)
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/network/NetworkManager.java src 2/minecraft/net/minecraft/network/NetworkManager.java
---- src/minecraft/net/minecraft/network/NetworkManager.java 2015-02-20 10:21:36.000000000 +0000
-+++ src 2/minecraft/net/minecraft/network/NetworkManager.java 2015-02-19 21:35:16.000000000 +0000
-@@ -27,6 +27,7 @@
- import java.net.SocketAddress;
- import java.util.Queue;
- import javax.crypto.SecretKey;
-+import net.minecraft.network.login.client.C00PacketLoginStart;
- import net.minecraft.server.gui.IUpdatePlayerListBox;
- import net.minecraft.src.gt;
- import net.minecraft.util.ChatComponentText;
-@@ -185,6 +186,9 @@
- {
- this.outboundPacketsQueue.add(new NetworkManager.InboundHandlerTuplePacketListener(packetIn, (GenericFutureListener[])null));
- }
-+ if(packetIn instanceof C00PacketLoginStart) {
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerConnectedToServer(this);
-+ }
- }
-
- public void sendPacket(Packet packetIn, GenericFutureListener listener, GenericFutureListener ... listeners)
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/server/integrated/IntegratedServer.java src 2/minecraft/net/minecraft/server/integrated/IntegratedServer.java
---- src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2015-02-20 10:21:36.000000000 +0000
-+++ src 2/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2015-02-19 21:34:38.000000000 +0000
-@@ -120,6 +120,7 @@
- this.worldServers[var9] = (WorldServer)(new WorldServerMulti(this, var7, var10, this.worldServers[0], this.theProfiler)).init();
- }
-
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.worldLoaded(this.worldServers[var9]);
- this.worldServers[var9].addWorldAccess(new WorldManager(this, this.worldServers[var9]));
- }
-
+++ /dev/null
-diff -r -U 3 src/minecraft/net/minecraft/world/chunk/Chunk.java src 2/minecraft/net/minecraft/world/chunk/Chunk.java
---- src/minecraft/net/minecraft/world/chunk/Chunk.java 2015-02-20 10:21:36.000000000 +0000
-+++ src 2/minecraft/net/minecraft/world/chunk/Chunk.java 2015-02-19 21:34:23.000000000 +0000
-@@ -1048,6 +1048,7 @@
-
- this.worldObj.loadEntities(this.entityLists[var1]);
- }
-+ com.irtimaled.bbor.BoundingBoxOutlineReloaded.chunkLoaded(this);
- }
-
- /**
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/client/Minecraft.java mcp931 2/src/minecraft/net/minecraft/client/Minecraft.java
+--- mcp931/src/minecraft/net/minecraft/client/Minecraft.java 2016-08-23 00:14:23.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/client/Minecraft.java 2016-08-27 18:56:55.000000000 +0100
+@@ -621,8 +621,6 @@
+ }
+
+ this.renderGlobal.makeEntityOutlineShader();
+-
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.init();
+ }
+
+ private void registerMetadataSerializers()
+@@ -2195,8 +2193,6 @@
+ this.gameSettings.smoothCamera = !this.gameSettings.smoothCamera;
+ }
+
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.keyPressed();
+-
+ for (int i = 0; i < 9; ++i)
+ {
+ if (this.gameSettings.keyBindsHotbar[i].isPressed())
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java mcp931 2/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java
+--- mcp931/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2016-08-27 18:58:30.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2016-08-27 18:56:55.000000000 +0100
+@@ -320,7 +320,6 @@
+ public void sendQuittingDisconnectingPacket()
+ {
+ this.connection.getNetworkManager().closeChannel(new TextComponentString("Quitting"));
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerDisconnectedFromServer();
+ }
+
+ /**
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java mcp931 2/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java
+--- mcp931/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2016-08-17 23:44:17.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2016-08-27 18:56:55.000000000 +0100
+@@ -1466,8 +1466,6 @@
+ this.renderCloudsCheck(renderglobal, partialTicks, pass);
+ }
+
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.render(partialTicks);
+-
+ this.mc.mcProfiler.endStartSection("hand");
+
+ if (this.renderHand)
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/network/NetworkManager.java mcp931 2/src/minecraft/net/minecraft/network/NetworkManager.java
+--- mcp931/src/minecraft/net/minecraft/network/NetworkManager.java 2016-08-17 23:46:31.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/network/NetworkManager.java 2016-08-27 18:56:55.000000000 +0100
+@@ -33,7 +33,6 @@
+ import java.util.concurrent.locks.ReentrantReadWriteLock;
+ import javax.annotation.Nullable;
+ import javax.crypto.SecretKey;
+-import net.minecraft.network.login.client.CPacketLoginStart;
+ import net.minecraft.util.CryptManager;
+ import net.minecraft.util.ITickable;
+ import net.minecraft.util.LazyLoadBase;
+@@ -191,10 +190,6 @@
+ this.readWriteLock.writeLock().unlock();
+ }
+ }
+-
+- if(packetIn instanceof CPacketLoginStart) {
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.playerConnectedToServer(this);
+- }
+ }
+
+ public void sendPacket(Packet<?> packetIn, GenericFutureListener <? extends Future <? super Void >> listener, GenericFutureListener <? extends Future <? super Void >> ... listeners)
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java mcp931 2/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java
+--- mcp931/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2016-08-17 23:48:14.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2016-08-27 18:56:56.000000000 +0100
+@@ -115,7 +115,6 @@
+ this.worldServers[i] = (WorldServer)(new WorldServerMulti(this, isavehandler, j, this.worldServers[0], this.theProfiler)).init();
+ }
+
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.worldLoaded(this.worldServers[i]);
+ this.worldServers[i].addEventListener(new ServerWorldEventHandler(this, this.worldServers[i]));
+ }
--- /dev/null
+diff -r -U 3 mcp931/src/minecraft/net/minecraft/world/chunk/Chunk.java mcp931 2/src/minecraft/net/minecraft/world/chunk/Chunk.java
+--- mcp931/src/minecraft/net/minecraft/world/chunk/Chunk.java 2016-08-17 23:49:04.000000000 +0100
++++ mcp931 2/src/minecraft/net/minecraft/world/chunk/Chunk.java 2016-08-27 18:56:56.000000000 +0100
+@@ -922,7 +922,6 @@
+ {
+ this.worldObj.loadEntities(classinheritancemultimap);
+ }
+- com.irtimaled.bbor.BoundingBoxOutlineReloaded.chunkLoaded(this);
+ }
+
+ /**
projects / BoundingBoxOutlineReloaded.git / commitdiff