mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 21:19:56 +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
@@ -18,13 +18,13 @@ public enum GeneticLiquid implements IFluidType {
|
||||
protected String name;
|
||||
protected String ident;
|
||||
protected IIcon icon;
|
||||
protected int colour;
|
||||
protected int color;
|
||||
protected float transparency;
|
||||
|
||||
GeneticLiquid(String name, String ident, int colour) {
|
||||
GeneticLiquid(String name, String ident, int color) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
this.color = color;
|
||||
transparency = 1.0f;
|
||||
}
|
||||
|
||||
@@ -54,13 +54,13 @@ public enum GeneticLiquid implements IFluidType {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getContainerColour() {
|
||||
return colour;
|
||||
return color;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -75,7 +75,8 @@ public enum GeneticLiquid implements IFluidType {
|
||||
|
||||
@Override
|
||||
public boolean canPlaceIn(FluidContainer container) {
|
||||
return this == GeneticLiquid.GrowthMedium || container == FluidContainer.Cylinder;
|
||||
return this == GeneticLiquid.GrowthMedium
|
||||
|| container == FluidContainer.Cylinder;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -33,35 +33,37 @@ public class ItemDatabase extends Item {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIconFromDamage(int par1) {
|
||||
return (par1 == 0) ? itemIcon : iconMaster;
|
||||
public IIcon getIconFromDamage(int damage) {
|
||||
return (damage == 0) ? itemIcon : iconMaster;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
super.addInformation(stack, player, tooltip, advanced);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
super.getSubItems(par1, par2CreativeTabs, par3List);
|
||||
par3List.add(new ItemStack(par1, 1, 1));
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
super.getSubItems(item, tab, list);
|
||||
list.add(new ItemStack(item, 1, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
if (itemstack.getItemDamage() == 0) {
|
||||
public ItemStack onItemRightClick(ItemStack itemststackck, World world, EntityPlayer player) {
|
||||
if (itemststackck.getItemDamage() == 0) {
|
||||
Genetics.proxy.openGui(GeneticsGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
} else {
|
||||
Genetics.proxy.openGui(GeneticsGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
}
|
||||
return itemstack;
|
||||
return itemststackck;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack i) {
|
||||
return (i.getItemDamage() == 0) ? "Gene Database" : "Master Gene Database";
|
||||
public String getItemStackDisplayName(ItemStack stack) {
|
||||
return (stack.getItemDamage() == 0) ?
|
||||
"Gene Database" :
|
||||
"Master Gene Database";
|
||||
}
|
||||
}
|
||||
@@ -70,19 +70,19 @@ public abstract class ItemGene extends Item {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer entityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemstack, entityPlayer, list, par4);
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
super.addInformation(itemstack, player, tooltip, advanced);
|
||||
int damage = getMaxDamage() - itemstack.getItemDamage();
|
||||
if (damage == 0) {
|
||||
list.add("Empty");
|
||||
tooltip.add("Empty");
|
||||
} else if (damage == 1) {
|
||||
list.add("1 Charge");
|
||||
tooltip.add("1 Charge");
|
||||
} else {
|
||||
list.add(damage + " Charges");
|
||||
tooltip.add(damage + " Charges");
|
||||
}
|
||||
|
||||
IGeneItem gene = getGeneItem(itemstack);
|
||||
gene.getInfo(list);
|
||||
gene.getInfo(tooltip);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -25,9 +25,9 @@ public class ItemMasterRegistry extends Item {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
|
||||
Genetics.proxy.openGui(GeneticsGUI.MasterRegistry, player, (int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
return itemstack;
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -25,9 +25,9 @@ public class ItemRegistry extends Item {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
|
||||
Genetics.proxy.openGui(GeneticsGUI.Registry, player, (int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
return itemstack;
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -43,8 +43,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack itemstack) {
|
||||
GeneItem gene = new GeneItem(itemstack);
|
||||
public String getItemStackDisplayName(ItemStack stack) {
|
||||
GeneItem gene = new GeneItem(stack);
|
||||
if (gene.isCorrupted()) {
|
||||
return "Corrupted Sequence";
|
||||
}
|
||||
@@ -53,27 +53,27 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer entityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemstack, entityPlayer, list, par4);
|
||||
list.add(Genetics.proxy.localise("item.sequence." + (5 - itemstack.getItemDamage() % 6)));
|
||||
SequencerItem gene = new SequencerItem(itemstack);
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
super.addInformation(stack, player, tooltip, advanced);
|
||||
tooltip.add(Genetics.proxy.localise("item.sequence." + (5 - stack.getItemDamage() % 6)));
|
||||
SequencerItem gene = new SequencerItem(stack);
|
||||
if (gene.isCorrupted()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (gene.analysed) {
|
||||
gene.getInfo(list);
|
||||
gene.getInfo(tooltip);
|
||||
} else {
|
||||
list.add("<Unknown>");
|
||||
tooltip.add("<Unknown>");
|
||||
}
|
||||
|
||||
int seq = gene.sequenced;
|
||||
if (seq == 0) {
|
||||
list.add("Unsequenced");
|
||||
tooltip.add("Unsequenced");
|
||||
} else if (seq < 100) {
|
||||
list.add("Partially Sequenced (" + seq + "%)");
|
||||
tooltip.add("Partially Sequenced (" + seq + "%)");
|
||||
} else {
|
||||
list.add("Fully Sequenced");
|
||||
tooltip.add("Fully Sequenced");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,9 +84,9 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List itemList) {
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows");
|
||||
itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false));
|
||||
list.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -37,8 +37,8 @@ public class ItemSerum extends ItemGene implements IItemSerum {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer entityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemstack, entityPlayer, list, par4);
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
super.addInformation(itemstack, player, tooltip, advanced);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -47,7 +47,7 @@ public class ItemSerum extends ItemGene implements IItemSerum {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(Item par1, CreativeTabs tab, List itemList) {
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
|
||||
Map<IChromosomeType, List<IAllele>> chromosomeMap = Binnie.Genetics.getChromosomeMap(root);
|
||||
for (Map.Entry<IChromosomeType, List<IAllele>> entry : chromosomeMap.entrySet()) {
|
||||
@@ -58,10 +58,10 @@ public class ItemSerum extends ItemGene implements IItemSerum {
|
||||
continue;
|
||||
}
|
||||
|
||||
IGeneItem item = new GeneItem(gene);
|
||||
IGeneItem geneItem = new GeneItem(gene);
|
||||
ItemStack stack = new ItemStack(this);
|
||||
item.writeToItem(stack);
|
||||
itemList.add(stack);
|
||||
geneItem.writeToItem(stack);
|
||||
list.add(stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,8 +39,8 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer entityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemstack, entityPlayer, list, par4);
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
super.addInformation(stack, player, tooltip, advanced);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,14 +69,14 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(Item par1, CreativeTabs tab, List itemList) {
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
|
||||
for (IIndividual template : root.getIndividualTemplates()) {
|
||||
if (template.getGenome().getPrimary().isSecret()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
IGeneItem item = new GeneArrayItem();
|
||||
IGeneItem geneItem = new GeneArrayItem();
|
||||
for (IChromosomeType type : root.getKaryotype()) {
|
||||
IChromosome c = template.getGenome().getChromosomes()[type.ordinal()];
|
||||
if (c == null) {
|
||||
@@ -85,13 +85,13 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
|
||||
|
||||
IAllele active = c.getActiveAllele();
|
||||
if (active != null) {
|
||||
item.addGene(new Gene(active, type, root));
|
||||
geneItem.addGene(new Gene(active, type, root));
|
||||
}
|
||||
}
|
||||
|
||||
ItemStack array = new ItemStack(this);
|
||||
item.writeToItem(array);
|
||||
itemList.add(array);
|
||||
geneItem.writeToItem(array);
|
||||
list.add(array);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,12 @@ public class ModuleItem implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5));
|
||||
GameRegistry.addShapelessRecipe(
|
||||
GeneticsItems.DNADye.get(8),
|
||||
Items.glowstone_dust,
|
||||
new ItemStack(Items.dye, 1, 5)
|
||||
);
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.LaboratoryCasing.get(1),
|
||||
new Object[]{
|
||||
@@ -80,6 +85,7 @@ public class ModuleItem implements IInitializable {
|
||||
'Y', Mods.Forestry.item("sturdyMachine")
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(
|
||||
GeneticsItems.DNADye.get(2),
|
||||
new Object[]{
|
||||
@@ -88,6 +94,7 @@ public class ModuleItem implements IInitializable {
|
||||
"dyePink"
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(
|
||||
GeneticsItems.FluorescentDye.get(2),
|
||||
new Object[]{
|
||||
@@ -96,6 +103,7 @@ public class ModuleItem implements IInitializable {
|
||||
"dustGlowstone"
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(
|
||||
GeneticsItems.GrowthMedium.get(2),
|
||||
new Object[]{
|
||||
@@ -103,6 +111,7 @@ public class ModuleItem implements IInitializable {
|
||||
Items.sugar
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.EmptySequencer.get(1),
|
||||
new Object[]{
|
||||
@@ -112,6 +121,7 @@ public class ModuleItem implements IInitializable {
|
||||
'p', Items.paper
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.EmptySerum.get(1),
|
||||
new Object[]{
|
||||
@@ -120,6 +130,7 @@ public class ModuleItem implements IInitializable {
|
||||
'G', Blocks.glass_pane
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.EmptyGenome.get(1),
|
||||
new Object[]{
|
||||
@@ -127,6 +138,7 @@ public class ModuleItem implements IInitializable {
|
||||
's', GeneticsItems.EmptySerum.get(1)
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.Cylinder.get(8),
|
||||
new Object[]{
|
||||
@@ -134,6 +146,7 @@ public class ModuleItem implements IInitializable {
|
||||
'g', Blocks.glass_pane
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.IntegratedCircuit.get(1),
|
||||
new Object[]{
|
||||
@@ -143,6 +156,7 @@ public class ModuleItem implements IInitializable {
|
||||
'g', "dustGlowstone"
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.IntegratedCircuit.get(1),
|
||||
new Object[]{
|
||||
@@ -160,6 +174,7 @@ public class ModuleItem implements IInitializable {
|
||||
'd', GeneticsItems.LaboratoryCasing.get(1)
|
||||
}
|
||||
));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticsItems.IntegratedCPU.get(1),
|
||||
new Object[]{
|
||||
@@ -168,6 +183,7 @@ public class ModuleItem implements IInitializable {
|
||||
'd', Items.diamond
|
||||
}
|
||||
));
|
||||
|
||||
RecipeManagers.carpenterManager.addRecipe(
|
||||
100,
|
||||
Binnie.Liquid.getLiquidStack("water", 2000),
|
||||
@@ -181,6 +197,7 @@ public class ModuleItem implements IInitializable {
|
||||
'D', Items.ender_eye,
|
||||
'E', Blocks.obsidian
|
||||
);
|
||||
|
||||
GameRegistry.addSmelting(Genetics.itemSequencer, GeneticsItems.EmptySequencer.get(1), 0.0f);
|
||||
GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(1), 0.0f);
|
||||
GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(1), 0.0f);
|
||||
|
||||
Reference in new issue
Block a user