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,22 +1,17 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.apiary.machine;
import binnie.core.machines.MachineRendererBlock;
import net.minecraft.client.renderer.RenderBlocks;
import binnie.extrabees.apiary.TileExtraBeeAlveary;
import net.minecraft.tileentity.TileEntity;
import binnie.core.machines.IMachineType;
import binnie.core.machines.Machine;
import binnie.core.machines.MachinePackage;
import binnie.core.machines.MachineRendererBlock;
import binnie.core.resource.BinnieResource;
import binnie.extrabees.apiary.ModuleApiary;
import binnie.extrabees.apiary.TileExtraBeeAlveary;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack;
import binnie.core.machines.MachinePackage;
import binnie.core.machines.IMachineType;
import net.minecraft.tileentity.TileEntity;
public enum AlvearyMachine implements IMachineType
{
public enum AlvearyMachine implements IMachineType {
Mutator(AlvearyMutator.PackageAlvearyMutator.class),
Frame(AlvearyFrame.PackageAlvearyFrame.class),
RainShield(AlvearyRainShield.PackageAlvearyRainShield.class),
@@ -25,19 +20,19 @@ public enum AlvearyMachine implements IMachineType
Hatchery(AlvearyHatchery.PackageAlvearyHatchery.class),
Transmission(AlvearyTransmission.PackageAlvearyTransmission.class);
Class<? extends MachinePackage> clss;
protected Class<? extends MachinePackage> cls;
private AlvearyMachine(final Class<? extends MachinePackage> clss) {
this.clss = clss;
AlvearyMachine(Class<? extends MachinePackage> cls) {
this.cls = cls;
}
@Override
public Class<? extends MachinePackage> getPackageClass() {
return this.clss;
return cls;
}
public ItemStack get(final int size) {
return new ItemStack(ModuleApiary.blockComponent, size, this.ordinal());
public ItemStack get(int size) {
return new ItemStack(ModuleApiary.blockComponent, size, ordinal());
}
@Override
@@ -45,17 +40,17 @@ public enum AlvearyMachine implements IMachineType
return true;
}
public abstract static class AlvearyPackage extends MachinePackage
{
BinnieResource machineTexture;
public abstract static class AlvearyPackage extends MachinePackage {
protected BinnieResource machineTexture;
public AlvearyPackage(final String id, final BinnieResource machineTexture, final boolean powered) {
public AlvearyPackage(String id, BinnieResource machineTexture, boolean powered) {
super(id, powered);
this.machineTexture = machineTexture;
}
@Override
public void createMachine(final Machine machine) {
public void createMachine(Machine machine) {
// ignored
}
@Override
@@ -64,8 +59,8 @@ public enum AlvearyMachine implements IMachineType
}
@Override
public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) {
MachineRendererBlock.instance.renderMachine(this.machineTexture, x, y, z, partialTick);
public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
}
}
}