Feature/refactoring (#96)

* Some refactoring

* Added some localization

* Added some localization
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-04 12:26:57 -07:00
1 parent 895dd048f1
commit 286137a4d3
29 files changed
+518 -505

No files matched your search

@@ -5,6 +5,8 @@ import binnie.core.block.BlockMetadata;
import binnie.core.block.IMultipassBlock;
import binnie.core.block.MultipassBlockRenderer;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignSystem;
@@ -133,22 +135,12 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
public void addBlockTooltip(ItemStack stack, List tooltip) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) {
tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName());
tooltip.add(I18N.localise(ExtraTrees.instance, "block.tooltip.twoColors", block.getPrimaryMaterial().getName(), block.getSecondaryMaterial().getName()));
} else {
tooltip.add(block.getPrimaryMaterial().getName());
}
}
public int primaryColor(int damage) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), damage);
return block.getPrimaryColour();
}
public int secondaryColor(int damage) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), damage);
return block.getSecondaryColour();
}
public ItemStack getItemStack(int plank1, int plank2, int design) {
return TileEntityMetadata.getItemStack(this, getMetadata(plank1, plank2, design));
}