mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 21:19:56 +00:00
Feature/refactoring (#96)
* Some refactoring * Added some localization * Added some localization
This commit is contained in:
1 parent
895dd048f1
commit
286137a4d3
29 files changed
+518
-505
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package binnie.core.liquid;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extratrees.alcohol.AlcoholEffect;
|
||||
import binnie.extratrees.alcohol.drink.DrinkManager;
|
||||
import binnie.extratrees.alcohol.drink.IDrinkLiquid;
|
||||
@@ -31,8 +33,8 @@ public class ItemFluidContainer extends ItemFood {
|
||||
public static int LiquidLiqueuer = 640;
|
||||
public static int LiquidGenetics = 768;
|
||||
|
||||
private static Map<Integer, String> idToFluid = new HashMap<Integer, String>();
|
||||
private static Map<String, Integer> fluidToID = new HashMap<String, Integer>();
|
||||
private static Map<Integer, String> idToFluid = new HashMap<>();
|
||||
private static Map<String, Integer> fluidToID = new HashMap<>();
|
||||
|
||||
public static void registerFluid(IFluidType fluid, int id) {
|
||||
ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase());
|
||||
@@ -61,14 +63,14 @@ public class ItemFluidContainer extends ItemFood {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack itemstack) {
|
||||
if (itemstack == null) {
|
||||
public String getItemStackDisplayName(ItemStack stack) {
|
||||
if (stack == null) {
|
||||
return "???";
|
||||
}
|
||||
|
||||
FluidStack fluid = getLiquid(itemstack);
|
||||
FluidStack fluid = getLiquid(stack);
|
||||
if (fluid == null) {
|
||||
return "Missing Fluid";
|
||||
return I18N.localise(BinnieCore.instance, "item.fluidContainer.missed");
|
||||
}
|
||||
return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName();
|
||||
}
|
||||
@@ -101,7 +103,7 @@ public class ItemFluidContainer extends ItemFood {
|
||||
public int getColorFromItemStack(ItemStack item, int pass) {
|
||||
FluidStack fluid = getLiquid(item);
|
||||
if (fluid == null) {
|
||||
return 16777215;
|
||||
return 0xffffff;
|
||||
}
|
||||
if (pass == 0 && fluid.getFluid() instanceof BinnieFluid) {
|
||||
return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColor();
|
||||
@@ -154,7 +156,7 @@ public class ItemFluidContainer extends ItemFood {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int func_150905_g(ItemStack p_150905_1_) {
|
||||
public int func_150905_g(ItemStack stack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,11 +16,7 @@ public class ManagerLiquid extends ManagerBase {
|
||||
Map<String, IFluidType> fluids;
|
||||
|
||||
public ManagerLiquid() {
|
||||
fluids = new LinkedHashMap<String, IFluidType>();
|
||||
}
|
||||
|
||||
public Collection<IFluidType> getFluidTypes() {
|
||||
return fluids.values();
|
||||
fluids = new LinkedHashMap<>();
|
||||
}
|
||||
|
||||
public void createLiquids(IFluidType[] liquids, int startID) {
|
||||
@@ -71,8 +67,4 @@ public class ManagerLiquid extends ManagerBase {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public IFluidType getFluidType(String liquid) {
|
||||
return fluids.get(liquid.toLowerCase());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user