From 81abfe262796b5720a588ba53279934fab868894 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 6 Sep 2013 01:05:37 -0400 Subject: [PATCH] Correct textures and name loading --- .../assets/dark/languages/en_US.properties | 97 ++++++++++++++++++ .../textures/blocks/GlowGlass.png | Bin .../textures/blocks/StainedGlass.png | Bin .../textures/blocks/basalt.png | Bin .../textures/blocks/basaltbrick.png | Bin .../textures/blocks/basaltchiseled.png | Bin .../textures/blocks/basaltcobble.png | Bin .../textures/blocks/basaltcracked.png | Bin .../textures/blocks/basaltmossy.png | Bin .../textures/blocks/basaltslab.png | Bin .../textures/blocks/basaltslabside.png | Bin .../textures/blocks/blocks.png | Bin .../textures/blocks/colorSand.png | Bin .../{illus => dark}/textures/items/dust.png | Bin resources/assets/illus/lang/en_US.properties | 95 ----------------- src/dark/core/common/DarkMain.java | 7 +- 16 files changed, 102 insertions(+), 97 deletions(-) rename resources/assets/{illus => dark}/textures/blocks/GlowGlass.png (100%) rename resources/assets/{illus => dark}/textures/blocks/StainedGlass.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basalt.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltbrick.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltchiseled.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltcobble.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltcracked.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltmossy.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltslab.png (100%) rename resources/assets/{illus => dark}/textures/blocks/basaltslabside.png (100%) rename resources/assets/{illus => dark}/textures/blocks/blocks.png (100%) rename resources/assets/{illus => dark}/textures/blocks/colorSand.png (100%) rename resources/assets/{illus => dark}/textures/items/dust.png (100%) delete mode 100644 resources/assets/illus/lang/en_US.properties diff --git a/resources/assets/dark/languages/en_US.properties b/resources/assets/dark/languages/en_US.properties index 35f9868d..36036e85 100644 --- a/resources/assets/dark/languages/en_US.properties +++ b/resources/assets/dark/languages/en_US.properties @@ -108,6 +108,69 @@ tile.dark\:LeadOre.name = Lead Ore tile.dark\:AluminumOre.name = Bauxite Stone tile.dark\:SilverOre.name = Silver Ore +tile.DebugBlock.0.name = Unlimited Power +tile.DebugBlock.1.name = Unlimited Fluid +tile.DebugBlock.2.name = Fluid Void +tile.DebugBlock.3.name = Power Void + +tile.colorSand.Black.name = Black Sand +tile.colorSand.Red.name = Red Sand +tile.colorSand.Green.name = Green Sand +tile.colorSand.Brown.name = Brown Sand +tile.colorSand.Blue.name = Blue Sand +tile.colorSand.Purple.name = Purple Sand +tile.colorSand.Cyan.name = Cyan Sand +tile.colorSand.Silver.name = Silver Sand +tile.colorSand.Gray.name = Grey Sand +tile.colorSand.Pink.name = Pink Sand +tile.colorSand.Lime.name = Lime Sand +tile.colorSand.Yellow.name = Yellow Sand +tile.colorSand.LightBlue.name = Light Blue Sand +tile.colorSand.Magenta.name = Magenta Sand +tile.colorSand.Orange.name = Orange Sand +tile.colorSand.White.name = White Sand + +tile.GlowGlass.Black.name = Black Glowing Glass +tile.GlowGlass.Red.name = Red Glowing Glass +tile.GlowGlass.Green.name = Green Glowing Glass +tile.GlowGlass.Brown.name = Brown Glowing Glass +tile.GlowGlass.Blue.name = Blue Glowing Glass +tile.GlowGlass.Purple.name = Purple Glowing Glass +tile.GlowGlass.Cyan.name = Cyan Glowing Glass +tile.GlowGlass.Silver.name = Silver Glowing Glass +tile.GlowGlass.Gray.name = Grey Glowing Glass +tile.GlowGlass.Pink.name = Pink SGlowing Glass +tile.GlowGlass.Lime.name = Lime Glowing Glass +tile.GlowGlass.Yellow.name = Yellow Glowing Glass +tile.GlowGlass.LightBlue.name = Light Blue Glowing Glass +tile.GlowGlass.Magenta.name = Magenta Glowing Glass +tile.GlowGlass.Orange.name = Orange Glowing Glass +tile.GlowGlass.White.name = White Glowing Glass + +tile.StainedGlass.Black.name = Black Glass +tile.StainedGlass.Red.name = Red Glass +tile.StainedGlass.Green.name = Green Glass +tile.StainedGlass.Brown.name = Brown Glass +tile.StainedGlass.Blue.name = Blue Glass +tile.StainedGlass.Purple.name = Purple Glass +tile.StainedGlass.Cyan.name = Cyan Glass +tile.StainedGlass.Silver.name = Silver Glass +tile.StainedGlass.Gray.name = Grey Glass +tile.StainedGlass.Pink.name = Pink Glass +tile.StainedGlass.Lime.name = Lime GGlass +tile.StainedGlass.Yellow.name = Yellow Glass +tile.StainedGlass.LightBlue.name = Light Blue Glass +tile.StainedGlass.Magenta.name = Magenta Glass +tile.StainedGlass.Orange.name = Orange Glass +tile.StainedGlass.White.name = White Glass + +tile.basalt.name = Basalt +tile.basaltcobble.name = Basalt CobbleStone +tile.basaltbrick.name = Basalt Bricks +tile.basaltchiseled.name = Chiseled Basalt Bricks +tile.basaltmossy.name = Mossy Basalt Bricks +tile.basaltcracked.name = Cracked Basalt Bricks + # Items item.BronzeTube.name=Bronze Tube item.IronTube.name=Iron Tube @@ -121,3 +184,37 @@ item.ValvePart.name=Valve item.DMTools.0.name=Pipe Gauge item.DMTools.1.name=MultiMeter +item.GlowRefinedSand.Black.name = Black Glowing Refined Sand +item.GlowRefinedSand.Red.name = Red Glowing Refined Sand +item.GlowRefinedSand.Green.name = Green Glowing Refined Sand +item.GlowRefinedSand.Brown.name = Brown Glowing Refined Sand +item.GlowRefinedSand.Blue.name = Blue Glowing Refined Sand +item.GlowRefinedSand.Purple.name = Purple Glowing Refined Sand +item.GlowRefinedSand.Cyan.name = Cyan Glowing Refined Sand +item.GlowRefinedSand.Silver.name = Silver Glowing Refined Sand +item.GlowRefinedSand.Gray.name = Grey Glowing Refined Sand +item.GlowRefinedSand.Pink.name = Pink Glowing Refined Sand +item.GlowRefinedSand.Lime.name = Lime Glowing Refined Sand +item.GlowRefinedSand.Yellow.name = Yellow Glowing Refined Sand +item.GlowRefinedSand.Light Blue.name = Light Blue Glowing Refined Sand +item.GlowRefinedSand.Magenta.name = Magenta Glowing Refined Sand +item.GlowRefinedSand.Orange.name = Orange Glowing Refined Sand +item.GlowRefinedSand.White.name = White Glowing Refined Sand + +item.RefinedSand.Black.name = Black Refined Sand +item.RefinedSand.Red.name = Red Refined Sand +item.RefinedSand.Green.name = Green Refined Sand +item.RefinedSand.Brown.name = Brown Refined Sand +item.RefinedSand.Blue.name = Blue Refined Sand +item.RefinedSand.Purple.name = Purple Refined Sand +item.RefinedSand.Cyan.name = Cyan Refined Sand +item.RefinedSand.Silver.name = Silver Refined Sand +item.RefinedSand.Gray.name = Grey Refined Sand +item.RefinedSand.Pink.name = Pink Refined Sand +item.RefinedSand.Lime.name = Lime Refined Sand +item.RefinedSand.Yellow.name = Yellow Refined Sand +item.RefinedSand.Light Blue.name = Light Blue Refined Sand +item.RefinedSand.Magenta.name = Magenta Refined Sand +item.RefinedSand.Orange.name = Orange Refined Sand +item.RefinedSand.White.name = White Refined Sand + diff --git a/resources/assets/illus/textures/blocks/GlowGlass.png b/resources/assets/dark/textures/blocks/GlowGlass.png similarity index 100% rename from resources/assets/illus/textures/blocks/GlowGlass.png rename to resources/assets/dark/textures/blocks/GlowGlass.png diff --git a/resources/assets/illus/textures/blocks/StainedGlass.png b/resources/assets/dark/textures/blocks/StainedGlass.png similarity index 100% rename from resources/assets/illus/textures/blocks/StainedGlass.png rename to resources/assets/dark/textures/blocks/StainedGlass.png diff --git a/resources/assets/illus/textures/blocks/basalt.png b/resources/assets/dark/textures/blocks/basalt.png similarity index 100% rename from resources/assets/illus/textures/blocks/basalt.png rename to resources/assets/dark/textures/blocks/basalt.png diff --git a/resources/assets/illus/textures/blocks/basaltbrick.png b/resources/assets/dark/textures/blocks/basaltbrick.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltbrick.png rename to resources/assets/dark/textures/blocks/basaltbrick.png diff --git a/resources/assets/illus/textures/blocks/basaltchiseled.png b/resources/assets/dark/textures/blocks/basaltchiseled.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltchiseled.png rename to resources/assets/dark/textures/blocks/basaltchiseled.png diff --git a/resources/assets/illus/textures/blocks/basaltcobble.png b/resources/assets/dark/textures/blocks/basaltcobble.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltcobble.png rename to resources/assets/dark/textures/blocks/basaltcobble.png diff --git a/resources/assets/illus/textures/blocks/basaltcracked.png b/resources/assets/dark/textures/blocks/basaltcracked.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltcracked.png rename to resources/assets/dark/textures/blocks/basaltcracked.png diff --git a/resources/assets/illus/textures/blocks/basaltmossy.png b/resources/assets/dark/textures/blocks/basaltmossy.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltmossy.png rename to resources/assets/dark/textures/blocks/basaltmossy.png diff --git a/resources/assets/illus/textures/blocks/basaltslab.png b/resources/assets/dark/textures/blocks/basaltslab.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltslab.png rename to resources/assets/dark/textures/blocks/basaltslab.png diff --git a/resources/assets/illus/textures/blocks/basaltslabside.png b/resources/assets/dark/textures/blocks/basaltslabside.png similarity index 100% rename from resources/assets/illus/textures/blocks/basaltslabside.png rename to resources/assets/dark/textures/blocks/basaltslabside.png diff --git a/resources/assets/illus/textures/blocks/blocks.png b/resources/assets/dark/textures/blocks/blocks.png similarity index 100% rename from resources/assets/illus/textures/blocks/blocks.png rename to resources/assets/dark/textures/blocks/blocks.png diff --git a/resources/assets/illus/textures/blocks/colorSand.png b/resources/assets/dark/textures/blocks/colorSand.png similarity index 100% rename from resources/assets/illus/textures/blocks/colorSand.png rename to resources/assets/dark/textures/blocks/colorSand.png diff --git a/resources/assets/illus/textures/items/dust.png b/resources/assets/dark/textures/items/dust.png similarity index 100% rename from resources/assets/illus/textures/items/dust.png rename to resources/assets/dark/textures/items/dust.png diff --git a/resources/assets/illus/lang/en_US.properties b/resources/assets/illus/lang/en_US.properties deleted file mode 100644 index 10dcc3fb..00000000 --- a/resources/assets/illus/lang/en_US.properties +++ /dev/null @@ -1,95 +0,0 @@ -# IllustriousElements Language Properties -# @author DarkGuardsman - -# Blocks -tile.colorSand.Black.name = Black Sand -tile.colorSand.Red.name = Red Sand -tile.colorSand.Green.name = Green Sand -tile.colorSand.Brown.name = Brown Sand -tile.colorSand.Blue.name = Blue Sand -tile.colorSand.Purple.name = Purple Sand -tile.colorSand.Cyan.name = Cyan Sand -tile.colorSand.Silver.name = Silver Sand -tile.colorSand.Gray.name = Grey Sand -tile.colorSand.Pink.name = Pink Sand -tile.colorSand.Lime.name = Lime Sand -tile.colorSand.Yellow.name = Yellow Sand -tile.colorSand.LightBlue.name = Light Blue Sand -tile.colorSand.Magenta.name = Magenta Sand -tile.colorSand.Orange.name = Orange Sand -tile.colorSand.White.name = White Sand - -tile.GlowGlass.Black.name = Black Glowing Glass -tile.GlowGlass.Red.name = Red Glowing Glass -tile.GlowGlass.Green.name = Green Glowing Glass -tile.GlowGlass.Brown.name = Brown Glowing Glass -tile.GlowGlass.Blue.name = Blue Glowing Glass -tile.GlowGlass.Purple.name = Purple Glowing Glass -tile.GlowGlass.Cyan.name = Cyan Glowing Glass -tile.GlowGlass.Silver.name = Silver Glowing Glass -tile.GlowGlass.Gray.name = Grey Glowing Glass -tile.GlowGlass.Pink.name = Pink SGlowing Glass -tile.GlowGlass.Lime.name = Lime Glowing Glass -tile.GlowGlass.Yellow.name = Yellow Glowing Glass -tile.GlowGlass.LightBlue.name = Light Blue Glowing Glass -tile.GlowGlass.Magenta.name = Magenta Glowing Glass -tile.GlowGlass.Orange.name = Orange Glowing Glass -tile.GlowGlass.White.name = White Glowing Glass - -tile.StainedGlass.Black.name = Black Glass -tile.StainedGlass.Red.name = Red Glass -tile.StainedGlass.Green.name = Green Glass -tile.StainedGlass.Brown.name = Brown Glass -tile.StainedGlass.Blue.name = Blue Glass -tile.StainedGlass.Purple.name = Purple Glass -tile.StainedGlass.Cyan.name = Cyan Glass -tile.StainedGlass.Silver.name = Silver Glass -tile.StainedGlass.Gray.name = Grey Glass -tile.StainedGlass.Pink.name = Pink Glass -tile.StainedGlass.Lime.name = Lime GGlass -tile.StainedGlass.Yellow.name = Yellow Glass -tile.StainedGlass.LightBlue.name = Light Blue Glass -tile.StainedGlass.Magenta.name = Magenta Glass -tile.StainedGlass.Orange.name = Orange Glass -tile.StainedGlass.White.name = White Glass - -tile.basalt.name = Basalt -tile.basaltcobble.name = Basalt CobbleStone -tile.basaltbrick.name = Basalt Bricks -tile.basaltchiseled.name = Chiseled Basalt Bricks -tile.basaltmossy.name = Mossy Basalt Bricks -tile.basaltcracked.name = Cracked Basalt Bricks - -item.GlowRefinedSand.Black.name = Black Glowing Refined Sand -item.GlowRefinedSand.Red.name = Red Glowing Refined Sand -item.GlowRefinedSand.Green.name = Green Glowing Refined Sand -item.GlowRefinedSand.Brown.name = Brown Glowing Refined Sand -item.GlowRefinedSand.Blue.name = Blue Glowing Refined Sand -item.GlowRefinedSand.Purple.name = Purple Glowing Refined Sand -item.GlowRefinedSand.Cyan.name = Cyan Glowing Refined Sand -item.GlowRefinedSand.Silver.name = Silver Glowing Refined Sand -item.GlowRefinedSand.Gray.name = Grey Glowing Refined Sand -item.GlowRefinedSand.Pink.name = Pink Glowing Refined Sand -item.GlowRefinedSand.Lime.name = Lime Glowing Refined Sand -item.GlowRefinedSand.Yellow.name = Yellow Glowing Refined Sand -item.GlowRefinedSand.Light Blue.name = Light Blue Glowing Refined Sand -item.GlowRefinedSand.Magenta.name = Magenta Glowing Refined Sand -item.GlowRefinedSand.Orange.name = Orange Glowing Refined Sand -item.GlowRefinedSand.White.name = White Glowing Refined Sand - -item.RefinedSand.Black.name = Black Refined Sand -item.RefinedSand.Red.name = Red Refined Sand -item.RefinedSand.Green.name = Green Refined Sand -item.RefinedSand.Brown.name = Brown Refined Sand -item.RefinedSand.Blue.name = Blue Refined Sand -item.RefinedSand.Purple.name = Purple Refined Sand -item.RefinedSand.Cyan.name = Cyan Refined Sand -item.RefinedSand.Silver.name = Silver Refined Sand -item.RefinedSand.Gray.name = Grey Refined Sand -item.RefinedSand.Pink.name = Pink Refined Sand -item.RefinedSand.Lime.name = Lime Refined Sand -item.RefinedSand.Yellow.name = Yellow Refined Sand -item.RefinedSand.Light Blue.name = Light Blue Refined Sand -item.RefinedSand.Magenta.name = Magenta Refined Sand -item.RefinedSand.Orange.name = Orange Refined Sand -item.RefinedSand.White.name = White Refined Sand \ No newline at end of file diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 6ccb2c46..e0e52b22 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -14,9 +14,11 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.compatibility.Compatibility; import universalelectricity.core.UniversalElectricity; +import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.ore.OreGenReplaceStone; import universalelectricity.prefab.ore.OreGenerator; +import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -51,6 +53,7 @@ import dark.core.prefab.BlockMulti; import dark.core.prefab.ModPrefab; import dark.core.prefab.TileEntityMulti; import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.items.ItemBlockHolder; /** @author HangCow, DarkGuardsman */ @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true) @@ -151,7 +154,7 @@ public class DarkMain extends ModPrefab OreDictionary.registerOre("unfinishedTank", new ItemStack(CoreRecipeLoader.itemParts, 1, Parts.Tank.ordinal())); } - + FMLLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); proxy.init(); } @@ -194,7 +197,7 @@ public class DarkMain extends ModPrefab dataList.add(new BlockData(CoreRecipeLoader.blockGlowGlass, ItemBlockColored.class, "stainGlowGlass")); dataList.add(new BlockData(CoreRecipeLoader.blockOre, ItemBlockOre.class, "DMOre")); dataList.add(new BlockData(CoreRecipeLoader.blockWire, "DMWire")); - dataList.add(new BlockData(CoreRecipeLoader.blockDebug, "DMDebug")); + dataList.add(new BlockData(CoreRecipeLoader.blockDebug, ItemBlockHolder.class, "DMDebug")); dataList.add(new BlockData(blockMulti, "DMDMultiBlock").addTileEntity("DMMultiBlock", TileEntityMulti.class).canDisable(false)); /* ITEMS */ if (CONFIGURATION.get("general", "LoadOreItems", true, "Only disable ore items if you have another mod that provides metal dust, ingots, and plates").getBoolean(true))