upstream/Binnie
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Binnie.git synced 2026-11-14 01:14:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some localization

Browse Source 
Move FieldKit to botany package
This commit is contained in:
kordum committed 2017-05-21 14:02:41 +03:00
1 parent a877002667
commit 3377ff8382
20 files changed
+87 -98
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/binnie/botany/core/BotanyTexture.java
-25
View File
@@ -1,25 +0,0 @@
package binnie.botany.core;
import binnie.Binnie;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.IBinnieTexture;
import binnie.core.resource.ResourceType;
import binnie.extrabees.ExtraBees;
// TODO unused class?
public enum BotanyTexture implements IBinnieTexture {
;
protected String texture;
protected ResourceType type;
BotanyTexture(ResourceType base, String texture) {
this.texture = texture;
type = base;
}
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(ExtraBees.instance, type, texture);
}
}
src/main/java/binnie/botany/craftgui/ControlColorMixItem.java
+1 -3
View File
@@ -3,8 +3,6 @@ package binnie.botany.craftgui;
import binnie.botany.api.IColourMix;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlOption;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.genetics.BreedingSystem;
public class ControlColorMixItem extends ControlOption<IColourMix> {
protected ControlColorDisplay itemWidget1;
@@ -20,7 +18,7 @@ public class ControlColorMixItem extends ControlOption<IColourMix> {
itemWidget3 = new ControlColorDisplay(this, 104.0f, 4.0f);
addSymbol = new ControlColourMixSymbol(this, 24, 4, 0);
arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1);
BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem();
if (getValue() != null) {
itemWidget1.setValue(getValue().getColor1());
itemWidget2.setValue(getValue().getColor2());
src/main/java/binnie/botany/flower/ItemInsulatedTube.java
-4
View File
@@ -24,10 +24,6 @@ public class ItemInsulatedTube extends Item {
setCreativeTab(CreativeTabBotany.instance);
}
public static String getInsulate(ItemStack stack) {
return Insulate.get(stack.getItemDamage()).getName();
}
public static ItemStack getInsulateStack(ItemStack stack) {
return Insulate.get(stack.getItemDamage()).getStack();
}
src/main/java/binnie/botany/gardening/BlockPlant.java
+7 -6
View File
@@ -4,6 +4,7 @@ import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumSoilType;
import binnie.botany.api.gardening.IBlockSoil;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -126,11 +127,11 @@ public class BlockPlant extends BlockBush {
}
public enum Type {
Weeds("Weeds"),
WeedsLong("Long Weeds"),
WeedsVeryLong("Very Long Weeds"),
DeadFlower("Dead Flower"),
DecayingFlower("Decaying Flower");
Weeds("weeds"),
WeedsLong("longWeeds"),
WeedsVeryLong("veryLongWeeds"),
DeadFlower("deadFlower"),
DecayingFlower("decayingFlower");
public IIcon icon;
@@ -149,7 +150,7 @@ public class BlockPlant extends BlockBush {
}
public String getName() {
return name;
return I18N.localise(Botany.instance, "plant." + name);
}
}
}
src/main/java/binnie/botany/gardening/BlockSoil.java
+1
View File
@@ -111,6 +111,7 @@ public class BlockSoil extends Block implements IBlockSoil {
if (desiredMoisture.ordinal() < moisture.ordinal()) {
moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
}
int meta2 = getMeta(acidity, moisture);
if (meta != meta2) {
world.setBlockMetadataWithNotify(x, y, z, meta2, 2);
src/main/java/binnie/botany/gardening/Gardening.java
+2 -5
View File
@@ -34,11 +34,8 @@ public class Gardening {
}
public static boolean isSoil(Item item) {
return item instanceof ItemBlock && isSoil(((ItemBlock) item).field_150939_a);
}
public static boolean isSoil(ItemStack item) {
return isSoil(item.getItem());
return item instanceof ItemBlock
&& isSoil(((ItemBlock) item).field_150939_a);
}
public static EnumMoisture getNaturalMoisture(World world, int x, int y, int z) {
src/main/java/binnie/botany/gardening/ItemSoil.java
+20 -7
View File
@@ -1,8 +1,10 @@
package binnie.botany.gardening;
import binnie.botany.Botany;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumMoisture;
import binnie.botany.api.EnumSoilType;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -12,9 +14,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import java.util.List;
import java.util.Locale;
public class ItemSoil extends ItemBlock {
EnumSoilType type;
protected EnumSoilType type;
private boolean noWeed;
public ItemSoil(Block block) {
@@ -33,24 +37,32 @@ public class ItemSoil extends ItemBlock {
String info = "";
if (moisture == EnumMoisture.DRY) {
info += EnumChatFormatting.YELLOW + "Dry" + EnumChatFormatting.RESET;
info += EnumChatFormatting.YELLOW
+ I18N.localise(Botany.instance, "moisture.dry")
+ EnumChatFormatting.RESET;
}
if (moisture == EnumMoisture.DAMP) {
info += EnumChatFormatting.YELLOW + "Damp" + EnumChatFormatting.RESET;
info += EnumChatFormatting.YELLOW
+ I18N.localise(Botany.instance, "moisture.damp")
+ EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.ACID) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.RED + "Acidic" + EnumChatFormatting.RESET;
info += EnumChatFormatting.YELLOW
+ I18N.localise(Botany.instance, "ph.acid")
+ EnumChatFormatting.RESET;
}
if (acidity == EnumAcidity.ALKALINE) {
if (info.length() > 0) {
info += ", ";
}
info += EnumChatFormatting.AQUA + "Alkaline" + EnumChatFormatting.RESET;
info += EnumChatFormatting.YELLOW
+ I18N.localise(Botany.instance, "ph.alkaline")
+ EnumChatFormatting.RESET;
}
if (info.length() > 0) {
@@ -58,13 +70,14 @@ public class ItemSoil extends ItemBlock {
}
if (noWeed) {
tooltip.add("Weedkiller");
tooltip.add(I18N.localise(Botany.instance, "soil.weedkiller"));
}
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return type.name().substring(0, 1) + type.name().toLowerCase().substring(1);
String soilName = type.name().toLowerCase(Locale.ENGLISH);
return I18N.localise(Botany.instance, "soil." + soilName);
}
@Override
src/main/java/binnie/botany/gardening/ItemTrowel.java
+2 -6
View File
@@ -30,8 +30,8 @@ public class ItemTrowel extends Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister p_94581_1_) {
itemIcon = Botany.proxy.getIcon(p_94581_1_, "tools/" + locName);
public void registerIcons(IIconRegister register) {
itemIcon = Botany.proxy.getIcon(register, "tools/" + locName);
}
@Override
@@ -64,8 +64,4 @@ public class ItemTrowel extends Item {
public boolean isFull3D() {
return true;
}
public String getToolMaterialName() {
return theToolMaterial.toString();
}
}
src/main/java/binnie/core/item/ItemFieldKit.java → src/main/java/binnie/botany/items/ItemFieldKit.java
+15 -9
View File
@@ -1,8 +1,10 @@
package binnie.core.item;
package binnie.botany.items;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
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 net.minecraft.client.renderer.texture.IIconRegister;
@@ -30,10 +32,10 @@ public class ItemFieldKit extends Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit");
fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1");
fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2");
fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3");
fieldKit0 = Botany.proxy.getIcon(register, "fieldKit");
fieldKit1 = Botany.proxy.getIcon(register, "fieldKit1");
fieldKit2 = Botany.proxy.getIcon(register, "fieldKit2");
fieldKit3 = Botany.proxy.getIcon(register, "fieldKit3");
itemIcon = fieldKit0;
}
@@ -65,15 +67,19 @@ public class ItemFieldKit extends Item {
public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) {
int i = getMaxDamage() - itemStack.getItemDamage();
if (i == 0) {
tooltip.add("No paper");
tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.noPaper"));
} else {
tooltip.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper");
if (i > 1) {
tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetsOfPaper", i));
} else {
tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetOfPaper", i));
}
}
super.addInformation(itemStack, player, tooltip, advanced);
}
@Override
public String getItemStackDisplayName(ItemStack p_77653_1_) {
return "Field Kit";
public String getItemStackDisplayName(ItemStack stack) {
return I18N.localise(Botany.instance, "item.fieldKit.name");
}
}
src/main/java/binnie/core/BinnieCore.java
+1 -1
View File
@@ -7,7 +7,7 @@ import binnie.core.craftgui.minecraft.ModuleCraftGUI;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.BinnieGUIHandler;
import binnie.core.gui.IBinnieGUID;
import binnie.core.item.ItemFieldKit;
import binnie.botany.items.ItemFieldKit;
import binnie.core.item.ItemGenesis;
import binnie.core.item.ModuleItems;
import binnie.core.liquid.FluidContainer;
src/main/java/binnie/core/genetics/BreedingSystem.java
+1 -1
View File
@@ -46,9 +46,9 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
protected BinnieIcon iconUndiscovered;
protected BinnieIcon iconDiscovered;
protected List<IAlleleSpecies> allActiveSpecies = new ArrayList<>();
private List<IClassification> allBranches = new ArrayList<>();
private List<IAlleleSpecies> allActiveSpecies = new ArrayList<>();
private List<IMutation> allMutations = new ArrayList<>();
private Map<IAlleleSpecies, List<IMutation>> resultantMutations = new HashMap<>();
private Map<IAlleleSpecies, List<IMutation>> furtherMutations = new HashMap<>();
src/main/java/binnie/core/item/ModuleItems.java
+1
View File
@@ -3,6 +3,7 @@ package binnie.core.item;
import binnie.botany.Botany;
import binnie.botany.api.IFlower;
import binnie.botany.flower.TileEntityFlower;
import binnie.botany.items.ItemFieldKit;
import binnie.botany.network.PacketID;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;