Merge pull request #8 from GTNewHorizons/D-Cysteine-patch-1

Replacing jar with slightly fresher one

.gitignore

@@ -4,6 +4,7 @@
 /run
 /eclipse
 /out
+/bin
 /classes
 .idea
 *.iml

build.gradle

@@ -25,7 +25,7 @@ plugins {
 apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
 apply plugin: 'forge'
 
-version = "2.0.26"
+version = "2.0.30"
 if (System.getenv("BUILD_NUMBER") != null) {
     version = version + "." + System.getenv("BUILD_NUMBER")
 }

src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java

@@ -1,5 +1,6 @@
 package binnie.extrabees.genetics.requirements;
 
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
@@ -13,7 +14,7 @@ public class DummyMutationCondition implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		return 1.0F;
 	}
 

src/main/java/binnie/extratrees/block/decor/BlockFence.java

@@ -1,6 +1,5 @@
 package binnie.extratrees.block.decor;
 
-import binnie.core.Mods;
 import binnie.core.block.BlockMetadata;
 import binnie.core.block.IBlockMetadata;
 import binnie.core.block.TileEntityMetadata;
@@ -19,7 +18,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -41,15 +39,6 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 		setStepSound(Block.soundTypeWood);
 	}
 
-	public static boolean canConnect(Block block) {
-		return block == ((ItemBlock) Mods.forestry.item("fences")).field_150939_a
-			|| block == Blocks.fence
-			|| block == Blocks.fence_gate
-			|| block == Blocks.nether_brick_fence
-			|| block instanceof IBlockFence
-			|| block == ExtraTrees.blockGate;
-	}
-
 	@Override
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
 		for (IFenceProvider type : PlankType.ExtraTreePlanks.values()) {
@@ -146,16 +135,10 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 
 	@Override
 	public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) {
-		if (!isFence(world, x, y, z)) {
-			Block block = world.getBlock(x, y, z);
-			return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock();
-		}
-		return true;
-	}
-
-	public boolean isFence(IBlockAccess world, int x, int y, int z) {
 		Block block = world.getBlock(x, y, z);
-		return canConnect(block);
+		Material material = block.getMaterial();
+		return IBlockFence.isFence(block) && material == this.blockMaterial
+			|| material.isOpaque() && block.renderAsNormalBlock() && material != Material.gourd;
 	}
 
 	@Override
@@ -191,6 +174,13 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 	}
 
 	@Override
+	//@SideOnly(Side.CLIENT)
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		return BlockMetadata.getPickBlock(world, x, y, z);
+	}
+
+	@Override
+	//@SideOnly(Side.CLIENT)
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		return BlockMetadata.getPickBlock(world, x, y, z);
 	}

src/main/java/binnie/extratrees/block/decor/BlockGate.java

@@ -137,6 +137,13 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata {
 	}
 
 	@Override
+	//@SideOnly(Side.CLIENT)
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		return BlockMetadata.getPickBlock(world, x, y, z);
+	}
+
+	@Override
+	//@SideOnly(Side.CLIENT)
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		return BlockMetadata.getPickBlock(world, x, y, z);
 	}

src/main/java/binnie/extratrees/block/decor/BlockHedge.java

@@ -29,10 +29,6 @@ public class BlockHedge extends Block implements IBlockFence {
 		setBlockName("hedge");
 	}
 
-	public static boolean func_149825_a(Block block) {
-		return BlockFence.canConnect(block);
-	}
-
 	public static int getColor(int meta) {
 		LeafType type = LeafType.values()[meta % 6];
 		if (type == LeafType.CONIFER) {
@@ -130,11 +126,11 @@ public class BlockHedge extends Block implements IBlockFence {
 		return ModuleBlocks.hedgeRenderID;
 	}
 
+	@Override
 	public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) {
 		Block block = world.getBlock(x, y, z);
 		return block == this
-			|| block == Blocks.fence_gate
-			|| func_149825_a(block)
+			|| IBlockFence.isFence(block)
 			|| block.isLeaves(world, x, y, z)
 			|| (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd);
 	}

src/main/java/binnie/extratrees/block/decor/IBlockFence.java

@@ -1,4 +1,26 @@
 package binnie.extratrees.block.decor;
 
+import binnie.core.Mods;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFence;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.world.IBlockAccess;
+
 public interface IBlockFence {
+
+    /**
+     * Test if the specified block is a fence
+     *
+     * @param block the block to test
+     * @return {@code true} if the specified block is a fence
+     */
+    static boolean isFence(Block block) {
+        return block == ((ItemBlock) Mods.forestry.item("fences")).field_150939_a
+                || block instanceof BlockFence && block != Blocks.nether_brick_fence
+                || block instanceof BlockFenceGate;
+    }
+
+    boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z);
 }

