[1.7.10] Some refactoring (#102)

* Some refactoring

* Some refactoring
Added some localization

* Added some localization
Fix wrong branch localization in page branch overview
Simplify some localization

* Simplify some localization

* Removed unused localize method

* Simplify some localization

* Removed proxy.localise method

* Simplify localization
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-06 21:43:47 -07:00
1 parent 81301c3bd2
commit 1ffaad9fcd
232 files changed
+1947 -2054

No files matched your search

@@ -1,6 +1,7 @@
package binnie.extrabees.genetics.effect;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.ExtraBeesFlowers;
import cofh.api.energy.IEnergyReceiver;
@@ -67,7 +68,8 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
protected static List<Birthday> birthdays;
static {
(ExtraBeesEffect.birthdays = new ArrayList<>()).add(new Birthday(3, 10, "Binnie"));
birthdays = new ArrayList<>();
birthdays.add(new Birthday(3, 10, "Binnie"));
}
public boolean combinable;
@@ -152,7 +154,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
@Override
public String getName() {
return ExtraBees.proxy.localise("effect." + name().toString().toLowerCase() + ".name");
return I18N.localise("extrabees.effect." + name().toLowerCase() + ".name");
}
@Override
@@ -161,33 +163,35 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
}
public void spawnMob(World world, int x, int y, int z, String name) {
if (anyPlayerInRange(world, x, y, z, 16)) {
double xOffset = x + world.rand.nextFloat();
double yOffset = y + world.rand.nextFloat();
double zOffset = z + world.rand.nextFloat();
world.spawnParticle("smoke", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0);
world.spawnParticle("flame", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0);
EntityLiving entity = (EntityLiving) EntityList.createEntityByName(name, world);
if (!anyPlayerInRange(world, x, y, z, 16)) {
return;
}
if (entity == null) {
return;
}
double xOffset = x + world.rand.nextFloat();
double yOffset = y + world.rand.nextFloat();
double zOffset = z + world.rand.nextFloat();
world.spawnParticle("smoke", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0);
world.spawnParticle("flame", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0);
EntityLiving entity = (EntityLiving) EntityList.createEntityByName(name, world);
int entityCount = world.getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(8.0, 4.0, 8.0)).size();
if (entityCount >= 6) {
return;
}
if (entity == null) {
return;
}
xOffset = x + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0;
yOffset = y + world.rand.nextInt(3) - 1;
zOffset = z + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0;
entity.setLocationAndAngles(xOffset, yOffset, zOffset, world.rand.nextFloat() * 360.0f, 0.0f);
int entityCount = world.getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(8.0, 4.0, 8.0)).size();
if (entityCount >= 6) {
return;
}
if (entity.getCanSpawnHere()) {
world.spawnEntityInWorld(entity);
world.playAuxSFX(2004, x, y, z, 0);
entity.spawnExplosionParticle();
}
xOffset = x + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0;
yOffset = y + world.rand.nextInt(3) - 1;
zOffset = z + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0;
entity.setLocationAndAngles(xOffset, yOffset, zOffset, world.rand.nextFloat() * 360.0f, 0.0f);
if (entity.getCanSpawnHere()) {
world.spawnEntityInWorld(entity);
world.playAuxSFX(2004, x, y, z, 0);
entity.spawnExplosionParticle();
}
}
@@ -521,7 +525,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
return;
}
if (ExtraBeesFlowers.SAPLING.isAcceptedFlower(world, null, x, y, z)) {
if (ExtraBeesFlowers.SAPLING.isAcceptedFlower(world, x, y, z)) {
ItemDye.applyBonemeal(new ItemStack(Blocks.dirt, 1), world, x, y, z, null);
}
}
@@ -531,7 +535,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
return;
}
if (ExtraBeesFlowers.FRUIT.isAcceptedFlower(world, null, x, y, z)) {
if (ExtraBeesFlowers.FRUIT.isAcceptedFlower(world, x, y, z)) {
ItemDye.applyBonemeal(new ItemStack(Blocks.dirt, 1), world, x, y, z, null);
}
}