diff --git a/src/main/java/noppes/npcs/blocks/BlockSign.java b/src/main/java/noppes/npcs/blocks/BlockSign.java index 456cd0b33..241749360 100644 --- a/src/main/java/noppes/npcs/blocks/BlockSign.java +++ b/src/main/java/noppes/npcs/blocks/BlockSign.java @@ -11,7 +11,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileSign; import noppes.npcs.blocks.tiles.TileVariant; @@ -37,7 +36,7 @@ public class BlockSign extends BlockRotated { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - TileBanner tile = (TileBanner) world.getTileEntity(x, y, z); + TileSign tile = (TileSign) world.getTileEntity(x, y, z); return tile.canEdit(); } diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 9f8694663..a8e2994a5 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -287,10 +287,9 @@ public class ClientProxy extends CommonProxy { } Minecraft mc = Minecraft.getMinecraft(); - NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc"); + NPCButton = new KeyBinding("key.npcInventory", Keyboard.KEY_N, "key.categories.customnpc"); ClientRegistry.registerKeyBinding(NPCButton); - mc.gameSettings.loadOptions(); new PresetController(CustomNpcs.Dir); diff --git a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang index b377588b2..f8f092bbf 100644 --- a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang +++ b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang @@ -437,4 +437,5 @@ item.npcInfantryHelmet.name=Armádní helma item.npcOfficerHelmet.name=důstojnické brnění item.npcCrown.name=Koruna -item.npcCrown2.name=Koruna \ No newline at end of file +item.npcCrown2.name=Koruna +key.npcInventory=NPC inventář diff --git a/src/main/resources/assets/customnpcs/lang/de_DE.lang b/src/main/resources/assets/customnpcs/lang/de_DE.lang index 318e029d4..f88dd2769 100644 --- a/src/main/resources/assets/customnpcs/lang/de_DE.lang +++ b/src/main/resources/assets/customnpcs/lang/de_DE.lang @@ -869,3 +869,5 @@ companion.age=Alter companion.stage=Bühne #German by DewTix + +key.npcInventory=NPC Inventar diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index ad733fa6b..286f8446f 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1,6 +1,7 @@ customnpcs.defaultTextColor=404040 key.categories.customnpc=CustomNPC+ +key.npcInventory=NPC Inventory entity.CustomNpc.name=Custom Npc entity.customnpcs.CustomNpc.name=Custom Npc diff --git a/src/main/resources/assets/customnpcs/lang/es_AR.lang b/src/main/resources/assets/customnpcs/lang/es_AR.lang index 917abd4f4..27c79cd78 100644 --- a/src/main/resources/assets/customnpcs/lang/es_AR.lang +++ b/src/main/resources/assets/customnpcs/lang/es_AR.lang @@ -8,7 +8,7 @@ tile.npcCarpentyBench.name=Mesa de Carpinteria tile.npcBloodBlock.name=Bloque de Sangre gui.deleteConfirm=Estas Seguro de que quieres eliminar este npc? -gui.add=Aadir +gui.add=Añadir gui.remove=Remover gui.edit=Editar gui.name=Nombre @@ -31,13 +31,13 @@ gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCerrar -gui.ignoreDamage=Ignorar dao +gui.ignoreDamage=Ignorar daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar cuando ataca -display.size=Tamao +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de criatura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin dao de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=RangedOptions stats.burninsun=Se quema al sol stats.amplify=Amplificado -stats.size=Tamao +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/es_MX.lang b/src/main/resources/assets/customnpcs/lang/es_MX.lang index 2d34e3827..53bca03af 100644 --- a/src/main/resources/assets/customnpcs/lang/es_MX.lang +++ b/src/main/resources/assets/customnpcs/lang/es_MX.lang @@ -25,19 +25,19 @@ gui.day=Dia gui.night=Noche gui.constant=Constante gui.accelerate=Acelerar -gui.small=Pequeo +gui.small=Pequeño gui.medium=Mediano gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCierre -gui.ignoreDamage=Ignorar Dao +gui.ignoreDamage=Ignorar Daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar Al Atacar -display.size=Tamao +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de cratura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin dao de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=PropiedadesDeDistancia stats.burninsun=Se quema al sol stats.amplify=Amplificar -stats.size=Tamao +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/fr_FR.lang b/src/main/resources/assets/customnpcs/lang/fr_FR.lang index 15e98a29f..b22a75ac3 100644 --- a/src/main/resources/assets/customnpcs/lang/fr_FR.lang +++ b/src/main/resources/assets/customnpcs/lang/fr_FR.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Arbalète item.npcCrossBolt.name=Carreau d'Arbalète item.npcSlingshot.name=Lance-Pièrre item.npcMusket.name=Mousquet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventaire Pnj diff --git a/src/main/resources/assets/customnpcs/lang/hu_HU.lang b/src/main/resources/assets/customnpcs/lang/hu_HU.lang index c2873bbcd..1a9fc71f5 100644 --- a/src/main/resources/assets/customnpcs/lang/hu_HU.lang +++ b/src/main/resources/assets/customnpcs/lang/hu_HU.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Számszeríj item.npcCrossBolt.name=Tüske item.npcSlingshot.name=Csúzli item.npcMusket.name=Muskéta -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=NPC felszerelés diff --git a/src/main/resources/assets/customnpcs/lang/ko_KR.lang b/src/main/resources/assets/customnpcs/lang/ko_KR.lang index 64c09c92f..993006c34 100644 --- a/src/main/resources/assets/customnpcs/lang/ko_KR.lang +++ b/src/main/resources/assets/customnpcs/lang/ko_KR.lang @@ -794,3 +794,5 @@ enchantment.damage=데미지 enchantment.confusion=혼란 enchantment.infinite=무한 enchantment.poison=독 + +key.npcInventory=NPC 인벤토리 diff --git a/src/main/resources/assets/customnpcs/lang/pl_PL.lang b/src/main/resources/assets/customnpcs/lang/pl_PL.lang index 2721d5fc4..2f1047663 100644 --- a/src/main/resources/assets/customnpcs/lang/pl_PL.lang +++ b/src/main/resources/assets/customnpcs/lang/pl_PL.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Kusza item.npcCrossBolt.name=Strzałki do kuszy item.npcSlingshot.name=Proca item.npcMusket.name=Muszkiet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inwentarz npc diff --git a/src/main/resources/assets/customnpcs/lang/pt_BR.lang b/src/main/resources/assets/customnpcs/lang/pt_BR.lang index c8f4d9a7c..c3bbd3c26 100644 --- a/src/main/resources/assets/customnpcs/lang/pt_BR.lang +++ b/src/main/resources/assets/customnpcs/lang/pt_BR.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Besta item.npcCrossBolt.name=Flecha de Besta item.npcSlingshot.name=Estilingue item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventário NPC diff --git a/src/main/resources/assets/customnpcs/lang/ru_RU.lang b/src/main/resources/assets/customnpcs/lang/ru_RU.lang index f0f552f84..54d0c2cf4 100644 --- a/src/main/resources/assets/customnpcs/lang/ru_RU.lang +++ b/src/main/resources/assets/customnpcs/lang/ru_RU.lang @@ -1015,3 +1015,5 @@ questgui.rewards=Награды: questgui.experience=Опыт: questgui.reject=Отменить questgui.accept=Принять + +key.npcInventory=Инвентарь NPC diff --git a/src/main/resources/assets/customnpcs/lang/zh_CN.lang b/src/main/resources/assets/customnpcs/lang/zh_CN.lang index d8de7694b..e5d0b172a 100644 --- a/src/main/resources/assets/customnpcs/lang/zh_CN.lang +++ b/src/main/resources/assets/customnpcs/lang/zh_CN.lang @@ -1238,3 +1238,5 @@ tint.hurt=伤害色彩 hitbox.hitbox=碰撞体积 hitbox.width=宽度比例 hitbox.height=身高比例 + +key.npcInventory=NPC物品栏