Fixed the creative tab and world generator localizations, fixed some textures, fixed the liquid animations and had a toy with the SoundHandler

This commit is contained in:
Adubbz 2013-07-03 09:56:11 +10:00
parent be3ff937d0
commit 2fc211530e
39 changed files with 45 additions and 53 deletions

View File

@ -343,8 +343,6 @@
<entry key="item.bop.flowerBand.lushflowerband.name">Lush Flower Band</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">Exotic Flower Band</entry>
<!--Tinker's Construct Items -->
<!--Liquids -->
<entry key="item.bop.bopBucket.spring_water.name">Spring Water Bucket</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">Liquid Poison Bucket</entry>
@ -355,5 +353,11 @@
<!--Phrases -->
<entry key="phrase.bop.promisedPortalOverworld">A gateway to the Promised Land has appeared in the sky above.</entry>
<entry key="phrase.bop.promisedPortalOther">A gateway has appeared in the sky above.</entry>
<!--Creative Tab -->
<entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry>
<!--World Type -->
<entry key="generator.BIOMESOP">Biomes O' Plenty</entry>
</properties>

Binary file not shown.

After

Width:  |  Height:  |  Size: 800 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 904 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 870 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 949 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 866 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 953 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 938 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 908 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 936 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 980 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 887 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 985 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 900 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 880 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 959 B

View File

@ -0,0 +1,5 @@
{
"animation": {
}
}

View File

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

View File

@ -1,33 +0,0 @@
0*2
1*2
2*2
3*2
4*2
5*2
6*2
7*2
8*2
9*2
10*2
11*2
12*2
13*2
14*2
15*2
16*2
17*2
18*2
19*2
20*2
21*2
22*2
23*2
24*2
25*2
26*2
27*2
28*2
29*2
30*2
31*2

View File

@ -0,0 +1,5 @@
{
"animation": {
}
}

View File

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

View File

@ -38,7 +38,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
@ -90,9 +89,6 @@ public class BiomesOPlenty
@EventHandler
public void load(FMLInitializationEvent event)
{
LanguageRegistry.instance().addStringLocalization("itemGroup.tabBiomesOPlenty", "en_US", "Biomes O\' Plenty");
LanguageRegistry.instance().addStringLocalization("generator.BIOMESOP", "en_US", "Biomes O\' Plenty");
// Add helpers for compatibility
MinecraftForge.TERRAIN_GEN_BUS.register(new WorldTypeSize());
MinecraftForge.EVENT_BUS.register(new AchievementHelper());

View File

@ -2,6 +2,7 @@ package biomesoplenty.handlers;
import java.util.logging.Level;
import net.minecraft.client.resources.ResourceLocation;
import net.minecraftforge.client.event.sound.PlayStreamingEvent;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;
@ -11,7 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class SoundHandler
{
static String[] recordSoundFiles = { "bopdisc.ogg", "bopdiscmud.ogg"};
static ResourceLocation[] recordSoundFiles = { new ResourceLocation("biomesoplenty", "records/" + "bopdisc.ogg"), new ResourceLocation("biomesoplenty", "records/" + "bopdiscmud.ogg") };
static String[] soundFiles = { };
@SideOnly(Side.CLIENT)
@ -31,11 +32,13 @@ public class SoundHandler
}
}
for (String recordSoundFile : recordSoundFiles)
for (ResourceLocation recordSoundFile : recordSoundFiles)
{
try
{
event.manager.soundPoolStreaming.addSound(recordSoundFile);
event.manager.soundPoolStreaming.addSound(recordSoundFile.func_110623_a());
Throwable throwable = new Throwable();
throwable.printStackTrace();
}
catch (Exception e)
@ -52,6 +55,7 @@ public class SoundHandler
if (event.name == "bopdisc")
{
//FMLClientHandler.instance().getClient().sndManager.playStreaming("records.biomesoplenty.bopdisc", (float) event.x + 0.5F, (float) event.y + 0.5F, (float) event.z + 0.5F);
System.out.println(event.manager.soundPoolStreaming.getRandomSound().func_110457_b());
}
else if (event.name == "bopdiscmud")
{

View File

@ -2,6 +2,7 @@ package biomesoplenty.helpers;
import java.util.logging.Level;
import net.minecraft.client.resources.ResourceLocation;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.LanguageRegistry;
@ -9,17 +10,17 @@ public class Localizations
{
private static final String localizationLocation = "/assets/BiomesOPlenty/lang/";
public static String[] localeFiles = { localizationLocation + "en_US.xml", localizationLocation + "de_DE.xml", localizationLocation + "nl_NL.xml" };
public static ResourceLocation[] localeFiles = { new ResourceLocation(localizationLocation + "en_US.xml"), new ResourceLocation(localizationLocation + "de_DE.xml"), new ResourceLocation(localizationLocation + "nl_NL.xml") };
public static boolean isXMLLanguageFile(String fileName)
public static boolean isXMLLanguageFile(ResourceLocation fileName)
{
return fileName.endsWith(".xml");
return fileName.func_110623_a().endsWith(".xml");
}
public static String getLocaleFromFileName(String fileName)
public static String getLocaleFromFileName(ResourceLocation fileName)
{
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Localizations loaded for " + fileName.substring(fileName.lastIndexOf('/') + 1, fileName.lastIndexOf('.')));
return fileName.substring(fileName.lastIndexOf('/') + 1, fileName.lastIndexOf('.'));
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Localizations loaded for " + fileName.func_110623_a().substring(fileName.func_110623_a().lastIndexOf('/') + 1, fileName.func_110623_a().lastIndexOf('.')));
return fileName.func_110623_a().substring(fileName.func_110623_a().lastIndexOf('/') + 1, fileName.func_110623_a().lastIndexOf('.'));
}
public String getLocalizedString(String key)
@ -29,9 +30,9 @@ public class Localizations
public static void loadLanguages()
{
for (String localizationFile : localeFiles)
for (ResourceLocation localizationFile : localeFiles)
{
LanguageRegistry.instance().loadLocalization(localizationFile, getLocaleFromFileName(localizationFile), isXMLLanguageFile(localizationFile));
LanguageRegistry.instance().loadLocalization(localizationFile.func_110623_a(), getLocaleFromFileName(localizationFile), isXMLLanguageFile(localizationFile));
}
for (int mat = 0; mat < materialTypes.length; mat++)

View File

@ -11,7 +11,7 @@ import cpw.mods.fml.client.FMLClientHandler;
public class EntitySteamFX extends EntityFX
{
private static final String texture = "/mods/BiomesOPlenty/textures/particles/steam.png";
private static final String texture = "BiomesOPlenty:textures/particles/steam.png";
public EntitySteamFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12)
{
@ -82,7 +82,7 @@ public class EntitySteamFX extends EntityFX
GL11.glPopMatrix();
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/particles.png"));
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("textures/particle/particles.png"));
tessellator.startDrawingQuads();
}

View File

@ -18,7 +18,7 @@ public class PotionNourishment extends Potion
@SideOnly(Side.CLIENT)
public int getStatusIconIndex()
{
Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png"));
Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("BiomesOPlenty:textures/potions/BOPPotionFX.png"));
return 0;
}