mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-18 11:29:05 +00:00
Adding alternate localization scheme for moon phase sensitive mutations. Closes #54.
This commit is contained in:
1 parent
7e930f44be
commit
1c5d255f58
3 files changed
+29
-18
No files matched your search
@@ -493,7 +493,7 @@ public class BeeMutation implements IBeeMutation
|
||||
if (moonPhaseStart != moonPhaseEnd)
|
||||
{
|
||||
conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresPhase"),
|
||||
moonPhaseStart.getLocalizedName(), moonPhaseEnd.getLocalizedName()));
|
||||
moonPhaseStart.getLocalizedNameAlt(), moonPhaseEnd.getLocalizedNameAlt()));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -5,8 +5,7 @@ import net.minecraft.world.World;
|
||||
/**
|
||||
* Class to abstract the moon phase from the world time a bit.
|
||||
*/
|
||||
public enum MoonPhase
|
||||
{
|
||||
public enum MoonPhase {
|
||||
FULL("full"),
|
||||
WANING_GIBBOUS("gibbousWaning"),
|
||||
WANING_HALF("halfWaning"),
|
||||
@@ -18,22 +17,18 @@ public enum MoonPhase
|
||||
|
||||
private String phaseName;
|
||||
|
||||
private MoonPhase(String name)
|
||||
{
|
||||
private MoonPhase(String name) {
|
||||
this.phaseName = name;
|
||||
}
|
||||
|
||||
public boolean isBetween(MoonPhase first, MoonPhase second)
|
||||
{
|
||||
public boolean isBetween(MoonPhase first, MoonPhase second) {
|
||||
boolean flag = false;
|
||||
|
||||
if (first.ordinal() <= second.ordinal())
|
||||
{
|
||||
if (first.ordinal() <= second.ordinal()) {
|
||||
// Straightforward.
|
||||
flag = first.ordinal() <= this.ordinal() && this.ordinal() <= second.ordinal();
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
// Wraps around the boundary.
|
||||
flag = (first.ordinal() <= this.ordinal() && this.ordinal() <= WAXING_GIBBOUS.ordinal()) ||
|
||||
(FULL.ordinal() <= this.ordinal() && this.ordinal() <= second.ordinal());
|
||||
@@ -42,18 +37,23 @@ public enum MoonPhase
|
||||
return flag;
|
||||
}
|
||||
|
||||
public String getLocalizedName()
|
||||
{
|
||||
public String getLocalizedName() {
|
||||
return LocalizationManager.getLocalizedString("moon." + this.phaseName);
|
||||
}
|
||||
|
||||
public String getLocalizedNameAlt() {
|
||||
String response = LocalizationManager.getLocalizedString("moon.alt." + this.phaseName);
|
||||
if (response.isEmpty()) {
|
||||
return getLocalizedName();
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
public static MoonPhase getMoonPhase(World w)
|
||||
{
|
||||
public static MoonPhase getMoonPhase(World w) {
|
||||
return getMoonPhaseFromTime(w.getWorldTime());
|
||||
}
|
||||
|
||||
public static MoonPhase getMoonPhaseFromTime(long time)
|
||||
{
|
||||
public static MoonPhase getMoonPhaseFromTime(long time) {
|
||||
return MoonPhase.values()[(int)((time - 6000) / 24000L) % 8];
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user