mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Improve code readability in binnie.extrabees package and other packages
* Improve code readability in binnie.extrabees package and other packages * Fix compile error after refactoring
This commit is contained in:
1 parent
b609d6688f
commit
c09ad04284
95 files changed
+3916
-3900
No files matched your search
@@ -97,7 +97,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return this.colour;
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return this.getColour();
|
||||
return this.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -75,7 +75,7 @@ public enum Cocktail
|
||||
|
||||
public static void registerIngredient(final ICocktailIngredient ingredient) {
|
||||
Cocktail.cocktailIngredients.put(ingredient.getIdentifier().toLowerCase(), ingredient);
|
||||
DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV()));
|
||||
DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getName(), ingredient.getColor(), ingredient.getTransparency(), ingredient.getABV()));
|
||||
}
|
||||
|
||||
public static ICocktailIngredient getIngredient(final String name2) {
|
||||
|
||||
@@ -10,7 +10,7 @@ public interface ICocktailIngredient
|
||||
|
||||
String getIdentifier();
|
||||
|
||||
int getColour();
|
||||
int getColor();
|
||||
|
||||
int getTransparency();
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ public enum Juice implements IFluidType, ICocktailLiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return this.colour;
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ public enum Juice implements IFluidType, ICocktailLiquid
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return this.getColour();
|
||||
return this.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -90,7 +90,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return this.colour;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return this.getColour();
|
||||
return this.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -72,7 +72,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return this.colour;
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return this.getColour();
|
||||
return this.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -93,7 +93,7 @@ public enum Spirit implements IFluidType, ICocktailLiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return this.colour;
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ public enum Spirit implements IFluidType, ICocktailLiquid
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return this.getColour();
|
||||
return this.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -52,7 +52,7 @@ public enum ExtraTreeLiquid implements ILiquidType
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 16777215;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user