src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java

@@ -1347,7 +1347,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
 		if (itemstack.getItem() == Mods.forestry.item("honeydew")) {
 			return 0.7f;
 		}
-		if (itemstack.getItem() == Mods.forestry.item("beeComb")) {
+		if (itemstack.getItem() == Mods.forestry.item("beeCombs")) {
 			return 0.4f;
 		}
 		if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {

src/main/resources/assets/botany/lang/zh_CN.lang

@@ -2,14 +2,14 @@ botany.tab.botany=Binnie|花卉
 
 botany.pigmentedGlass=染色玻璃
 botany.ceramicBlock=陶瓷块
-botany.ceramicTile=陶瓷瓦砖
+botany.ceramicTile=瓷砖
 botany.ceramicBricks=陶瓷砖块
 botany.strippedCeramicBricks=条纹陶瓷砖块
-botany.largeCeramicBricks=大型陶瓷瓦砖
-botany.splitCeramicTile=匀称陶瓷瓦砖
-botany.chequeredCeramicTile=方格陶瓷瓦砖
-botany.mixedCeramicTile=混合风格陶瓷瓦砖
-botany.verticalCeramicBricks=竖纹陶瓷瓦砖
+botany.largeCeramicBricks=大型瓷砖
+botany.splitCeramicTile=匀称瓷砖
+botany.chequeredCeramicTile=方格瓷砖
+botany.mixedCeramicTile=混合风格瓷砖
+botany.verticalCeramicBricks=竖纹瓷砖
 botany.verticalStripedCeramicBricks=竖状条纹陶瓷砖块
 botany.largeVerticalCeramicBricks=竖纹大型陶瓷砖块
 

src/main/resources/assets/extratrees/lang/zh_CN.lang

@@ -1,5 +1,7 @@
+##################################################
+## Machines
 
-extratrees.machine.kitchen.bar=Bar
+extratrees.machine.kitchen.bar=酒吧
 extratrees.machine.kitchen.bottleRack=瓶架
 
 extratrees.machine.machine.brewery=发酵器
@@ -93,7 +95,7 @@ extratrees.block.planks.forestry.ebony=乌檀树
 extratrees.block.planks.forestry.mahogany=桃心树
 extratrees.block.planks.forestry.balsa=巴尔杉树
 extratrees.block.planks.forestry.willow=柳树
-extratrees.block.planks.forestry.walnut=胡桃树
+extratrees.block.planks.forestry.walnut=核桃树
 extratrees.block.planks.forestry.greenheart=绿樟树
 extratrees.block.planks.forestry.cherry=樱树
 extratrees.block.planks.forestry.mahoe=高槿树
@@ -153,14 +155,17 @@ extratrees.block.planks.pinkivory.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木门
 
+< %1$s is name of wood used for door， %2$s is type of door >
 extratrees.block.door.name.adv=%1$s%2$s木门
 extratrees.block.door.type.standard=
 extratrees.block.door.type.solid=Solid
 extratrees.block.door.type.double=Split
 extratrees.block.door.type.full=Full
 
+< %1$s is name of the wood>
 extratrees.block.plank.name=%1$s木板
 extratrees.block.log.name=%1$s原木
 extratrees.block.woodslab.name=%1$s台阶
@@ -168,9 +173,12 @@ extratrees.block.woodstairs.name=%1$s楼梯
 extratrees.block.woodfence.name=%1$s栅栏
 extratrees.block.woodgate.name=%1$s栅栏门
 
+< %1$s is the adjective for the fence type， %2$s is the name of the wood >
 extratrees.block.multifence.name=%2$s %1$s 门
+< %3$s is the name of the second wood >
 extratrees.block.multifence.name2=%2$s %1$s & $3$s 门
 
+< %1$s is name of the design >
 extratrees.block.woodentile.name=%1$s木砖
 extratrees.block.woodenpanel.name=%1$s镶板
 extratrees.block.stainedglass.name=%1$s染色玻璃
@@ -276,40 +284,40 @@ extratrees.species.starfruit.name=杨桃
 extratrees.species.candlenut.name=石栗
 extratrees.species.dwarfhazel.name=矮榛
 
-extratrees.butterflies.species.whiteAdmiral=White Admiral
-extratrees.butterflies.species.purpleEmperor=Purple Emperor
-extratrees.butterflies.species.redAdmiral=Red Admiral
-extratrees.butterflies.species.paintedLady=Painted Lady
-extratrees.butterflies.species.smallTortoiseshell=Small Tortoiseshell
-extratrees.butterflies.species.camberwellBeauty=Camberwell Beauty
-extratrees.butterflies.species.peacock=Peacock
-extratrees.butterflies.species.wall=Wall
-extratrees.butterflies.species.crimsonRose=Crimson Rose
-extratrees.butterflies.species.kaiserIHind=Kaiser-i-Hind
-extratrees.butterflies.species.goldenBirdwing=Golden Birdwing
-extratrees.butterflies.species.marshFritillary=Marsh Fritillary
-extratrees.butterflies.species.pearlBorderedFritillary=Pearl-bordered Fritillary
-extratrees.butterflies.species.queenOfSpainFritillary=Queen of Spain Fritillary
-extratrees.butterflies.species.speckledWood=Speckled Wood
-extratrees.butterflies.species.scotchAngus=Scotch Angus
-extratrees.butterflies.species.gatekeeper=Gatekeeper
-extratrees.butterflies.species.meadowBrown=Meadow Brown
-extratrees.butterflies.species.smallHeath=Small Heath
-extratrees.butterflies.species.ringlet=Ringlet
-extratrees.butterflies.species.monarch=Monarch
-extratrees.butterflies.species.marbledWhite=Marbled White
+extratrees.butterflies.species.whiteAdmiral=白蛺蝶
+extratrees.butterflies.species.purpleEmperor=紫色帝王蝶
+extratrees.butterflies.species.redAdmiral=红蛺蝶
+extratrees.butterflies.species.paintedLady=姬红蛱蝶
+extratrees.butterflies.species.smallTortoiseshell=小麻蛱蝶
+extratrees.butterflies.species.camberwellBeauty=坎伯韦尔美人蝶
+extratrees.butterflies.species.peacock=孔雀蝶
+extratrees.butterflies.species.wall=棕蛱蝶
+extratrees.butterflies.species.crimsonRose=绯红玫瑰蝶
+extratrees.butterflies.species.kaiserIHind=喙凤蝶
+extratrees.butterflies.species.goldenBirdwing=金裳凤蝶
+extratrees.butterflies.species.marshFritillary=沼泽豹纹蝶
+extratrees.butterflies.species.pearlBorderedFritillary=珍珠豹纹蝶
+extratrees.butterflies.species.queenOfSpainFritillary=西班牙豹纹女王蝶
+extratrees.butterflies.species.speckledWood=帕眼蝶
+extratrees.butterflies.species.scotchAngus=苏格兰百眼蝶
+extratrees.butterflies.species.gatekeeper=链眼蝶
+extratrees.butterflies.species.meadowBrown=草地棕眼蝶
+extratrees.butterflies.species.smallHeath=潘非珍眼蝶
+extratrees.butterflies.species.ringlet=阿芬眼蝶
+extratrees.butterflies.species.monarch=黑脉金斑蝶
+extratrees.butterflies.species.marbledWhite=加勒白眼蝶
 
 extratrees.genetics.requirements.height=最低海拔要求：%d
 extratrees.genetics.unknown=<未知>
 extratrees.genetics.discoveredBy=由 %s 发现
 extratrees.genetics.complexity=复杂度：%d
 
-extratrees.item.carpentryHammer=木工大师的锤子
+extratrees.item.carpentryHammer=木工大师锤
 extratrees.item.masterCarpentryHammer=木工锤
 extratrees.item.sawdust=锯末
 extratrees.item.bark=树皮
 extratrees.item.provenGear=标定齿轮
-extratrees.item.woodWax=Wood Polish
+extratrees.item.woodWax=光泽剂
 extratrees.item.glassFitting=玻璃配件
 
 for.extratrees.item.food.apple=苹果
@@ -351,8 +359,7 @@ for.extratrees.item.food.elderberry=接骨木浆果
 for.extratrees.item.food.olive=橄榄
 for.extratrees.item.food.gingkonut=白果
 for.extratrees.item.food.coffee=咖啡
-for.extratrees.item.food.osangeosange=Osange Orange
-for.extratrees.item.food.osangeorange=Osange Orange
+for.extratrees.item.food.osangeorange=桑橙
 for.extratrees.item.food.clove=丁香
 for.extratrees.item.food.papayimar=Pahimar牌木瓜
 for.extratrees.item.food.blackcurrant=黑加仑