Skip to content

Commit

Permalink
-Added config option do disable item dislocator pickup sound.
Browse files Browse the repository at this point in the history
-Fixed some console spam when taking damage with DE armor.
-Fixed some mob soul name issues.
  • Loading branch information
brandon3055 committed Feb 10, 2018
2 parents a46d3ba + 589e306 commit 4570abb
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 17 deletions.
5 changes: 5 additions & 0 deletions Change Log.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
######## 2.3.9.x ########
-Fixed draconium chest recipe shift clicking from jei.
-Fixed missing ore dictionary entries for nether and end draconium ore.
-Fixed missing FE support on armor.
-Added config option do disable item dislocator pickup sound.
-Fixed some console spam when taking damage with DE armor.
-Fixed some mob soul name issues.

######## 2.3.8.279 ########
-Re added toggle flight key binding
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/brandon3055/draconicevolution/DEConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ public void onConfigChanged(String propertyName, String propertyCategory) {
@ModConfigProperty(category = "Client Settings", name = "disableLoudCelestialManipulator", comment = "If true the range of the celestial manipulator sound effect will be significantly reduced.")
public static boolean disableLoudCelestialManipulator = false;

@ModConfigProperty(category = "Client Settings", name = "disableDislocatorSound", comment = "If true the item dislocator will not make the pickup sound when it collects items..")
public static boolean disableDislocatorSound = false;

//Category Misc

@ModConfigProperty(category = "Misc", name = "devLog", comment = "This enables dev log output. I primarily use this for development purposes so it wont be very useful to regular users.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ public void onPlayerAttacked(LivingAttackEvent event) {
}

EntityPlayer player = (EntityPlayer) event.getEntityLiving();
if (!player.isServerWorld()) {
return;
}

ArmorSummery summery = new ArmorSummery().getSummery(player);

float hitAmount = ModHelper.applyModDamageAdjustments(summery, event);
Expand Down Expand Up @@ -142,6 +146,10 @@ public void onPlayerDeath(LivingDeathEvent event) {
}

EntityPlayer player = (EntityPlayer) event.getEntityLiving();
if (!player.isServerWorld()) {
return;
}

ArmorSummery summery = new ArmorSummery().getSummery(player);

if (summery == null || event.getSource() == ADMIN_KILL) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@ else if (ItemNBTHelper.verifyExistance(stack, "ZombieTypeHusk")) {
eModifier = "-Husk";
}

entityNameCache.clear();

String localizedName = entityNameCache.computeIfAbsent(eString + eModifier, s -> {
try {
Entity entity = EntityList.createEntityByIDFromName(getCachedRegName(eString), null);
if (entity == null) {
entity = new EntityPig(null);
return I18n.translateToLocal("entity." + EntityList.getTranslationName(getCachedRegName(eString)) + ".name");
}

loadAdditionalEntityInfo(stack, entity);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int slot, bool
}
}

if (flag) {
if (flag || !DEConfig.disableDislocatorSound) {
world.playSound((EntityPlayer) null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F));
}

Expand All @@ -144,7 +144,9 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int slot, bool
if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, orb))) {
continue;
}
world.playSound((EntityPlayer) null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F));
if (!DEConfig.disableDislocatorSound) {
world.playSound((EntityPlayer) null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F));
}
player.onItemPickup(orb, 1);
player.addExperience(orb.xpValue);
orb.setDead();
Expand Down
21 changes: 9 additions & 12 deletions src/main/resources/assets/draconicevolution/lang/pt_BR.lang
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#This localization was provided by InterPlay02 via github
#https://github.com/brandon3055/Draconic-Evolution/issues/995

//Tile Information ----------------------------------------------------------------------------------------------------------------------------------------
tile.draconicevolution:celestial_manipulator.name=Manipulador Celestial
tile.draconicevolution:draconium_ore_normal.name=Minério de Dracônio
Expand Down Expand Up @@ -50,21 +47,21 @@ tile.draconicevolution:energy_crystal.wireless.draconic.name=Cristal Draconiano
tile.draconicevolution:fusion_crafting_core.name=Núcleo de Fabricação por Fusão
tile.draconicevolution:crafting_injector_basic.name=Injetor para Fabricação por Fusão
tile.draconicevolution:crafting_injector_wyvern.name=Injetor Wyvern para Fabricação por Fusão
tile.draconicevolution:crafting_injector_draconic.name=Injeteor Draconiano para Fabricação por Fusão
tile.draconicevolution:crafting_injector_draconic.name=Injetor Draconiano para Fabricação por Fusão
tile.draconicevolution:crafting_injector_chaotic.name=Injetor Caótico para Fabricação por Fusão

