Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-05-29 12:13:36 +02:00
Code Issues Projects Releases Wiki Activity

Localizing and some CreativeTab Adding

Browse source
This commit is contained in:
Ellpeck 2015-07-17 13:24:33 +02:00
parent 0585e703dc
commit f96b692fb8
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
View file

@ -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);

3
src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java
View file

@ -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)){

6
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -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