Fixed NPE on startup, fixed mob/record sounds once and for all

This commit is contained in:
Adubbz 2014-01-29 19:55:12 +11:00
parent d02729b423
commit b155f08ac3
18 changed files with 85 additions and 11 deletions

View file

@ -87,8 +87,8 @@ public class BiomesOPlenty
packetPipeline.initalize(); packetPipeline.initalize();
TreecapitatorIntegration.init(); TreecapitatorIntegration.init();
DimensionManager.registerProviderType(BOPConfigurationIDs.promisedLandDimID, WorldProviderPromised.class, false); //DimensionManager.registerProviderType(BOPConfigurationIDs.promisedLandDimID, WorldProviderPromised.class, false);
DimensionManager.registerDimension(BOPConfigurationIDs.promisedLandDimID, BOPConfigurationIDs.promisedLandDimID); //DimensionManager.registerDimension(BOPConfigurationIDs.promisedLandDimID, BOPConfigurationIDs.promisedLandDimID);
} }
@EventHandler @EventHandler

View file

@ -64,8 +64,8 @@ public class BOPItems
registerItem(new ItemBOPAncientStaff().setUnlocalizedName("ancientStaff")); registerItem(new ItemBOPAncientStaff().setUnlocalizedName("ancientStaff"));
registerItem(new ItemEnderporter().setUnlocalizedName("enderporter")); registerItem(new ItemEnderporter().setUnlocalizedName("enderporter"));
registerItem(new ItemBOPRecord("bopdisc").setUnlocalizedName("bopDisc")); registerItem(new ItemBOPRecord("wanderer").setUnlocalizedName("record_wanderer"));
registerItem(new ItemBOPRecord("bopdiscmud").setUnlocalizedName("bopDiscMud")); registerItem(new ItemBOPRecord("corruption").setUnlocalizedName("record_corruption"));
//registerItem(new ItemBiomeBook().setUnlocalizedName("biomeBook")); //registerItem(new ItemBiomeBook().setUnlocalizedName("biomeBook"));
registerItem(new ItemBiomeFinder().setUnlocalizedName("biomeFinder")); registerItem(new ItemBiomeFinder().setUnlocalizedName("biomeFinder"));

View file

@ -38,7 +38,7 @@ public class ItemBOPRecord extends ItemRecord
@Override @Override
public void registerIcons(IIconRegister iconRegister) public void registerIcons(IIconRegister iconRegister)
{ {
itemIcon = iconRegister.registerIcon("biomesoplenty:" + recordName); itemIcon = iconRegister.registerIcon("biomesoplenty:" + "record_" + recordName);
} }
@Override @Override
@ -73,7 +73,7 @@ public class ItemBOPRecord extends ItemRecord
//TODO: getRecordTitle() //TODO: getRecordTitle()
public String func_150927_i() public String func_150927_i()
{ {
return StatCollector.translateToLocal("item." + this.field_150929_a + ".desc"); return StatCollector.translateToLocal(this.getUnlocalizedName() + ".desc");
} }
@Override @Override
@ -90,6 +90,6 @@ public class ItemBOPRecord extends ItemRecord
@Override @Override
public ResourceLocation getRecordResource(String name) public ResourceLocation getRecordResource(String name)
{ {
return new ResourceLocation("biomesoplenty:records/" + name.replace("records.", "") + ".ogg"); return new ResourceLocation("biomesoplenty:" + name);
} }
} }

View file

@ -373,11 +373,11 @@ item.ancientStaff.ancientstaffbroken.name=Depleted Ancient Staff
item.enderporter.name=Enderporter item.enderporter.name=Enderporter
item.bopDisc.name=Music Disc item.record_wanderer.name=Music Disc
item.bopDiscMud.name=Music Disc item.record_corruption.name=Music Disc
item.bopdisc.desc=Tim Rurkowski - Wanderer item.record_wanderer.desc=Tim Rurkowski - Wanderer
item.bopdiscmud.desc=??? item.record_corruption.desc=???
item.flowerBand.dullflowerband.name=Dull Flower Band item.flowerBand.dullflowerband.name=Dull Flower Band
item.flowerBand.plainflowerband.name=Plain Flower Band item.flowerBand.plainflowerband.name=Plain Flower Band

View file

@ -0,0 +1,74 @@
{
"mob.bird.hurt": {
"category": "neutral",
"sounds": [
"mob/bird/hurt"
]
},
"mob.bird.say": {
"category": "neutral",
"sounds": [
"mob/bird/say"
]
},
"mob.phantom.death": {
"category": "hostile",
"sounds": [
"mob/phantom/death"
]
},
"mob.phantom.hurt": {
"category": "hostile",
"sounds": [
"mob/phantom/hurt"
]
},
"mob.phantom.say": {
"category": "hostile",
"sounds": [
"mob/phantom/say"
]
},
"mob.pixie.hurt": {
"category": "neutral",
"sounds": [
"mob/pixie/hurt"
]
},
"mob.pixie.say": {
"category": "neutral",
"sounds": [
"mob/pixie/say"
]
},
"mob.wasp.hurt": {
"category": "hostile",
"sounds": [
"mob/wasp/hurt"
]
},
"mob.wasp.say": {
"category": "hostile",
"sounds": [
"mob/wasp/say"
]
},
"records.wanderer": {
"category": "record",
"sounds": [
{
"name": "records/wanderer",
"stream": true
}
]
},
"records.corruption": {
"category": "record",
"sounds": [
{
"name": "records/corruption",
"stream": true
}
]
}
}