tile.draconicevolution:creative_rf_source.name=Fonte de RF Criativa


//Item Information ----------------------------------------------------------------------------------------------------------------------------------------
item.draconicevolution:awakened_core.name=Núcleo Evoluído
item.draconicevolution:awakened_core.name=Núcleo Draconiano
item.draconicevolution:draconium_ingot.name=Lingote de Dracônio
item.draconicevolution:draconium_dust.name=Pó de Dracônio
item.draconicevolution:draconium_blend.name=Mistura de Dracônio (Depreciada)
item.draconicevolution:dragon_heart.name=Coração de Dragão
item.draconicevolution:wyvern_core.name=Núcleo Wyvern
item.draconicevolution:sun_focus.name=Foco Solar
item.draconicevolution:draconic_core.name=Núcleo Draconiano
item.draconicevolution:draconic_core.name=Núcleo Evoluído
item.draconicevolution:dislocator.name=Esfera de Dislocamento
item.draconicevolution:dislocator_advanced.name=Esfera de Dislocamento Melhorada

Expand All @@ -88,8 +85,8 @@ item.draconicevolution:draconic_sword.name=Espada Draconiana
item.draconicevolution:draconic_bow.name=Arco Draconiano
item.draconicevolution:draconic_helm.name=Elmo Draconiano
item.draconicevolution:draconic_chest.name=Armadura Draconiana
item.draconicevolution:draconic_legs.name=Calças Evoluídas
item.draconicevolution:draconic_boots.name=Botas Evoluídas
item.draconicevolution:draconic_legs.name=Calças Draconianas
item.draconicevolution:draconic_boots.name=Botas Draconianas
item.draconicevolution:draconic_staff_of_power.name=Cajado Draconiano do Poder
item.draconicevolution:mob_soul.name=(Alma)
item.draconicevolution:ender_arrow.name=Flecha do End
Expand Down Expand Up @@ -325,9 +322,9 @@ achievement.draconicevolution.dust.desc=Colete pó de Dracônio
achievement.draconicevolution.ingot=Melhor que diamante!
achievement.draconicevolution.ingot.desc=Faça ligotes de dracônio
achievement.draconicevolution.core=E é aqui que a coisa começa
achievement.draconicevolution.core.desc=Faça um núcleo draconiano
achievement.draconicevolution.core.desc=Faça um núcleo evoluído
achievement.draconicevolution.core2=Não é bom o suficiente!
achievement.draconicevolution.core2.desc=Atualize o núcleo draconiano para Wyvern
achievement.draconicevolution.core2.desc=Atualize o núcleo evoluído para Wyvern

achievement.draconicevolution.dislocator=Endermen não conseguiu nada
achievement.draconicevolution.dislocator.desc=Criar um dislocador
Expand Down Expand Up @@ -595,7 +592,7 @@ gui.fusionCrafting.tierLow.info=Nível dos pedestais\nmuito baixo
gui.fusionCrafting.outputObstructed.info=Saída obstruída
gui.fusionCrafting.crafting.info=Fabricando
gui.fusionCrafting.charging.info=Carregando
gui.jeiFusion.tier.0=Nível: Draconiano
gui.jeiFusion.tier.0=Nível: Evoluído
gui.jeiFusion.tier.1=Nível: Wyvern
gui.jeiFusion.tier.2=Nível: Draconiano
gui.jeiFusion.tier.3=Nível: Caótico
Expand Down Expand Up @@ -942,4 +939,4 @@ gui.draconiumChest.ioState2.btn=Saída Apenas
gui.draconiumChest.ioState3.btn=Entrada e Saída

//---- Misc Info Text ----//
info.de.shiftReversePlaceLogic.txt=Segure Shift para reverter a Lógica de Colocamento.
info.de.shiftReversePlaceLogic.txt=Segure Shift para reverter a Lógica de Colocamento.

0 comments on commit 4570abb

Please sign in to comment.