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:
Alexander Kornilov authored and marcin212 committed 2017-04-29 13:43:35 +02:00
1 parent b609d6688f
commit c09ad04284
95 files changed
+3916 -3900

No files matched your search

@@ -1,63 +1,58 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.liquids;
import binnie.core.liquid.FluidContainer;
import binnie.Binnie;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ILiquidType;
import binnie.extrabees.ExtraBees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import binnie.extrabees.ExtraBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import binnie.core.liquid.ILiquidType;
import net.minecraftforge.fluids.FluidStack;
public enum ExtraBeeLiquid implements ILiquidType
{
ACID("acid", 11528985),
POISON("poison", 15406315),
GLACIAL("liquidnitrogen", 9881800);
public enum ExtraBeeLiquid implements ILiquidType {
ACID("acid", 0xafeb19),
POISON("poison", 0xeb14eb),
GLACIAL("liquidnitrogen", 0x96c8c8);
String ident;
IIcon icon;
int colour;
protected String ident;
protected IIcon icon;
protected int colour;
private ExtraBeeLiquid(final String ident, final int colour) {
ExtraBeeLiquid(String ident, int colour) {
this.ident = ident;
this.colour = colour;
}
@Override
public IIcon getIcon() {
return this.icon;
return icon;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcon(final IIconRegister register) {
this.icon = ExtraBees.proxy.getIcon(register, "liquids/" + this.getIdentifier());
public void registerIcon(IIconRegister register) {
icon = ExtraBees.proxy.getIcon(register, "liquids/" + getIdentifier());
}
@Override
public String getName() {
return ExtraBees.proxy.localise(this.toString().toLowerCase());
return ExtraBees.proxy.localise(toString().toLowerCase());
}
@Override
public String getIdentifier() {
return this.ident;
return ident;
}
@Override
public int getColour() {
return 16777215;
public int getColor() {
return 0xffffff;
}
@Override
public FluidStack get(final int amount) {
return Binnie.Liquid.getLiquidStack(this.ident, amount);
public FluidStack get(int amount) {
return Binnie.Liquid.getLiquidStack(ident, amount);
}
@Override
@@ -66,17 +61,20 @@ public enum ExtraBeeLiquid implements ILiquidType
}
@Override
public boolean canPlaceIn(final FluidContainer container) {
public boolean canPlaceIn(FluidContainer container) {
return true;
}
@Override
public boolean showInCreative(final FluidContainer container) {
return container == FluidContainer.Bucket || container == FluidContainer.Can || container == FluidContainer.Capsule || container == FluidContainer.Refractory;
public boolean showInCreative(FluidContainer container) {
return container == FluidContainer.Bucket
|| container == FluidContainer.Can
|| container == FluidContainer.Capsule
|| container == FluidContainer.Refractory;
}
@Override
public int getContainerColour() {
return this.colour;
return colour;
}
}