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

-68
View File
@@ -20,9 +20,6 @@ import mods.nei.NEI;
# DATABASES
# Genesis
NEI.overrideName(<BinnieCore:genesis>,"Генезис");
<BinnieCore:genesis>.addTooltip(format.darkGreen("Genesis"));
# Apiarist Database
NEI.overrideName(<ExtraBees:dictionary:0>,"База данных пчеловода");
<ExtraBees:dictionary:0>.addTooltip(format.darkGreen("Apiarist Database"));
@@ -57,71 +54,6 @@ NEI.overrideName(<Genetics:masterRegistry:0>,"Картотека мастера"
NEI.overrideName(<Genetics:analyst:0>,"Аналитик");
<Genetics:analyst:0>.addTooltip(format.darkGreen("Analyst"));
# Field Kit
NEI.overrideName(<BinnieCore:fieldKit:0>,"Полевая лаборатория");
<BinnieCore:fieldKit:0>.addTooltip(format.darkGreen("Field Kit"));
# Master Carpentry Hammer
NEI.overrideName(<ExtraTrees:durableHammer:0>,"Плотницкий молоток мастера");
<ExtraTrees:durableHammer:0>.addTooltip(format.darkGreen("Master Carpentry Hammer"));
# Carpentry Hammer
NEI.overrideName(<ExtraTrees:hammer:0>,"Плотницкий молоток");
<ExtraTrees:hammer:0>.addTooltip(format.darkGreen("Carpentry Hammer"));
# EXTRA TREES MISC
# Sawdust
NEI.overrideName(<ExtraTrees:misc:1>,"Опилки");
<ExtraTrees:misc:1>.addTooltip(format.darkGreen("Sawdust"));
# Bark
NEI.overrideName(<ExtraTrees:misc:2>,"Кора");
<ExtraTrees:misc:2>.addTooltip(format.darkGreen("Bark"));
# Proven Gear
NEI.overrideName(<ExtraTrees:misc:3>,"Проверенная шестерня");
<ExtraTrees:misc:3>.addTooltip(format.darkGreen("Proven Gear"));
# Wood Polish
NEI.overrideName(<ExtraTrees:misc:4>,"Полироль");
<ExtraTrees:misc:4>.addTooltip(format.darkGreen("Wood Polish"));
# Hops
NEI.overrideName(<ExtraTrees:misc:5>,"Хмель");
<ExtraTrees:misc:5>.addTooltip(format.darkGreen("Hops"));
# Yeast
NEI.overrideName(<ExtraTrees:misc:6>,"Дрожжи");
<ExtraTrees:misc:6>.addTooltip(format.darkGreen("Yeast"));
# Lager Yeast
NEI.overrideName(<ExtraTrees:misc:7>,"Пивоваренные дрожжи");
<ExtraTrees:misc:7>.addTooltip(format.darkGreen("Lager Yeast"));
# Wheat Grain
NEI.overrideName(<ExtraTrees:misc:8>,"Зёрна пшеницы");
<ExtraTrees:misc:8>.addTooltip(format.darkGreen("Wheat Grain"));
# Barley Grain
NEI.overrideName(<ExtraTrees:misc:9>,"Зёрна ячменя");
<ExtraTrees:misc:9>.addTooltip(format.darkGreen("Barley Grain"));
# Rye Grain
NEI.overrideName(<ExtraTrees:misc:10>,"Зёрна ржи");
<ExtraTrees:misc:10>.addTooltip(format.darkGreen("Rye Grain"));
# Corn Grain
NEI.overrideName(<ExtraTrees:misc:11>,"Зёрна кукурузы");
<ExtraTrees:misc:11>.addTooltip(format.darkGreen("Corn Grain"));
# Roasted Grain
NEI.overrideName(<ExtraTrees:misc:12>,"Зёрна жареные");
<ExtraTrees:misc:12>.addTooltip(format.darkGreen("Roasted Grain"));
# Glass Fittings
NEI.overrideName(<ExtraTrees:misc:13>,"Стеклянные фиттинги (детали)");
<ExtraTrees:misc:13>.addTooltip(format.darkGreen("Glass Fittings"));
# FLUIDS
NEI.overrideName(<BinnieCore:containerCan:128>,"Банка живицы");
@@ -8,7 +8,6 @@ import binnie.botany.api.EnumSoilType;
import binnie.botany.api.gardening.IBlockSoil;
import binnie.botany.flower.TileEntityFlower;
import binnie.botany.gardening.Gardening;
import binnie.core.Mods;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -161,26 +160,28 @@ public class GardenLogic extends FarmLogic {
private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) {
for (int i = 0; i < extent; ++i) {
Vect position = translateWithOffset(x, y, z, direction, i);
if (isAirBlock(position) || world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
if (isWaterBlock(position)) {
continue;
}
boolean isEnclosed = true;
if (world.isAirBlock(position.x + 1, position.y, position.z)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x - 1, position.y, position.z)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x, position.y, position.z + 1)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x, position.y, position.z - 1)) {
isEnclosed = false;
}
if (!isAirBlock(position) && !world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
continue;
}
isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
if (isEnclosed) {
return trySetWater(position);
}
if (isWaterBlock(position)) {
continue;
}
boolean isEnclosed = true;
if (world.isAirBlock(position.x + 1, position.y, position.z)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x - 1, position.y, position.z)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x, position.y, position.z + 1)) {
isEnclosed = false;
} else if (world.isAirBlock(position.x, position.y, position.z - 1)) {
isEnclosed = false;
}
isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
if (isEnclosed) {
return trySetWater(position);
}
}
return false;
@@ -367,12 +368,12 @@ public class GardenLogic extends FarmLogic {
return null;
}
public void setData(EnumMoisture moisture2, EnumAcidity acidity2, boolean isManual, boolean isFertilised, ItemStack icon2, String name2) {
moisture = moisture2;
acidity = acidity2;
public void setData(EnumMoisture moisture, EnumAcidity acidity, boolean isManual, boolean fertilised, ItemStack icon, String name) {
this.moisture = moisture;
this.acidity = acidity;
this.isManual = isManual;
fertilised = isFertilised;
icon = icon2;
name = name2;
this.fertilised = fertilised;
this.icon = icon;
this.name = name;
}
}
@@ -76,7 +76,7 @@ public class WindowFieldKit extends Window {
@Override
protected String getName() {
return "Field Kit";
return I18N.localise(BinnieCore.instance, "gui.fieldKit");
}
private void setupValidators() {
@@ -89,7 +89,7 @@ public class WindowFieldKit extends Window {
@Override
public String getTooltip() {
return "Individual";
return I18N.localise(BinnieCore.instance, "gui.tooltip.individual");
}
});
@@ -101,7 +101,7 @@ public class WindowFieldKit extends Window {
@Override
public String getTooltip() {
return "Paper";
return I18N.localise(BinnieCore.instance, "gui.tooltip.paper");
}
});
getWindowInventory().disableAutoDispense(1);
@@ -119,8 +119,8 @@ public class WindowFieldKit extends Window {
GlassControl = new ControlImage(this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett));
new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0);
new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1);
(text = new ControlText(this, new IPoint(232.0f, 13.0f), "Paper")).setColor(2236962);
(text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MiddleCenter)).setColor(2236962);
(text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise(BinnieCore.instance, "gui.tooltip.paper"))).setColor(0x222222);
(text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MiddleCenter)).setColor(0x222222);
chromo = new ControlChromosome(this, 150.0f, 24.0f);
addEventHandler(new EventValueChanged.Handler() {
@@ -230,7 +230,7 @@ public class WindowFieldKit extends Window {
if (item != null && !Analyser.isAnalysed(item)) {
if (getWindowInventory().getStackInSlot(1) == null) {
text.setValue("No Paper!");
text.setValue(I18N.localise(BinnieCore.instance, "gui.tooltip.noPaper"));
isAnalysing = false;
analyseProgress = 1.0f;
} else {
@@ -264,7 +264,7 @@ public class WindowFieldKit extends Window {
@Override
public String showInfoButton() {
return "The Field Kit analyses bees, trees, flowers and butterflies. All that is required is a piece of paper to jot notes";
return I18N.localise(BinnieCore.instance, "gui.fieldKit.info");
}
@Override
@@ -20,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlTabIcon;
import binnie.core.craftgui.window.Panel;
import binnie.core.genetics.BreedingSystem;
import binnie.core.genetics.Gene;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlGenesisOption;
import cpw.mods.fml.relauncher.Side;
import forestry.api.genetics.IAllele;
@@ -55,7 +56,7 @@ public class WindowGenesis extends Window {
@Override
protected String getName() {
return "Genesis";
return I18N.localise(BinnieCore.instance, "gui.genesis");
}
@Override
@@ -2,6 +2,7 @@ package binnie.core.item;
import binnie.core.BinnieCore;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
@@ -32,6 +33,6 @@ public class ItemGenesis extends Item {
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return "Genesis";
return I18N.localise(BinnieCore.instance, "item.genesis.name");
}
}
@@ -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());
}
}
@@ -1,7 +1,5 @@
package binnie.core.machines.inventory;
import net.minecraft.util.EnumChatFormatting;
enum AccessDirection {
Both,
In,
@@ -9,11 +7,13 @@ enum AccessDirection {
Neither;
boolean canInsert() {
return this == AccessDirection.Both || this == AccessDirection.In;
return this == AccessDirection.Both
|| this == AccessDirection.In;
}
boolean canExtract() {
return this == AccessDirection.Both || this == AccessDirection.Out;
return this == AccessDirection.Both
|| this == AccessDirection.Out;
}
boolean canAccess() {
@@ -57,32 +57,4 @@ enum AccessDirection {
}
return this;
}
public String getTextColour() {
switch (this) {
case Both:
return EnumChatFormatting.GREEN.toString();
case In:
return EnumChatFormatting.YELLOW.toString();
case Neither:
return EnumChatFormatting.RED.toString();
}
return EnumChatFormatting.AQUA.toString();
}
public int getShadeColour() {
switch (this) {
case Both:
return 0x5555ff55;
case In:
return 0x55ffff55;
case Neither:
return 0x55ff5555;
}
return 0x5555ffff;
}
}
@@ -48,10 +48,12 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
@Override
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
if (name.equals("slot-charges")) {
for (int i : charges.keySet()) {
charges.put(i, nbt.getShort("" + i) / 100.0f);
}
if (!name.equals("slot-charges")) {
return;
}
for (int i : charges.keySet()) {
charges.put(i, nbt.getShort("" + i) / 100.0f);
}
}
@@ -66,7 +68,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
@Override
public float getCharge(int slot) {
return charges.containsKey(slot) ? charges.get(slot) : 0.0f;
return charges.getOrDefault(slot, 0.0f);
}
@Override
@@ -63,15 +63,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
markDirty();
}
protected void transferItem(int indexFrom, int indexTo) {
if (inventory.containsKey(indexFrom) && inventory.containsKey(indexTo)) {
ItemStack newStack = inventory.get(indexFrom).getContent().copy();
inventory.get(indexFrom).setContent(null);
inventory.get(indexTo).setContent(newStack);
}
markDirty();
}
@Override
public String getInventoryName() {
return "";
@@ -158,7 +149,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
@Override
public InventorySlot[] getSlots(int[] indexes) {
List<InventorySlot> list = new ArrayList<InventorySlot>();
List<InventorySlot> list = new ArrayList<>();
for (int i : indexes) {
if (getSlot(i) != null) {
list.add(getSlot(i));
@@ -221,6 +212,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
slots.add(slot.getIndex());
}
}
int[] ids = new int[slots.size()];
for (int i = 0; i < slots.size(); ++i) {
ids[i] = slots.get(i);
@@ -29,10 +29,6 @@ public class ComponentInventoryTransfer extends MachineComponent {
transfers.add(new Storage(getMachine(), source, destination));
}
public void performTransfer(int source, int[] destination) {
new Storage(getMachine(), source, destination).transfer(getMachine().getInterface(IInventoryMachine.class));
}
@Override
public void onUpdate() {
for (Transfer transfer : transfers) {
@@ -50,12 +50,11 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
}
private int fill(int tankIndex, FluidStack resource, boolean doFill) {
if (!tanks.containsKey(tankIndex)) {
return 0;
}
if (!isLiquidValidForTank(resource, tankIndex)) {
if (!tanks.containsKey(tankIndex) ||
!isLiquidValidForTank(resource, tankIndex)) {
return 0;
}
TankSlot tank = tanks.get(tankIndex);
int filled = tank.getTank().fill(resource, doFill);
if (filled > 0) {
@@ -68,6 +67,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
if (!tanks.containsKey(tankIndex)) {
return null;
}
TankSlot tank = tanks.get(tankIndex);
FluidStack drained = tank.getTank().drain(maxDrain, doDrain);
if (drained != null) {
@@ -97,14 +97,16 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
@Override
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
if (nbttagcompound.hasKey("liquidTanks")) {
NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10);
for (int i = 0; i < tanksNBT.tagCount(); ++i) {
NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i);
int index = tankNBT.getInteger("index");
if (tanks.containsKey(index)) {
tanks.get(index).readFromNBT(tankNBT);
}
if (!nbttagcompound.hasKey("liquidTanks")) {
return;
}
NBTTagList tanksNBT = nbttagcompound.getTagList("liquidTanks", 10);
for (int i = 0; i < tanksNBT.tagCount(); ++i) {
NBTTagCompound tankNBT = tanksNBT.getCompoundTagAt(i);
int index = tankNBT.getInteger("index");
if (tanks.containsKey(index)) {
tanks.get(index).readFromNBT(tankNBT);
}
}
}
@@ -130,7 +132,8 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
@Override
public boolean isLiquidValidForTank(FluidStack liquid, int tank) {
TankSlot slot = getTankSlot(tank);
return slot != null && (slot.isValid(liquid) && !slot.isReadOnly());
return slot != null
&& (slot.isValid(liquid) && !slot.isReadOnly());
}
@Override
@@ -160,10 +163,10 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
int index = getTankIndexToDrain(from, null);
if (tanks.containsKey(index)) {
return drain(index, resource.amount, doDrain);
if (!tanks.containsKey(index)) {
return null;
}
return null;
return drain(index, resource.amount, doDrain);
}
@Override
@@ -33,6 +33,7 @@ public class InventorySlot extends BaseSlot<ItemStack> {
if (itemStack == null) {
return null;
}
if (itemStack.stackSize <= amount) {
ItemStack returnStack = itemStack.copy();
itemStack = null;
@@ -8,7 +8,10 @@ import java.util.Collection;
import java.util.EnumSet;
public class MachineSide {
public static final EnumSet<ForgeDirection> TOP_AND_BOTTOM = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN);
public static final EnumSet<ForgeDirection> TOP_AND_BOTTOM = EnumSet.of(
ForgeDirection.UP,
ForgeDirection.DOWN
);
public static final EnumSet<ForgeDirection> NONE = EnumSet.noneOf(ForgeDirection.class);
public static final EnumSet<ForgeDirection> SIDES = EnumSet.of(
ForgeDirection.NORTH,
@@ -30,18 +30,6 @@ class SidedAccess {
return getAccess(side).canExtract();
}
public boolean canAccess(ForgeDirection side) {
return getAccess(side).canAccess();
}
public boolean canChangeInsert() {
return !insertLocked;
}
public boolean canChangeExtract() {
return !extractLocked;
}
public void forbidInsertChange() {
insertLocked = true;
}
@@ -70,12 +58,6 @@ class SidedAccess {
return dirs;
}
public void setInsert(ForgeDirection side, boolean b) {
if (getAccess(side).canInsert() != b) {
accesses.put(side, getAccess(side).changeInsert(b));
}
}
public void setExtract(ForgeDirection side, boolean b) {
if (getAccess(side).canExtract() != b) {
accesses.put(side, getAccess(side).changeExtract(b));
@@ -8,9 +8,10 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidTank;
public class TankSlot extends BaseSlot<FluidStack> {
public static String NameJuice = "Juice Tank";
public static String NameWater = "Water Tank";
public static String NameCupboard = "Cupboard Slot";
public static final String NAME_JUICE = "Juice Tank";
public static final String NAME_WATER = "Water Tank";
public static final String NAME_CUPBOARD = "Cupboard Slot";
private FluidTank tank;
public TankSlot(int index, String name, int capacity) {
@@ -21,14 +21,14 @@ import java.util.List;
@Optional.Interface(iface = "binnie.core.machines.component.IBuildcraft.TriggerProvider", modid = "BuildCraft|Silicon")
public class ComponentPowerReceptor extends MachineComponent implements
IPoweredMachine,
IBuildcraft.TriggerProvider,
IInteraction.ChunkUnload,
IInteraction.Invalidation {
IPoweredMachine,
IBuildcraft.TriggerProvider,
IInteraction.ChunkUnload,
IInteraction.Invalidation {
public float previousPower;
public LinkedList<Float> inputs;
private boolean registeredToIC2EnergyNet;
float previousPower;
LinkedList<Float> inputs;
static int inputAverageTicks = 20;
private PowerInterface container;
public ComponentPowerReceptor(IMachine machine) {
@@ -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));
}
@@ -1,5 +1,7 @@
package binnie.extratrees.carpentry;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
@@ -383,7 +385,7 @@ public class DesignBlock {
public String getString() {
String type;
if (getPrimaryMaterial() != getSecondaryMaterial()) {
type = getPrimaryMaterial().getName() + " and " + getSecondaryMaterial().getName();
type = I18N.localise(ExtraTrees.instance, "block.tooltip.twoMaterials", getPrimaryMaterial().getName(), getSecondaryMaterial().getName());
} else {
type = getPrimaryMaterial().getName();
}
@@ -1,191 +1,188 @@
package binnie.extratrees.carpentry;
import binnie.extratrees.api.CarpentryManager;
import binnie.botany.Botany;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.ILayout;
import java.util.ArrayList;
import java.util.List;
public enum EnumDesign implements IDesign {
Blank("Blank"),
Octagon("Octagon"),
Diamond("Diamond"),
Ringed("Ringed"),
Squared("Squared"),
Multiply("Multiply"),
Halved("Halved"),
Striped("Striped"),
ThinStriped("Thin Striped"),
Chequered("Full Chequered"),
Tiled("Full Tiled"),
ChequeredB("Chequered"),
TiledB("Tiled"),
VeryThinCorner("Very Thin Cornered"),
ThinCorner("Thin Cornered"),
Corner("Cornered"),
ThickCorner("Thick Cornered"),
Edged("Edged"),
ThinEdged("Thin Edged"),
ThinBarred("Thin Barred"),
Barred("Barred"),
ThickBarred("Thick Barred"),
Diagonal("Diagonal"),
ThickDiagonal("Thick Diagonal"),
ThinSaltire("Thin Saltire"),
Saltire("Saltire"),
ThickSaltire("Thick Saltire"),
ThinCrossed("Thin Crossed"),
Crossed("Crossed"),
ThickCrossed("Thick Crossed"),
ThinTSection("Thin T Section"),
TSection("T Section"),
ThickTSection("Thick T Section"),
ThinBarredCorner("Thin Barred Corner"),
BarredCorner("Barred Corner"),
ThickBarredCorner("Thick Barred Corner"),
ThinStripedCorner("Thin Striped Corner"),
StripedCorner("Striped Corner"),
Emblem1("Emblem 1"),
Emblem2("Emblem 2"),
Emblem3("Emblem 3"),
Emblem4("Emblem 4"),
Emblem5("Emblem 5"),
LetterA("Letter A"),
LetterB("Letter B"),
LetterC("Letter C"),
LetterD("Letter D"),
LetterE("Letter E"),
LetterF("Letter F"),
LetterG("Letter G"),
LetterH("Letter H"),
LetterI("Letter I"),
LetterJ("Letter J"),
LetterK("Letter K"),
LetterL("Letter L"),
LetterM("Letter M"),
LetterN("Letter N"),
LetterO("Letter O"),
LetterP("Letter P"),
LetterQ("Letter Q"),
LetterR("Letter R"),
LetterS("Letter S"),
LetterT("Letter T"),
LetterU("Letter U"),
LetterV("Letter V"),
LetterW("Letter W"),
LetterX("Letter X"),
LetterY("Letter Y"),
LetterZ("Letter Z"),
ThinCurvedCrossed("Thin Curved Crossed"),
ThinCurvedBarredCorner("Thin Curved Barred Corner"),
CurvedBarredCorner("Curved Barred Corner"),
ThinCurvedCorner("Thin Curved Corner"),
CurvedCorner("Curved Corner"),
ThinCurvedTSection("Thin Curved T Section"),
CurvedTSection("Curved T Section"),
BarredEnd("Barred End"),
DiagonalCorner("Diagonal Corner"),
DiagonalTSection("Diagonal T Section"),
DiagonalCurvedCorner("Diagonal Curved Corner"),
DiagonalCurvedTSection("Diagonal Curved T Section"),
OrnateBarred("Ornate Barred"),
SplitBarred("Split Barred"),
SplitBarredCorner("Split Barred Corner"),
SplitBarredTSection("Split Barred T Section"),
SplitCrossed("Split Crossed"),
SplitBarredEnd("Split Barred End"),
OrnateThinBarred("Ornate Thin Barred"),
Circle("Circle"),
Plus("Plus"),
Creeper("Creeper"),
OrnateStripedCorner("Ornate Striped Corner"),
Test("Testing Block"),
DiagonalHalved("Diagonal Halved"),
Diagonal1Edged("Cornered Diagonal"),
Diagonal2Edged("Opposite Cornered Diagonal"),
ThickDiagonal1Edged("Thick Cornered Diagonal"),
ThinBarredEnd("Thin Barred End"),
ThickBarredEnd("Thick Barred End"),
OverlappedBarred("Overlapped Barred"),
OverlappedSplitBarred("Overlapped Split Barred");
Blank("blank"),
Octagon("octagon"),
Diamond("diamond"),
Ringed("ringed"),
Squared("squared"),
Multiply("multiply"),
Halved("halved"),
Striped("striped"),
ThinStriped("thinStriped"),
Chequered("fullChequered"),
Tiled("fullTiled"),
ChequeredB("chequered"),
TiledB("tiled"),
VeryThinCorner("veryThinCornered"),
ThinCorner("thinCornered"),
Corner("cornered"),
ThickCorner("thickCornered"),
Edged("edged"),
ThinEdged("thinEdged"),
ThinBarred("thinBarred"),
Barred("barred"),
ThickBarred("thickBarred"),
Diagonal("diagonal"),
ThickDiagonal("thickDiagonal"),
ThinSaltire("thinSaltire"),
Saltire("saltire"),
ThickSaltire("thickSaltire"),
ThinCrossed("thinCrossed"),
Crossed("crossed"),
ThickCrossed("thickCrossed"),
ThinTSection("thinTSection"),
TSection("tSection"),
ThickTSection("thickTSection"),
ThinBarredCorner("thinBarredCorner"),
BarredCorner("barredCorner"),
ThickBarredCorner("thickBarredCorner"),
ThinStripedCorner("thinStripedCorner"),
StripedCorner("stripedCorner"),
Emblem1("emblem1"),
Emblem2("emblem2"),
Emblem3("emblem3"),
Emblem4("emblem4"),
Emblem5("emblem5"),
LetterA("letterA"),
LetterB("letterB"),
LetterC("letterC"),
LetterD("letterD"),
LetterE("letterE"),
LetterF("letterF"),
LetterG("letterG"),
LetterH("letterH"),
LetterI("letterI"),
LetterJ("letterJ"),
LetterK("letterK"),
LetterL("letterL"),
LetterM("letterM"),
LetterN("letterN"),
LetterO("letterO"),
LetterP("letterP"),
LetterQ("letterQ"),
LetterR("letterR"),
LetterS("letterS"),
LetterT("letterT"),
LetterU("letterU"),
LetterV("letterV"),
LetterW("letterW"),
LetterX("letterX"),
LetterY("letterY"),
LetterZ("letterZ"),
ThinCurvedCrossed("thinCurvedCrossed"),
ThinCurvedBarredCorner("thinCurvedBarredCorner"),
CurvedBarredCorner("curvedBarredCorner"),
ThinCurvedCorner("thinCurvedCorner"),
CurvedCorner("curvedCorner"),
ThinCurvedTSection("thinCurvedTSection"),
CurvedTSection("curvedTSection"),
BarredEnd("barredEnd"),
DiagonalCorner("diagonalCorner"),
DiagonalTSection("diagonalTSection"),
DiagonalCurvedCorner("diagonalCurvedCorner"),
DiagonalCurvedTSection("diagonalCurvedTSection"),
OrnateBarred("ornateBarred"),
SplitBarred("splitBarred"),
SplitBarredCorner("splitBarredCorner"),
SplitBarredTSection("splitBarredTSection"),
SplitCrossed("splitCrossed"),
SplitBarredEnd("splitBarredEnd"),
OrnateThinBarred("ornateThinBarred"),
Circle("circle"),
Plus("plus"),
Creeper("creeper"),
OrnateStripedCorner("ornateStripedCorner"),
Test("testingBlock"),
DiagonalHalved("diagonalHalved"),
Diagonal1Edged("corneredDiagonal"),
Diagonal2Edged("oppositeCorneredDiagonal"),
ThickDiagonal1Edged("thickCorneredDiagonal"),
ThinBarredEnd("thinBarredEnd"),
ThickBarredEnd("thickBarredEnd"),
OverlappedBarred("overlappedBarred"),
OverlappedSplitBarred("overlappedSplitBarred");
static {
Category.Design.addDesign(EnumDesign.Blank);
Category.Design.addDesign(EnumDesign.Octagon);
Category.Design.addDesign(EnumDesign.Diamond);
Category.Design.addDesign(EnumDesign.Ringed);
Category.Design.addDesign(EnumDesign.Squared);
Category.Design.addDesign(EnumDesign.Multiply);
Category.Design.addDesign(EnumDesign.Plus);
Category.Design.addDesign(EnumDesign.Circle);
Category.Design.addDesign(EnumDesign.Emblem1);
Category.Design.addDesign(EnumDesign.Emblem2);
Category.Design.addDesign(EnumDesign.Emblem3);
Category.Design.addDesign(EnumDesign.Emblem4);
Category.Design.addDesign(EnumDesign.Emblem5);
Category.Design.addDesign(EnumDesign.Creeper);
Category.Stripes.addDesign(EnumDesign.Chequered);
Category.Stripes.addDesign(EnumDesign.ChequeredB);
Category.Stripes.addDesign(EnumDesign.Tiled);
Category.Stripes.addDesign(EnumDesign.TiledB);
Category.Stripes.addDesign(EnumDesign.Striped);
Category.Stripes.addDesign(EnumDesign.ThinStriped);
Category.Stripes.addDesign(EnumDesign.ThinStripedCorner);
Category.Stripes.addDesign(EnumDesign.StripedCorner);
Category.Stripes.addDesign(EnumDesign.OrnateStripedCorner);
Category.Edges.addDesign(EnumDesign.Halved);
Category.Edges.addDesign(EnumDesign.Corner);
Category.Edges.addDesign(EnumDesign.ThickCorner);
Category.Edges.addDesign(EnumDesign.Edged);
Category.Edges.addDesign(EnumDesign.ThinCorner);
Category.Edges.addDesign(EnumDesign.ThinEdged);
Category.Edges.addDesign(EnumDesign.VeryThinCorner);
Category.Edges.addDesign(EnumDesign.ThinCurvedCorner);
Category.Edges.addDesign(EnumDesign.CurvedCorner);
Category.Barred.addDesign(EnumDesign.ThinBarred);
Category.Barred.addDesign(EnumDesign.ThinBarredCorner);
Category.Barred.addDesign(EnumDesign.ThinTSection);
Category.Barred.addDesign(EnumDesign.ThinCrossed);
Category.Barred.addDesign(EnumDesign.ThinBarredEnd);
Category.Barred.addDesign(EnumDesign.OrnateThinBarred);
Category.Barred.addDesign(EnumDesign.Barred);
Category.Barred.addDesign(EnumDesign.BarredCorner);
Category.Barred.addDesign(EnumDesign.TSection);
Category.Barred.addDesign(EnumDesign.Crossed);
Category.Barred.addDesign(EnumDesign.BarredEnd);
Category.Barred.addDesign(EnumDesign.OverlappedBarred);
Category.Barred.addDesign(EnumDesign.OrnateBarred);
Category.Barred.addDesign(EnumDesign.ThickBarred);
Category.Barred.addDesign(EnumDesign.ThickBarredCorner);
Category.Barred.addDesign(EnumDesign.ThickTSection);
Category.Barred.addDesign(EnumDesign.ThickCrossed);
Category.Barred.addDesign(EnumDesign.ThickBarredEnd);
Category.Barred.addDesign(EnumDesign.ThinCurvedBarredCorner);
Category.Barred.addDesign(EnumDesign.CurvedBarredCorner);
Category.Barred.addDesign(EnumDesign.ThinCurvedTSection);
Category.Barred.addDesign(EnumDesign.CurvedTSection);
Category.Barred.addDesign(EnumDesign.ThinCurvedCrossed);
Category.Barred.addDesign(EnumDesign.SplitBarred);
Category.Barred.addDesign(EnumDesign.SplitBarredCorner);
Category.Barred.addDesign(EnumDesign.SplitBarredTSection);
Category.Barred.addDesign(EnumDesign.SplitCrossed);
Category.Barred.addDesign(EnumDesign.SplitBarredEnd);
Category.Barred.addDesign(EnumDesign.OverlappedSplitBarred);
Category.Diagonal.addDesign(EnumDesign.ThinSaltire);
Category.Diagonal.addDesign(EnumDesign.Diagonal);
Category.Diagonal.addDesign(EnumDesign.DiagonalCorner);
Category.Diagonal.addDesign(EnumDesign.DiagonalTSection);
Category.Diagonal.addDesign(EnumDesign.DiagonalCurvedCorner);
Category.Diagonal.addDesign(EnumDesign.DiagonalCurvedTSection);
Category.Diagonal.addDesign(EnumDesign.Saltire);
Category.Diagonal.addDesign(EnumDesign.ThickDiagonal);
Category.Diagonal.addDesign(EnumDesign.ThickSaltire);
Category.Diagonal.addDesign(EnumDesign.DiagonalHalved);
Category.Diagonal.addDesign(EnumDesign.Diagonal1Edged);
Category.Diagonal.addDesign(EnumDesign.Diagonal2Edged);
Category.Diagonal.addDesign(EnumDesign.ThickDiagonal1Edged);
EnumDesignCategory.Design.addDesign(EnumDesign.Blank);
EnumDesignCategory.Design.addDesign(EnumDesign.Octagon);
EnumDesignCategory.Design.addDesign(EnumDesign.Diamond);
EnumDesignCategory.Design.addDesign(EnumDesign.Ringed);
EnumDesignCategory.Design.addDesign(EnumDesign.Squared);
EnumDesignCategory.Design.addDesign(EnumDesign.Multiply);
EnumDesignCategory.Design.addDesign(EnumDesign.Plus);
EnumDesignCategory.Design.addDesign(EnumDesign.Circle);
EnumDesignCategory.Design.addDesign(EnumDesign.Emblem1);
EnumDesignCategory.Design.addDesign(EnumDesign.Emblem2);
EnumDesignCategory.Design.addDesign(EnumDesign.Emblem3);
EnumDesignCategory.Design.addDesign(EnumDesign.Emblem4);
EnumDesignCategory.Design.addDesign(EnumDesign.Emblem5);
EnumDesignCategory.Design.addDesign(EnumDesign.Creeper);
EnumDesignCategory.Stripes.addDesign(EnumDesign.Chequered);
EnumDesignCategory.Stripes.addDesign(EnumDesign.ChequeredB);
EnumDesignCategory.Stripes.addDesign(EnumDesign.Tiled);
EnumDesignCategory.Stripes.addDesign(EnumDesign.TiledB);
EnumDesignCategory.Stripes.addDesign(EnumDesign.Striped);
EnumDesignCategory.Stripes.addDesign(EnumDesign.ThinStriped);
EnumDesignCategory.Stripes.addDesign(EnumDesign.ThinStripedCorner);
EnumDesignCategory.Stripes.addDesign(EnumDesign.StripedCorner);
EnumDesignCategory.Stripes.addDesign(EnumDesign.OrnateStripedCorner);
EnumDesignCategory.Edges.addDesign(EnumDesign.Halved);
EnumDesignCategory.Edges.addDesign(EnumDesign.Corner);
EnumDesignCategory.Edges.addDesign(EnumDesign.ThickCorner);
EnumDesignCategory.Edges.addDesign(EnumDesign.Edged);
EnumDesignCategory.Edges.addDesign(EnumDesign.ThinCorner);
EnumDesignCategory.Edges.addDesign(EnumDesign.ThinEdged);
EnumDesignCategory.Edges.addDesign(EnumDesign.VeryThinCorner);
EnumDesignCategory.Edges.addDesign(EnumDesign.ThinCurvedCorner);
EnumDesignCategory.Edges.addDesign(EnumDesign.CurvedCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinBarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinTSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinCrossed);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinBarredEnd);
EnumDesignCategory.Barred.addDesign(EnumDesign.OrnateThinBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.Barred);
EnumDesignCategory.Barred.addDesign(EnumDesign.BarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.TSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.Crossed);
EnumDesignCategory.Barred.addDesign(EnumDesign.BarredEnd);
EnumDesignCategory.Barred.addDesign(EnumDesign.OverlappedBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.OrnateBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThickBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThickBarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThickTSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThickCrossed);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThickBarredEnd);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinCurvedBarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.CurvedBarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinCurvedTSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.CurvedTSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.ThinCurvedCrossed);
EnumDesignCategory.Barred.addDesign(EnumDesign.SplitBarred);
EnumDesignCategory.Barred.addDesign(EnumDesign.SplitBarredCorner);
EnumDesignCategory.Barred.addDesign(EnumDesign.SplitBarredTSection);
EnumDesignCategory.Barred.addDesign(EnumDesign.SplitCrossed);
EnumDesignCategory.Barred.addDesign(EnumDesign.SplitBarredEnd);
EnumDesignCategory.Barred.addDesign(EnumDesign.OverlappedSplitBarred);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.ThinSaltire);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.Diagonal);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.DiagonalCorner);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.DiagonalTSection);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.DiagonalCurvedCorner);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.DiagonalCurvedTSection);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.Saltire);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.ThickDiagonal);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.ThickSaltire);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.DiagonalHalved);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.Diagonal1Edged);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.Diagonal2Edged);
EnumDesignCategory.Diagonal.addDesign(EnumDesign.ThickDiagonal1Edged);
EnumDesign.Octagon.setAllPatterns(EnumPattern.Octagon.layout());
EnumDesign.Diamond.setAllPatterns(EnumPattern.Diamond.layout());
EnumDesign.Ringed.setAllPatterns(EnumPattern.Ringed.layout());
@@ -415,7 +412,7 @@ public enum EnumDesign implements IDesign {
@Override
public String getName() {
return name;
return I18N.localise(Botany.instance, "design." + name);
}
public void setName(String name) {
@@ -428,7 +425,8 @@ public enum EnumDesign implements IDesign {
}
public void setTopPattern(ILayout layout) {
setBottomPattern(topPattern = layout);
topPattern = layout;
setBottomPattern(layout);
}
@Override
@@ -475,42 +473,4 @@ public enum EnumDesign implements IDesign {
public void setWestPattern(ILayout layout) {
westPattern = layout;
}
enum Category implements IDesignCategory {
Design("Designs & Emblems"),
Stripes("Squares & Stripes"),
Edges("Edges"),
Barred("Bars"),
Letters("Letters"),
Diagonal("Diagonals");
protected String name;
protected List<IDesign> designs;
Category(String name) {
this.name = name;
designs = new ArrayList<>();
CarpentryManager.carpentryInterface.registerDesignCategory(this);
}
@Override
public String getName() {
return name;
}
@Override
public List<IDesign> getDesigns() {
return designs;
}
@Override
public void addDesign(IDesign design) {
designs.add(design);
}
@Override
public String getId() {
return toString().toLowerCase();
}
}
}
@@ -0,0 +1,48 @@
package binnie.extratrees.carpentry;
import binnie.botany.Botany;
import binnie.core.util.I18N;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import java.util.ArrayList;
import java.util.List;
public enum EnumDesignCategory implements IDesignCategory {
Design("designsEmblems"),
Stripes("squaresStripes"),
Edges("edges"),
Barred("bars"),
Letters("letters"),
Diagonal("diagonals");
protected String name;
protected List<IDesign> designs;
EnumDesignCategory(String name) {
this.name = name;
designs = new ArrayList<>();
CarpentryManager.carpentryInterface.registerDesignCategory(this);
}
@Override
public String getName() {
return I18N.localise(Botany.instance, "design.category." + name);
}
@Override
public List<IDesign> getDesigns() {
return designs;
}
@Override
public void addDesign(IDesign design) {
designs.add(design);
}
@Override
public String getId() {
return toString().toLowerCase();
}
}
@@ -1,6 +1,7 @@
package binnie.extratrees.item;
import binnie.core.item.IItemMisc;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
@@ -9,28 +10,28 @@ import net.minecraft.util.IIcon;
import java.util.List;
public enum ExtraTreeItems implements IItemMisc {
CarpentryHammer("Fake Hammer", "carpentryHammer"),
Sawdust("Sawdust", "sawdust"),
Bark("Bark", "bark"),
ProvenGear("Proven Gear", "provenGear"),
WoodWax("Wood Polish", "woodWax"),
Hops("Hops", "hops"),
Yeast("Yeast", "yeast"),
LagerYeast("Lager Yeast", "yeastLager"),
GrainWheat("Wheat Grain", "grainWheat"),
GrainBarley("Barley Grain", "grainBarley"),
GrainRye("Rye Grain", "grainRye"),
GrainCorn("Corn Grain", "grainCorn"),
GrainRoasted("Roasted Grain", "grainRoasted"),
GlassFitting("Glass Fittings", "glassFitting");
CarpentryHammer("carpentryHammer"),
Sawdust("sawdust"),
Bark("bark"),
ProvenGear("provenGear"),
WoodWax("woodWax"),
Hops("hops"),
Yeast("yeast"),
LagerYeast("yeastLager"),
GrainWheat("grainWheat"),
GrainBarley("grainBarley"),
GrainRye("grainRye"),
GrainCorn("grainCorn"),
GrainRoasted("grainRoasted"),
GlassFitting("glassFitting");
protected String name;
protected String iconPath;
protected IIcon icon;
ExtraTreeItems(String name, String iconPath) {
ExtraTreeItems(String name) {
this.name = name;
this.iconPath = iconPath;
this.iconPath = name;
}
@Override
@@ -50,7 +51,7 @@ public enum ExtraTreeItems implements IItemMisc {
@Override
public String getName(ItemStack itemStack) {
return name;
return I18N.localise(ExtraTrees.instance, "item." + name);
}
@Override
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IToolHammer;
import cpw.mods.fml.relauncher.Side;
@@ -31,8 +32,8 @@ public class ItemHammer extends Item implements IToolHammer {
@Override
public String getItemStackDisplayName(ItemStack i) {
return isDurableHammer ?
"Master Carpentry Hammer" :
"Carpentry Hammer";
I18N.localise(ExtraTrees.instance, "item.masterCarpentryHammer") :
I18N.localise(ExtraTrees.instance, "item.carpentryHammer");
}
@Override
@@ -188,6 +188,9 @@ binniecore.gui.breedingmessage.species=Species Discovered
binniecore.gui.breedingmessage.branch=Branch Discovered
binniecore.gui.breedingmessage.epithet=Epithet Gained
binniecore.item.genesis.name=Genesis
binniecore.item.fluidContainer.missed=Missed Fluid
binniecore.item.container.capsule=Capsule
binniecore.item.container.refractory=Capsule
binniecore.item.container.can=Can
@@ -213,6 +216,10 @@ binniecore.machine.storage.compartmentGold=Gold Compartment
< %1$s is the name of the pattern >
binniecore.gui.designer.pattern=%1$s Pattern
binniecore.gui.fieldKit=Field Kit
binniecore.gui.fieldKit.info=The Field Kit analyses bees, trees, flowers and butterflies. All that is required is a piece of paper to jot notes
binniecore.gui.genesis=Genesis
binniecore.gui.database.nodescription=No Description Provided.
binniecore.gui.database.mode.species=Species
binniecore.gui.database.mode.branches=Branches
@@ -245,7 +252,6 @@ binniecore.gui.database.energyCost.1=Energy Cost: %.2f RF / tick
binniecore.gui.temperature.short=Temp.
binniecore.gui.humidity.short=Humid.
binniecore.gui.tolerated=Tolerated
binniecore.gui.nottolerated=Not Tolerated
@@ -276,6 +282,9 @@ binniecore.gui.tooltip.tank.outputOnlyTank=Output Only Tank
binniecore.gui.tooltip.tank.acceptsAny=Accepts: Any Item
binniecore.gui.tooltip.tank.accepts=Accepts: %s
binniecore.gui.tooltip.individual=Individual
binniecore.gui.tooltip.paper=Paper
binniecore.gui.tooltip.noPaper=No Paper!
< Descriptions used for effects in the registry >
binniecore.allele.extrabees.effect.acid.desc=Dissolves stone and dirt
@@ -188,6 +188,9 @@ binniecore.gui.breedingmessage.species=Видов обнаружено
binniecore.gui.breedingmessage.branch=Семейств обнаружено
binniecore.gui.breedingmessage.epithet=Родов обнаружено
binniecore.item.genesis.name=Генезис
binniecore.item.fluidContainer.missed=Некорректная жидкость
binniecore.item.container.capsule=Капсула
binniecore.item.container.refractory=Капсула
binniecore.item.container.can=Банка
@@ -213,6 +216,10 @@ binniecore.machine.storage.compartmentGold=Золотой сундук
< %1$s is the name of the pattern >
binniecore.gui.designer.pattern=%1$s Pattern
binniecore.gui.fieldKit=Полевая лаборатория
binniecore.gui.fieldKit.info=Полевая лаборатория анализирует пчел, деревья, цветы и бабочек. Для работы требует бумагу
binniecore.gui.genesis=Генезис
binniecore.gui.database.nodescription=Нет описания
binniecore.gui.database.mode.species=Виды
binniecore.gui.database.mode.branches=Семейства
@@ -245,7 +252,6 @@ binniecore.gui.database.energyCost.1=Energy Cost: %.2f RF / tick
binniecore.gui.temperature.short=Темп.
binniecore.gui.humidity.short=Влаж.
binniecore.gui.tolerated=устойчив
binniecore.gui.nottolerated=неустойчив
@@ -276,6 +282,9 @@ binniecore.gui.tooltip.tank.outputOnlyTank=Отдающий бак
binniecore.gui.tooltip.tank.acceptsAny=Принимается: любой предмет
binniecore.gui.tooltip.tank.accepts=Принимается: %s
binniecore.gui.tooltip.individual=Образец
binniecore.gui.tooltip.paper=Бумага
binniecore.gui.tooltip.noPaper=Нет бумаги!
< Descriptions used for effects in the registry >
binniecore.allele.extrabees.effect.acid.desc=Растворяет камень и землю
@@ -13,6 +13,116 @@ botany.verticalCeramicBricks=Vertical Ceramic Bricks
botany.verticalStripedCeramicBricks=Vertical Striped Ceramic Bricks
botany.largeVerticalCeramicBricks=Large Vertical Ceramic Bricks
botany.design.blank=Blank
botany.design.octagon=Octagon
botany.design.diamond=Diamond
botany.design.ringed=Ringed
botany.design.squared=Squared
botany.design.multiply=Multiply
botany.design.halved=Halved
botany.design.striped=Striped
botany.design.thinStriped=Thin Striped
botany.design.fullChequered=Full Chequered
botany.design.fullTiled=Full Tiled
botany.design.chequered=Chequered
botany.design.tiled=Tiled
botany.design.veryThinCornered=Very Thin Cornered
botany.design.thinCornered=Thin Cornered
botany.design.cornered=Cornered
botany.design.thickCornered=Thick Cornered
botany.design.edged=Edged
botany.design.thinEdged=Thin Edged
botany.design.thinBarred=Thin Barred
botany.design.barred=Barred
botany.design.thickBarred=Thick Barred
botany.design.diagonal=Diagonal
botany.design.thickDiagonal=Thick Diagonal
botany.design.thinSaltire=Thin Saltire
botany.design.saltire=Saltire
botany.design.thickSaltire=Thick Saltire
botany.design.thinCrossed=Thin Crossed
botany.design.crossed=Crossed
botany.design.thickCrossed=Thick Crossed
botany.design.thinTSection=Thin T Section
botany.design.tSection=T Section
botany.design.thickTSection=Thick T Section
botany.design.thinBarredCorner=Thin Barred Corner
botany.design.barredCorner=Barred Corner
botany.design.thickBarredCorner=Thick Barred Corner
botany.design.thinStripedCorner=Thin Striped Corner
botany.design.stripedCorner=Striped Corner
botany.design.emblem1=Emblem 1
botany.design.emblem2=Emblem 2
botany.design.emblem3=Emblem 3
botany.design.emblem4=Emblem 4
botany.design.emblem5=Emblem 5
botany.design.letterA=Letter A
botany.design.letterB=Letter B
botany.design.letterC=Letter C
botany.design.letterD=Letter D
botany.design.letterE=Letter E
botany.design.letterF=Letter F
botany.design.letterG=Letter G
botany.design.letterH=Letter H
botany.design.letterI=Letter I
botany.design.letterJ=Letter J
botany.design.letterK=Letter K
botany.design.letterL=Letter L
botany.design.letterM=Letter M
botany.design.letterN=Letter N
botany.design.letterO=Letter O
botany.design.letterP=Letter P
botany.design.letterQ=Letter Q
botany.design.letterR=Letter R
botany.design.letterS=Letter S
botany.design.letterT=Letter T
botany.design.letterU=Letter U
botany.design.letterV=Letter V
botany.design.letterW=Letter W
botany.design.letterX=Letter X
botany.design.letterY=Letter Y
botany.design.letterZ=Letter Z
botany.design.thinCurvedCrossed=Thin Curved Crossed
botany.design.thinCurvedBarredCorner=Thin Curved Barred Corner
botany.design.curvedBarredCorner=Curved Barred Corner
botany.design.thinCurvedCorner=Thin Curved Corner
botany.design.curvedCorner=Curved Corner
botany.design.thinCurvedTSection=Thin Curved T Section
botany.design.curvedTSection=Curved T Section
botany.design.barredEnd=Barred End
botany.design.diagonalCorner=Diagonal Corner
botany.design.diagonalTSection=Diagonal T Section
botany.design.diagonalCurvedCorner=Diagonal Curved Corner
botany.design.diagonalCurvedTSection=Diagonal Curved T Section
botany.design.ornateBarred=Ornate Barred
botany.design.splitBarred=Split Barred
botany.design.splitBarredCorner=Split Barred Corner
botany.design.splitBarredTSection=Split Barred T Section
botany.design.splitCrossed=Split Crossed
botany.design.splitBarredEnd=Split Barred End
botany.design.ornateThinBarred=Ornate Thin Barred
botany.design.circle=Circle
botany.design.plus=Plus
botany.design.creeper=Creeper
botany.design.ornateStripedCorner=Ornate Striped Corner
botany.design.testingBlock=Testing Block
botany.design.diagonalHalved=Diagonal Halved
botany.design.corneredDiagonal=Cornered Diagonal
botany.design.oppositeCorneredDiagonal=Opposite Cornered Diagonal
botany.design.thickCorneredDiagonal=Thick Cornered Diagonal
botany.design.thinBarredEnd=Thin Barred End
botany.design.thickBarredEnd=Thick Barred End
botany.design.overlappedBarred=Overlapped Barred
botany.design.overlappedSplitBarred=Overlapped Split Barred
botany.design.category.designsEmblems=Designs & Emblems
botany.design.category.squaresStripes=Squares & Stripes
botany.design.category.edges=Edges
botany.design.category.bars=Bars
botany.design.category.letters=Letters
botany.design.category.diagonals=Diagonals
botany.ph.acid=Acidic
botany.ph.neutral=Neutral
botany.ph.alkaline=Alkaline
@@ -22,8 +22,6 @@ extratrees.machine.machine.glassworker.info=The Glassworker creates patterned st
extratrees.machine.machine.tileworker=Tileworker
extratrees.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles.
extratrees.block.planks.fir=Fir
extratrees.block.planks.cedar=Cedar
extratrees.block.planks.hemlock=Hemlock
@@ -101,8 +99,6 @@ extratrees.block.planks.ebxl.redwood=Redwood
extratrees.block.planks.ebxl.fir=Scottish Fir
extratrees.block.planks.ebxl.acacia=Excel Acacia
extratrees.block.planks.fir.desc=A good sturdy conifer wood.|Lumber Jack
extratrees.block.planks.cedar.desc=A red tinged softwood.|Lumber Jack
extratrees.block.planks.hemlock.desc=Hemlock gives a green hued conifer wood.|Lumber Jack
@@ -171,6 +167,9 @@ extratrees.block.planks.forestry.plum.desc=
extratrees.block.planks.forestry.maple.desc=
extratrees.block.planks.forestry.citrus.desc=
extratrees.block.tooltip.twoColors=%s and %s
extratrees.block.tooltip.twoMaterials=%s and %s
< %1$s is name of wood used for door >
extratrees.block.door.name=%1$s Wood Door
@@ -300,7 +299,21 @@ extratrees.species.starfruit.name=Starfruit
extratrees.species.candlenut.name=Candlenut
extratrees.species.dwarfhazel.name=Dwarf Hazel
extratrees.item.carpentryHammer=Master Carpentry Hammer
extratrees.item.masterCarpentryHammer=Carpentry Hammer
extratrees.item.sawdust=Sawdust
extratrees.item.bark=Bark
extratrees.item.provenGear=Proven Gear
extratrees.item.woodWax=Wood Polish
extratrees.item.hops=Hops
extratrees.item.yeast=Yeast
extratrees.item.yeastLager=Lager Yeast
extratrees.item.grainWheat=Wheat Grain
extratrees.item.grainBarley=Barley Grain
extratrees.item.grainRye=Rye Grain
extratrees.item.grainCorn=Corn Grain
extratrees.item.grainRoasted=Roasted Grain
extratrees.item.glassware.glassFitting=Glass Fittings
extratrees.item.food.apple=Apple
extratrees.item.food.crabapple=Crabapple
@@ -425,8 +438,6 @@ extratrees.fluid.alcohol.wheat=Fermented Wheat Mash
extratrees.fluid.alcohol.rye=Fermented Rye Mash
extratrees.fluid.alcohol.corn=Fermented Corn Mash
extratrees.gui.database.planks.use=Can make:
extratrees.gui.database.mode.fruit=Fruit
@@ -444,7 +455,6 @@ extratrees.gui.database.tab.branches.species=Species
extratrees.gui.database.tab.breeder.breeder=Breeder
extratrees.gui.database.tab.fruit.natural=Natural Trees
extratrees.gui.database.tab.fruit.natura.help=List of trees that naturally produce this fruit
extratrees.gui.database.tab.fruit.potential=Potential Trees
@@ -456,7 +466,6 @@ extratrees.gui.database.tab.planks.overview.help=Description and possible uses
extratrees.gui.database.tab.planks.natural=Natural Trees
extratrees.gui.database.tab.planks.natural.help=List of trees that produce logs that can be crafted into this plank
extratrees.gui.database.tab.butterfly.species.overview=Overview
extratrees.gui.database.tab.butterfly.species.classification=Classification
extratrees.gui.database.tab.butterfly.species.specimen=Specimen
@@ -104,8 +104,6 @@ extratrees.block.planks.ebxl.redwood=секвойи (ExtrabiomesXL)
extratrees.block.planks.ebxl.fir=шотландской пихты
extratrees.block.planks.ebxl.acacia=превосходной акации
extratrees.block.planks.fir.desc=Хорошая, крепкая хвойная древесина.|Лесоруб
extratrees.block.planks.cedar.desc=Красная древесина с оттенком хвойных пород.|Лесоруб
extratrees.block.planks.hemlock.desc=Древесина тсуги придаёт зелёный оттенок хвойной древесине.|Лесоруб
@@ -174,6 +172,9 @@ extratrees.block.planks.forestry.plum.desc=
extratrees.block.planks.forestry.maple.desc=
extratrees.block.planks.forestry.citrus.desc=
extratrees.block.tooltip.twoColors=%s и %s
extratrees.block.tooltip.twoMaterials=%s и %s
< %1$s is name of wood used for door >
extratrees.block.door.name=Дверь из %1$s
@@ -307,6 +308,21 @@ extratrees.species.starfruit.name=Карамбола
extratrees.species.candlenut.name=Лумбанг (свечное дерево)
extratrees.species.dwarfhazel.name=Лещина карликовая
extratrees.item.carpentryHammer=Плотницкий молоток
extratrees.item.masterCarpentryHammer=Плотницкий молоток мастера
extratrees.item.sawdust=Опилки
extratrees.item.bark=Кора
extratrees.item.provenGear=Проверенная шестерня
extratrees.item.woodWax=Полироль
extratrees.item.hops=Хмель
extratrees.item.yeast=Дрожжи
extratrees.item.yeastLager=Пивоваренные дрожжи
extratrees.item.wheat=Гранулы пшеницы
extratrees.item.barley=Зерна ячменя
extratrees.item.rye=Ржаное зерно
extratrees.item.corn=Зерна кукурузы
extratrees.item.roasted=Жареные зерна
extratrees.item.glassware.glassFitting=Glass Fittings
# ПРОДУКТЫ САДОВОДСТВА
extratrees.item.food.osangeosange=Плод маклюра
@@ -324,32 +340,25 @@ extratrees.item.food.almond=Миндаль
extratrees.item.food.apricot=Абрикос
extratrees.item.food.grapefruit=Грейпфрут
extratrees.item.food.peach=Персик
extratrees.item.food.satsuma=Мандарин уншиу
extratrees.item.food.buddhahand=Цитрон пальчатый
extratrees.item.food.citron=Цитрон
extratrees.item.food.fingerlime=Лайм пальчиковый
extratrees.item.food.keylime=Лайм дикий
extratrees.item.food.manderin=Мандарин
extratrees.item.food.nectarine=Нектарин
extratrees.item.food.pomelo=Помело
extratrees.item.food.tangerine=Танжерин
extratrees.item.food.pear=Груша
extratrees.item.food.sandpear=Груша грушелистная
extratrees.item.food.hazelnut=Фундук
extratrees.item.food.butternut=Орех серый
extratrees.item.food.beechnut=Буковый орешек
extratrees.item.food.pecan=Пекан обыкновенный
extratrees.item.food.banana=Банан
extratrees.item.food.redbanana=Банан красный
extratrees.item.food.plantain=Плантан
extratrees.item.food.brazilnut=Бразильский орех
extratrees.item.food.fig=Инжир
extratrees.item.food.acorn=Жёлудь
extratrees.item.food.elderberry=Бузина
@@ -358,9 +367,7 @@ extratrees.item.food.gingkonut=Семена Гинкго
extratrees.item.food.coffee=Кофейные зёрна
extratrees.item.food.osangeorange=Плод маклюра
extratrees.item.food.clove=Гвоздика (пряность)
extratrees.item.food.papayimar=Папайя
extratrees.item.food.blackcurrant=Смородина чёрная
extratrees.item.food.redcurrant=Смородина красная
extratrees.item.food.blackberry=Ежевика
@@ -370,7 +377,6 @@ extratrees.item.food.cranberry=Клюква
extratrees.item.food.juniper=Семяна Можжевельника
extratrees.item.food.gooseberry=Крыжовник
extratrees.item.food.goldenraspberry=Малина золотая
extratrees.item.food.coconut=Кокос
extratrees.item.food.cashew=Кешью
extratrees.item.food.avacado=Авокадо
@@ -382,7 +388,6 @@ extratrees.item.food.mango=Манго
extratrees.item.food.starfruit=Карамбола
extratrees.item.food.candlenut=Лумбанг
# Изделия из стекла
extratrees.item.glassware.beermug=Пивная кружка
extratrees.item.glassware.pint=Стеклянная пинта
@@ -446,8 +451,6 @@ extratrees.fluid.alcohol.wheat=пшеничный виски
extratrees.fluid.alcohol.rye=ржаной виски
extratrees.fluid.alcohol.corn=кукурузный виски
extratrees.gui.database.planks.use=Можно создать:
extratrees.gui.database.mode.fruit=Плод
@@ -465,7 +468,6 @@ extratrees.gui.database.tab.branches.species=Виды
extratrees.gui.database.tab.breeder.breeder=Селекция
extratrees.gui.database.tab.fruit.natural=Естественные деревья
extratrees.gui.database.tab.fruit.natura.help=список деревьев, на которых растёт этот плод
extratrees.gui.database.tab.fruit.potential=Потенциальные деревья
@@ -477,7 +479,6 @@ extratrees.gui.database.tab.planks.overview.help=Описание и возмо
extratrees.gui.database.tab.planks.natural=Естественные деревья
extratrees.gui.database.tab.planks.natural.help=Список деревьев, которые производят брёвна, дающие эти доски
extratrees.gui.database.tab.butterfly.species.overview=Обзор
extratrees.gui.database.tab.butterfly.species.classification=Классификация
extratrees.gui.database.tab.butterfly.species.specimen=Образец
@@ -22,8 +22,6 @@ extratrees.machine.machine.glassworker.info=玻璃作坊制造带图案的染色
extratrees.machine.machine.tileworker=瓷砖作坊
extratrees.machine.machine.tileworker.info=瓷砖作坊制造带图案的瓷砖.
extratrees.block.planks.fir=冷杉
extratrees.block.planks.cedar=雪松
extratrees.block.planks.hemlock=铁杉
@@ -101,8 +99,6 @@ extratrees.block.planks.ebxl.redwood=红木
extratrees.block.planks.ebxl.fir=苏格兰冷杉
extratrees.block.planks.ebxl.acacia=埃克希勒金合欢
extratrees.block.planks.fir.desc=一种很不错的松树,木质坚硬.|伐木工
extratrees.block.planks.cedar.desc=一种泛红的软木.|伐木工
extratrees.block.planks.hemlock.desc=铁杉赋予了其绿色的木质以坚韧.|伐木工
@@ -300,8 +296,6 @@ extratrees.species.starfruit.name=杨桃
extratrees.species.candlenut.name=石栗
extratrees.species.dwarfhazel.name=矮榛
extratrees.item.food.apple=苹果
extratrees.item.food.crabapple=海棠果
extratrees.item.food.orange=橙子
@@ -425,8 +419,6 @@ extratrees.fluid.alcohol.wheat=发酵小麦浆
extratrees.fluid.alcohol.rye=发酵黑麦浆
extratrees.fluid.alcohol.corn=发酵玉米浆
extratrees.gui.database.planks.use=能制作:
extratrees.gui.database.mode.fruit=果实
@@ -444,7 +436,6 @@ extratrees.gui.database.tab.branches.species=种
extratrees.gui.database.tab.breeder.breeder=杂交
extratrees.gui.database.tab.fruit.natural=可自然产出该果实的树种
extratrees.gui.database.tab.fruit.natura.help=该表中出现的树种,皆可自然产出此种果实.
extratrees.gui.database.tab.fruit.potential=潜在的可产出该果实的树种
@@ -456,7 +447,6 @@ extratrees.gui.database.tab.planks.overview.help=描述和可能用途
extratrees.gui.database.tab.planks.natural=可自然产出该木板的树种
extratrees.gui.database.tab.planks.natural.help=该表中出现的树种,其原木皆可加工为此种木板.
extratrees.gui.database.tab.butterfly.species.overview=概述
extratrees.gui.database.tab.butterfly.species.classification=科学分类
extratrees.gui.database.tab.butterfly.species.specimen=标本