From f96b692fb81b3a2978060bac5568924e583809fd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 17 Jul 2015 13:24:33 +0200 Subject: [PATCH] Localizing and some CreativeTab Adding --- .../ellpeck/actuallyadditions/creative/CreativeTab.java | 7 +++++++ .../ellpeck/actuallyadditions/event/EntityLivingEvent.java | 3 +-- .../resources/assets/actuallyadditions/lang/en_US.lang | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index 2ef151e8d..82be595ed 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -36,6 +36,7 @@ public class CreativeTab extends CreativeTabs{ add(InitBlocks.blockInputterAdvanced); add(InitBlocks.blockPhantomBooster); add(InitBlocks.blockCoffeeMachine); + add(InitBlocks.blockXPSolidifier); add(InitBlocks.blockGreenhouseGlass); add(InitBlocks.blockGrinder); @@ -86,12 +87,18 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.itemDrillUpgradeFiveByFive); add(InitItems.itemDrillUpgradeBlockPlacing); add(InitItems.itemBattery); + add(InitItems.itemBatteryDouble); + add(InitItems.itemBatteryTriple); + add(InitItems.itemBatteryQuadruple); + add(InitItems.itemBatteryQuintuple); add(InitItems.itemTeleStaff); add(InitItems.itemPhantomConnector); add(InitItems.itemBucketCanolaOil); add(InitItems.itemBucketOil); + add(InitItems.itemWingsOfTheBats); + add(InitItems.itemCoffeeSeed); add(InitItems.itemCoffeeBean); add(InitItems.itemRiceSeed); diff --git a/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java b/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java index 2566111bb..50f694700 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java @@ -33,8 +33,7 @@ public class EntityLivingEvent{ //Wings allowing Flight if(event.entityLiving instanceof EntityPlayer){ EntityPlayer player = (EntityPlayer)event.entityLiving; - ItemStack wings = ItemWingsOfTheBats.getWingItem(player); - boolean wingsEquipped = wings != null; + boolean wingsEquipped = ItemWingsOfTheBats.getWingItem(player) != null; //If Player isn't (really) winged if(!ItemWingsOfTheBats.isPlayerWinged(player)){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index af719857c..eaf9b0e65 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -124,6 +124,12 @@ tooltip.actuallyadditions.blockMiscLavaFactoryCase.desc=Helps the Lava Factory C tile.actuallyadditions.blockFluidPlacer.name=Fluid Placer tooltip.actuallyadditions.blockFluidPlacer.desc=Places Fluids stored inside it +item.actuallyadditions.itemWingsOfTheBats.name=Wings Of The Bats +tooltip.actuallyadditions.itemWingsOfTheBats.desc=Give you the ability to fly when they're in your Inventory.. + +item.actuallyadditions.itemMiscBatWing.name=Bat's Wing +tooltip.actuallyadditions.itemMiscBatWing.desc=A Wing dropped from a bat.. might be useful.. + tooltip.actuallyadditions.paxel.desc.1=It's an All-In-One-Tool! tooltip.actuallyadditions.paxel.desc.2=Pickaxe, Axe, Shovel, Sword AND Hoe! In One Tool! item.actuallyadditions.woodenPaxel.name=Wooden AIOT