mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 21:19:56 +00:00
Some reformat code for 1.11.2 source (#84)
* Optimized imports * Some code reformat * Some refactoring and code reformat * Some code reformat
This commit is contained in:
1 parent
886c36a308
commit
c3809fbc27
508 files changed
+6677
-6238
No files matched your search
@@ -2,7 +2,13 @@ package binnie.botany.flower;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.api.*;
|
||||
import binnie.botany.api.EnumFlowerStage;
|
||||
import binnie.botany.api.EnumSoilType;
|
||||
import binnie.botany.api.IAlleleFlowerSpecies;
|
||||
import binnie.botany.api.IFlower;
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
import binnie.botany.api.IFlowerGenome;
|
||||
import binnie.botany.api.IFlowerType;
|
||||
import binnie.botany.core.BotanyCore;
|
||||
import binnie.botany.gardening.BlockPlant;
|
||||
import binnie.botany.gardening.Gardening;
|
||||
@@ -57,7 +63,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
this.matureTime = 0;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getUpdateTag() {
|
||||
updateRender(true);
|
||||
@@ -426,47 +431,47 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
}
|
||||
|
||||
public void spawnButterflies() {
|
||||
// if (!BinnieCore.isLepidopteryActive()) {
|
||||
// return;
|
||||
// }
|
||||
// final int x = this.xCoord;
|
||||
// final int y = this.yCoord;
|
||||
// final int z = this.zCoord;
|
||||
// final World world = this.worldObj;
|
||||
// if (this.getCaterpillar() != null) {
|
||||
// return;
|
||||
// }
|
||||
// if (world.rand.nextFloat() >= this.getFlower().getGenome().getSappiness()) {
|
||||
// return;
|
||||
// }
|
||||
// if (this.worldObj.rand.nextFloat() >= 0.2f) {
|
||||
// return;
|
||||
// }
|
||||
// final IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates().get(this.worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size()));
|
||||
// if (this.worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) {
|
||||
// return;
|
||||
// }
|
||||
// if (this.worldObj.countEntities(EntityButterfly.class) > 100) {
|
||||
// return;
|
||||
// }
|
||||
// if (!spawn.canSpawn(this.worldObj, x, y, z)) {
|
||||
// return;
|
||||
// }
|
||||
// if (world.isAirBlock(x, y + 1, z)) {
|
||||
// this.attemptButterflySpawn(world, spawn, x, y + 1, z);
|
||||
// }
|
||||
// else if (world.isAirBlock(x - 1, y, z)) {
|
||||
// this.attemptButterflySpawn(world, spawn, x - 1, y, z);
|
||||
// }
|
||||
// else if (world.isAirBlock(x + 1, y, z)) {
|
||||
// this.attemptButterflySpawn(world, spawn, x + 1, y, z);
|
||||
// }
|
||||
// else if (world.isAirBlock(x, y, z - 1)) {
|
||||
// this.attemptButterflySpawn(world, spawn, x, y, z - 1);
|
||||
// }
|
||||
// else if (world.isAirBlock(x, y, z + 1)) {
|
||||
// this.attemptButterflySpawn(world, spawn, x, y, z + 1);
|
||||
// }
|
||||
/*if (!BinnieCore.isLepidopteryActive()) {
|
||||
return;
|
||||
}
|
||||
final int x = this.xCoord;
|
||||
final int y = this.yCoord;
|
||||
final int z = this.zCoord;
|
||||
final World world = this.worldObj;
|
||||
if (this.getCaterpillar() != null) {
|
||||
return;
|
||||
}
|
||||
if (world.rand.nextFloat() >= this.getFlower().getGenome().getSappiness()) {
|
||||
return;
|
||||
}
|
||||
if (this.worldObj.rand.nextFloat() >= 0.2f) {
|
||||
return;
|
||||
}
|
||||
final IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates().get(this.worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size()));
|
||||
if (this.worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) {
|
||||
return;
|
||||
}
|
||||
if (this.worldObj.countEntities(EntityButterfly.class) > 100) {
|
||||
return;
|
||||
}
|
||||
if (!spawn.canSpawn(this.worldObj, x, y, z)) {
|
||||
return;
|
||||
}
|
||||
if (world.isAirBlock(x, y + 1, z)) {
|
||||
this.attemptButterflySpawn(world, spawn, x, y + 1, z);
|
||||
}
|
||||
else if (world.isAirBlock(x - 1, y, z)) {
|
||||
this.attemptButterflySpawn(world, spawn, x - 1, y, z);
|
||||
}
|
||||
else if (world.isAirBlock(x + 1, y, z)) {
|
||||
this.attemptButterflySpawn(world, spawn, x + 1, y, z);
|
||||
}
|
||||
else if (world.isAirBlock(x, y, z - 1)) {
|
||||
this.attemptButterflySpawn(world, spawn, x, y, z - 1);
|
||||
}
|
||||
else if (world.isAirBlock(x, y, z + 1)) {
|
||||
this.attemptButterflySpawn(world, spawn, x, y, z + 1);
|
||||
}*/
|
||||
}
|
||||
|
||||
private void attemptButterflySpawn(final World world, final IButterfly butterfly, final double x, final double y, final double z) {
|
||||
@@ -479,7 +484,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
return this.getOwner();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnumTemperature getTemperature() {
|
||||
return EnumTemperature.getFromValue(this.world.getBiome(getPos()).getTemperature());
|
||||
@@ -507,17 +511,17 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
return this.caterpillar;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIndividual getNanny() {
|
||||
return this.getFlower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCaterpillar(@Nullable final IButterfly butterfly) {
|
||||
this.caterpillar = butterfly;
|
||||
this.matureTime = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIndividual getNanny() {
|
||||
return this.getFlower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canNurse(final IButterfly butterfly) {
|
||||
return this.getFlower() != null && !this.getFlower().isWilted() && this.getFlower().getAge() > 1;
|
||||
@@ -597,14 +601,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
return this.getWorld().getBiome(getPos());
|
||||
}
|
||||
|
||||
public void setErrorState(final IErrorState state) {
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public IErrorState getErrorState() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public void setErrorState(final IErrorState state) {
|
||||
}
|
||||
|
||||
public boolean setErrorCondition(final boolean condition, final IErrorState errorState) {
|
||||
return false;
|
||||
}
|
||||
@@ -613,6 +617,21 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
return new HashSet<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPos getCoordinates() {
|
||||
return getPos();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPollinated() {
|
||||
return isBreeding();
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getWorldObj() {
|
||||
return world;
|
||||
}
|
||||
|
||||
public static class RenderInfo {
|
||||
public IFlowerColour primary;
|
||||
public IFlowerColour secondary;
|
||||
@@ -623,15 +642,6 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
public boolean flowered;
|
||||
public byte section;
|
||||
|
||||
@Override
|
||||
public boolean equals(final Object obj) {
|
||||
if (obj instanceof RenderInfo) {
|
||||
final RenderInfo o = (RenderInfo) obj;
|
||||
return o.age == this.age && o.wilted == this.wilted && o.flowered == this.flowered && o.primary == this.primary && o.secondary == this.secondary && o.stem == this.stem && o.type == this.type;
|
||||
}
|
||||
return super.equals(obj);
|
||||
}
|
||||
|
||||
public RenderInfo() {
|
||||
}
|
||||
|
||||
@@ -645,22 +655,14 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
|
||||
this.flowered = flower.hasFlowered();
|
||||
this.type = flower.getGenome().getType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(final Object obj) {
|
||||
if (obj instanceof RenderInfo) {
|
||||
final RenderInfo o = (RenderInfo) obj;
|
||||
return o.age == this.age && o.wilted == this.wilted && o.flowered == this.flowered && o.primary == this.primary && o.secondary == this.secondary && o.stem == this.stem && o.type == this.type;
|
||||
}
|
||||
return super.equals(obj);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPos getCoordinates() {
|
||||
return getPos();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPollinated() {
|
||||
return isBreeding();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public World getWorldObj() {
|
||||
return world;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user