From d24eb693e92ba9e6ec6403de2b6d08c707785f34 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 20 Jul 2015 21:51:27 -0700 Subject: [PATCH] Vect cleanup --- .../genetics/AlleleEffectGlacial.java | 4 ++-- .../genetics/AlleleEffectRadioactive.java | 6 +++--- .../genetics/AlleleEffectSnowing.java | 6 +++--- .../genetics/AlleleEffectThrottled.java | 4 ++-- .../genetics/JubilanceProviderHermit.java | 4 ++-- .../genetics/AlleleLeafEffectNone.java | 8 +++---- .../worldgen/WorldGenArboriculture.java | 5 ----- .../java/forestry/core/vect/MutableVect.java | 6 ++++++ src/main/java/forestry/core/vect/Vect.java | 21 ++++++++++++++++++- .../forestry/farming/logic/FarmLogic.java | 5 +---- .../farming/logic/FarmLogicArboreal.java | 2 +- .../farming/logic/FarmLogicCocoa.java | 2 +- .../farming/logic/FarmLogicOrchard.java | 2 +- 13 files changed, 46 insertions(+), 29 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java index ab75a573f..f946ab9cf 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java @@ -47,8 +47,8 @@ public class AlleleEffectGlacial extends AlleleEffectThrottled { } int[] areaAr = genome.getTerritory(); - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr); + Vect offset = area.multiply(-1 / 2.0f); Vect housingCoords = new Vect(housing.getCoordinates()); for (int i = 0; i < 10; i++) { diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java index 34fe841f4..07d6d8978 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java @@ -48,8 +48,8 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled { } int[] areaAr = genome.getTerritory(); - Vect area = new Vect(areaAr[0] * 2, areaAr[1] * 2, areaAr[2] * 2); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr).multiply(2); + Vect offset = area.multiply(-1 / 2.0f); // Radioactivity hurts players and mobs Vect min = new Vect(housing.getCoordinates()).add(offset); @@ -89,7 +89,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled { // Radioactivity destroys environment for (int i = 0; i < 20; i++) { - Vect randomPos = new Vect(rand.nextInt(area.x), rand.nextInt(area.y), rand.nextInt(area.z)); + Vect randomPos = Vect.getRandomPositionInArea(rand, area); Vect posHousing = new Vect(housing.getCoordinates()); Vect posBlock = randomPos.add(posHousing); diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java index 1e862a55a..f053b6004 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java @@ -50,12 +50,12 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled { } int[] areaAr = genome.getTerritory(); - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr); + Vect offset = area.multiply(-1 / 2.0f); for (int i = 0; i < 1; i++) { - Vect randomPos = new Vect(world.rand.nextInt(area.x), world.rand.nextInt(area.y), world.rand.nextInt(area.z)); + Vect randomPos = Vect.getRandomPositionInArea(world.rand, area); Vect posBlock = randomPos.add(new Vect(housing.getCoordinates())); posBlock = posBlock.add(offset); diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java index e53a62490..4ae5dac7e 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java @@ -106,8 +106,8 @@ public abstract class AlleleEffectThrottled extends AlleleCategorized implements protected AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing, float modifier) { int[] areaAr = genome.getTerritory(); - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]).multiply(modifier); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr).multiply(modifier); + Vect offset = area.multiply(-1 / 2.0f); Vect min = new Vect(housing.getCoordinates()).add(offset); Vect max = min.add(area); diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java index 3e62a63e6..8872c18f6 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java @@ -37,8 +37,8 @@ public class JubilanceProviderHermit extends JubilanceDefault { private static AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing, float modifier) { int[] areaAr = genome.getTerritory(); - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]).multiply(modifier); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr).multiply(modifier); + Vect offset = area.multiply(-1 / 2.0f); ChunkCoordinates housingCoordinates = housing.getCoordinates(); diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java index c8d626abd..3c868736e 100755 --- a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java +++ b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java @@ -49,11 +49,11 @@ public class AlleleLeafEffectNone extends AlleleCategorized implements IAlleleLe protected static AxisAlignedBB getBounding(int x, int y, int z, float modifier) { int[] areaAr = DEFAULT_EFFECT_AREA; - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]).multiply(modifier); - Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2)); + Vect area = new Vect(areaAr).multiply(modifier); + Vect offset = area.multiply(-1 / 2.0f); - Vect min = new Vect(x + offset.x, y + offset.y, y + offset.z); - Vect max = new Vect(x + offset.x + area.x, y + offset.y + area.y, y + offset.z + area.z); + Vect min = offset.add(x, y, z); + Vect max = min.add(area); return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 567c0105a..6cf42ac3c 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -18,7 +18,6 @@ import com.mojang.authlib.GameProfile; import forestry.api.world.ITreeGenData; import forestry.arboriculture.gadgets.TileSapling; import forestry.core.utils.Utils; -import forestry.core.vect.Vect; import forestry.core.worldgen.BlockType; import forestry.core.worldgen.WorldGenBase; @@ -85,10 +84,6 @@ public abstract class WorldGenArboriculture extends WorldGenBase { public abstract BlockType getWood(); - public final Vect getStartVector() { - return new Vect(startX, startY, startZ); - } - protected void generateTreeTrunk(int height, int girth) { generateTreeTrunk(height, girth, 0); } diff --git a/src/main/java/forestry/core/vect/MutableVect.java b/src/main/java/forestry/core/vect/MutableVect.java index 7f151c81e..b63a52ae8 100644 --- a/src/main/java/forestry/core/vect/MutableVect.java +++ b/src/main/java/forestry/core/vect/MutableVect.java @@ -30,6 +30,12 @@ public class MutableVect implements IVect { this.z = z; } + public MutableVect(ForgeDirection direction) { + this.x = direction.offsetX; + this.y = direction.offsetY; + this.z = direction.offsetZ; + } + public MutableVect(int[] dim) { if (dim.length != 3) { throw new RuntimeException("Cannot instantiate a vector with less or more than 3 points."); diff --git a/src/main/java/forestry/core/vect/Vect.java b/src/main/java/forestry/core/vect/Vect.java index efcc08b76..dde665481 100644 --- a/src/main/java/forestry/core/vect/Vect.java +++ b/src/main/java/forestry/core/vect/Vect.java @@ -13,6 +13,7 @@ package forestry.core.vect; import java.util.Random; import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.common.util.ForgeDirection; @@ -38,7 +39,15 @@ public class Vect implements IVect { } public Vect(IVect vect) { - this(vect.getX(), vect.getY(), vect.getZ()); + this.x = vect.getX(); + this.y = vect.getY(); + this.z = vect.getZ(); + } + + public Vect(ForgeDirection direction) { + this.x = direction.offsetX; + this.y = direction.offsetY; + this.z = direction.offsetZ; } public Vect(int x, int y, int z) { @@ -53,6 +62,12 @@ public class Vect implements IVect { this.z = coordinates.posZ; } + public Vect(TileEntity entity) { + this.x = entity.xCoord; + this.y = entity.yCoord; + this.z = entity.zCoord; + } + public Vect(Entity entity) { this.x = (int) Math.round(entity.posX); this.y = (int) Math.round(entity.posY); @@ -103,6 +118,10 @@ public class Vect implements IVect { return new int[]{x, y, z}; } + public Vect multiply(int factor) { + return new Vect(x * factor, y * factor, z * factor); + } + public Vect multiply(float factor) { return new Vect(Math.round(x * factor), Math.round(y * factor), Math.round(z * factor)); } diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 4d798135d..783a8fadc 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -16,8 +16,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmLogic; @@ -59,8 +57,7 @@ public abstract class FarmLogic implements IFarmLogic { } protected final Vect translateWithOffset(int x, int y, int z, FarmDirection farmDirection, int step) { - ForgeDirection direction = farmDirection.getForgeDirection(); - return new Vect(x + direction.offsetX * step, y + direction.offsetY * step, z + direction.offsetZ * step); + return new Vect(farmDirection.getForgeDirection()).multiply(step).add(x, y, z); } protected final void setBlock(Vect position, Block block, int meta) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index ab3b265c5..dd68e8285 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -199,7 +199,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { for (int i = -1; i < 2; i++) { for (int j = yOffset; j < 2; j++) { for (int k = -1; k < 2; k++) { - Vect candidate = new Vect(position.x + i, position.y + j, position.z + k); + Vect candidate = position.add(i, j, k); if (candidate.equals(position)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 841b20e4e..7f3804887 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -200,7 +200,7 @@ public class FarmLogicCocoa extends FarmLogic { for (int i = -1; i < 2; i++) { for (int j = 0; j < 2; j++) { for (int k = -1; k < 2; k++) { - Vect candidate = new Vect(position.x + i, position.y + j, position.z + k); + Vect candidate = position.add(i, j, k); if (candidate.equals(position)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index b392fbd97..29ba8df8d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -158,7 +158,7 @@ public class FarmLogicOrchard extends FarmLogic { for (int i = -2; i < 3; i++) { for (int j = 0; j < 2; j++) { for (int k = -1; k < 2; k++) { - Vect candidate = new Vect(position.x + i, position.y + j, position.z + k); + Vect candidate = position.add(i, j, k); if (Math.abs(candidate.x - start.x) > 5) { continue; }