Skip to content

Commit

Permalink
Standarize fluid names
Browse files Browse the repository at this point in the history
  • Loading branch information
@mDiyo
mDiyo committed Oct 5, 2013
1 parent 3c4b0de commit c4e1f21
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 66 deletions.
48 changes: 24 additions & 24 deletions resources/assets/tinker/lang/en_US.xml
View file
Expand Up @@ -472,29 +472,29 @@
<entry key="toolpart.ArrowHead">Arrowhead</entry>
<entry key="toolpart.Fletching">Fletching</entry>

<entry key="molten iron">Molten Iron</entry>
<entry key="molten gold">Molten Gold</entry>
<entry key="molten copper">Molten Copper</entry>
<entry key="molten tin">Molten Tin</entry>
<entry key="molten aluminum">Molten Aluminum</entry>
<entry key="molten cobalt">Molten Cobalt</entry>
<entry key="molten ardite">Molten Ardite</entry>
<entry key="molten bronze">Molten Bronze</entry>
<entry key="molten aluminum brass">Molten Aluminum Brass</entry>
<entry key="molten manyullyn">Molten Manyullyn</entry>
<entry key="molten alumite">Molten Alumite</entry>
<entry key="molten obsidian">Molten Obsidian</entry>
<entry key="molten steel">Molten Steel</entry>
<entry key="molten glass">Molten Glass</entry>
<entry key="seared stone">Seared Stone</entry>
<entry key="liquified emerald">Liquified Emerald</entry>
<entry key="blood">Blood</entry>
<entry key="molten nickel">Molten Nickel</entry>
<entry key="molten lead">Molten Lead</entry>
<entry key="molten silver">Molten Silver</entry>
<entry key="molten platinum">Molten Platinum</entry>
<entry key="molten invar">Molten Invar</entry>
<entry key="molten shiny">Molten Shiny</entry>
<entry key="ender">Liquid Ender</entry>
<entry key="fluid.iron.molten">Molten Iron</entry>
<entry key="fluid.gold.molten">Molten Gold</entry>
<entry key="fluid.copper.molten">Molten Copper</entry>
<entry key="fluid.tin.molten">Molten Tin</entry>
<entry key="fluid.aluminum.molten">Molten Aluminum</entry>
<entry key="fluid.cobalt.molten">Molten Cobalt</entry>
<entry key="fluid.ardite.molten">Molten Ardite</entry>
<entry key="fluid.bronze.molten">Molten Bronze</entry>
<entry key="fluid.aluminumbrass.molten">Molten Aluminum Brass</entry>
<entry key="fluid.manyullyn.molten">Molten Manyullyn</entry>
<entry key="fluid.alumite.molten">Molten Alumite</entry>
<entry key="fluid.obsidian.molten">Molten Obsidian</entry>
<entry key="fluid.steel.molten">Molten Steel</entry>
<entry key="fluid.glass.molten">Molten Glass</entry>
<entry key="fluid.stone.seared">Seared Stone</entry>
<entry key="fluid.emerald.liquid">Liquified Emerald</entry>
<entry key="fluid.blood">Blood</entry>
<entry key="fluid.nickel.molten">Molten Nickel</entry>
<entry key="fluid.lead.molten">Molten Lead</entry>
<entry key="fluid.silver.molten">Molten Silver</entry>
<entry key="fluid.platinum.molten">Molten Platinum</entry>
<entry key="fluid.invar">Molten Invar</entry>
<entry key="fluid.shiny">Molten Shiny</entry>
<entry key="fluid.ender">Liquid Ender</entry>

</properties>
53 changes: 29 additions & 24 deletions src/tconstruct/common/TContent.java
View file
Expand Up @@ -132,6 +132,7 @@ public class TContent implements IFuelHandler
public static Block searedBlock;
public static Block castingChannel;
public static Block metalBlock;
public static Block tankAir;

public static Block redstoneMachine;
public static Block dryingRack;
Expand Down Expand Up @@ -402,6 +403,10 @@ void registerBlocks()
castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel");
GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel");
GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel");

tankAir = new TankAirBlock(PHConstruct.airTank, Material.air).setUnlocalizedName("tconstruct.tank.air");
GameRegistry.registerBlock(tankAir, "TankAir");
GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air");

//Redstone machines
redstoneMachine = new RedstoneMachine(PHConstruct.redstoneMachine).setUnlocalizedName("Redstone.Machine");
Expand Down Expand Up @@ -438,7 +443,7 @@ void registerBlocks()
//Liquids
liquidMetal = new MaterialLiquid(MapColor.tntColor);

moltenIronFluid = new Fluid("Molten Iron");
moltenIronFluid = new Fluid("fluid.iron.molten");
FluidRegistry.registerFluid(moltenIronFluid);
moltenIron = new LiquidMetalFinite(PHConstruct.moltenIron, moltenIronFluid, "liquid_iron").setUnlocalizedName("metal.molten.iron");
GameRegistry.registerBlock(moltenIron, "metal.molten.iron");
Expand All @@ -447,7 +452,7 @@ void registerBlocks()
fluidBlocks[0] = moltenIron;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenIronFluid, 1000), new ItemStack(buckets, 1, 0), new ItemStack(Item.bucketEmpty)));

moltenGoldFluid = new Fluid("Molten Gold");
moltenGoldFluid = new Fluid("fluid.gold.molten");
FluidRegistry.registerFluid(moltenGoldFluid);
moltenGold = new LiquidMetalFinite(PHConstruct.moltenGold, moltenGoldFluid, "liquid_gold").setUnlocalizedName("metal.molten.gold");
GameRegistry.registerBlock(moltenGold, "metal.molten.gold");
Expand All @@ -456,7 +461,7 @@ void registerBlocks()
fluidBlocks[1] = moltenGold;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGoldFluid, 1000), new ItemStack(buckets, 1, 1), new ItemStack(Item.bucketEmpty)));

moltenCopperFluid = new Fluid("Molten Copper");
moltenCopperFluid = new Fluid("fluid.copper.molten");
FluidRegistry.registerFluid(moltenCopperFluid);
moltenCopper = new LiquidMetalFinite(PHConstruct.moltenCopper, moltenCopperFluid, "liquid_copper").setUnlocalizedName("metal.molten.copper");
GameRegistry.registerBlock(moltenCopper, "metal.molten.copper");
Expand All @@ -465,7 +470,7 @@ void registerBlocks()
fluidBlocks[2] = moltenCopper;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCopperFluid, 1000), new ItemStack(buckets, 1, 2), new ItemStack(Item.bucketEmpty)));

moltenTinFluid = new Fluid("Molten Tin");
moltenTinFluid = new Fluid("fluid.tin.molten");
FluidRegistry.registerFluid(moltenTinFluid);
moltenTin = new LiquidMetalFinite(PHConstruct.moltenTin, moltenTinFluid, "liquid_tin").setUnlocalizedName("metal.molten.tin");
GameRegistry.registerBlock(moltenTin, "metal.molten.tin");
Expand All @@ -474,7 +479,7 @@ void registerBlocks()
fluidBlocks[3] = moltenTin;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenTinFluid, 1000), new ItemStack(buckets, 1, 3), new ItemStack(Item.bucketEmpty)));

moltenAluminumFluid = new Fluid("Molten Aluminum");
moltenAluminumFluid = new Fluid("fluid.aluminum.molten");
FluidRegistry.registerFluid(moltenAluminumFluid);
moltenAluminum = new LiquidMetalFinite(PHConstruct.moltenAluminum, moltenAluminumFluid, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum");
GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum");
Expand All @@ -483,7 +488,7 @@ void registerBlocks()
fluidBlocks[4] = moltenAluminum;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAluminumFluid, 1000), new ItemStack(buckets, 1, 4), new ItemStack(Item.bucketEmpty)));

moltenCobaltFluid = new Fluid("Molten Cobalt");
moltenCobaltFluid = new Fluid("fluid.cobalt.molten");
FluidRegistry.registerFluid(moltenCobaltFluid);
moltenCobalt = new LiquidMetalFinite(PHConstruct.moltenCobalt, moltenCobaltFluid, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt");
GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt");
Expand All @@ -492,7 +497,7 @@ void registerBlocks()
fluidBlocks[5] = moltenCobalt;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCobaltFluid, 1000), new ItemStack(buckets, 1, 5), new ItemStack(Item.bucketEmpty)));

moltenArditeFluid = new Fluid("Molten Ardite");
moltenArditeFluid = new Fluid("fluid.ardite.molten");
FluidRegistry.registerFluid(moltenArditeFluid);
moltenArdite = new LiquidMetalFinite(PHConstruct.moltenArdite, moltenArditeFluid, "liquid_ardite").setUnlocalizedName("metal.molten.ardite");
GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite");
Expand All @@ -501,7 +506,7 @@ void registerBlocks()
fluidBlocks[6] = moltenArdite;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenArditeFluid, 1000), new ItemStack(buckets, 1, 6), new ItemStack(Item.bucketEmpty)));

moltenBronzeFluid = new Fluid("Molten Bronze");
moltenBronzeFluid = new Fluid("fluid.bronze.molten");
FluidRegistry.registerFluid(moltenBronzeFluid);
moltenBronze = new LiquidMetalFinite(PHConstruct.moltenBronze, moltenBronzeFluid, "liquid_bronze").setUnlocalizedName("metal.molten.bronze");
GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze");
Expand All @@ -510,7 +515,7 @@ void registerBlocks()
fluidBlocks[7] = moltenBronze;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenBronzeFluid, 1000), new ItemStack(buckets, 1, 7), new ItemStack(Item.bucketEmpty)));

moltenAlubrassFluid = new Fluid("Molten Aluminum Brass");
moltenAlubrassFluid = new Fluid("fluid.aluminumbrass.molten");
FluidRegistry.registerFluid(moltenAlubrassFluid);
moltenAlubrass = new LiquidMetalFinite(PHConstruct.moltenAlubrass, moltenAlubrassFluid, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass");
GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass");
Expand All @@ -519,7 +524,7 @@ void registerBlocks()
fluidBlocks[8] = moltenAlubrass;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlubrassFluid, 1000), new ItemStack(buckets, 1, 8), new ItemStack(Item.bucketEmpty)));

moltenManyullynFluid = new Fluid("Molten Manyullyn");
moltenManyullynFluid = new Fluid("fluid.manyullyn.molten");
FluidRegistry.registerFluid(moltenManyullynFluid);
moltenManyullyn = new LiquidMetalFinite(PHConstruct.moltenManyullyn, moltenManyullynFluid, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn");
GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn");
Expand All @@ -528,7 +533,7 @@ void registerBlocks()
fluidBlocks[9] = moltenManyullyn;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenManyullynFluid, 1000), new ItemStack(buckets, 1, 9), new ItemStack(Item.bucketEmpty)));

moltenAlumiteFluid = new Fluid("Molten Alumite");
moltenAlumiteFluid = new Fluid("fluid.alumite.molten");
FluidRegistry.registerFluid(moltenAlumiteFluid);
moltenAlumite = new LiquidMetalFinite(PHConstruct.moltenAlumite, moltenAlumiteFluid, "liquid_alumite").setUnlocalizedName("metal.molten.alumite");
GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite");
Expand All @@ -537,7 +542,7 @@ void registerBlocks()
fluidBlocks[10] = moltenAlumite;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlumiteFluid, 1000), new ItemStack(buckets, 1, 10), new ItemStack(Item.bucketEmpty)));

moltenObsidianFluid = new Fluid("Molten Obsidian");
moltenObsidianFluid = new Fluid("fluid.obsidian.molten");
FluidRegistry.registerFluid(moltenObsidianFluid);
moltenObsidian = new LiquidMetalFinite(PHConstruct.moltenObsidian, moltenObsidianFluid, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian");
GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian");
Expand All @@ -546,7 +551,7 @@ void registerBlocks()
fluidBlocks[11] = moltenObsidian;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenObsidianFluid, 1000), new ItemStack(buckets, 1, 11), new ItemStack(Item.bucketEmpty)));

moltenSteelFluid = new Fluid("Molten Steel");
moltenSteelFluid = new Fluid("fluid.steel.molten");
FluidRegistry.registerFluid(moltenSteelFluid);
moltenSteel = new LiquidMetalFinite(PHConstruct.moltenSteel, moltenSteelFluid, "liquid_steel").setUnlocalizedName("metal.molten.steel");
GameRegistry.registerBlock(moltenSteel, "metal.molten.steel");
Expand All @@ -555,7 +560,7 @@ void registerBlocks()
fluidBlocks[12] = moltenSteel;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSteelFluid, 1000), new ItemStack(buckets, 1, 12), new ItemStack(Item.bucketEmpty)));

moltenGlassFluid = new Fluid("Molten Glass");
moltenGlassFluid = new Fluid("fluid.glass.molten");
FluidRegistry.registerFluid(moltenGlassFluid);
moltenGlass = new LiquidMetalFinite(PHConstruct.moltenGlass, moltenGlassFluid, "liquid_glass").setUnlocalizedName("metal.molten.glass");
GameRegistry.registerBlock(moltenGlass, "metal.molten.glass");
Expand All @@ -564,7 +569,7 @@ void registerBlocks()
fluidBlocks[13] = moltenGlass;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGlassFluid, 1000), new ItemStack(buckets, 1, 13), new ItemStack(Item.bucketEmpty)));

moltenStoneFluid = new Fluid("Seared Stone");
moltenStoneFluid = new Fluid("fluid.stone.seared");
FluidRegistry.registerFluid(moltenStoneFluid);
moltenStone = new LiquidMetalFinite(PHConstruct.moltenStone, moltenStoneFluid, "liquid_stone").setUnlocalizedName("molten.stone");
GameRegistry.registerBlock(moltenStone, "molten.stone");
Expand All @@ -573,7 +578,7 @@ void registerBlocks()
fluidBlocks[14] = moltenStone;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenStoneFluid, 1000), new ItemStack(buckets, 1, 14), new ItemStack(Item.bucketEmpty)));

moltenEmeraldFluid = new Fluid("Liquified Emerald");
moltenEmeraldFluid = new Fluid("fluid.emerald.liquid");
FluidRegistry.registerFluid(moltenEmeraldFluid);
moltenEmerald = new LiquidMetalFinite(PHConstruct.moltenEmerald, moltenEmeraldFluid, "liquid_villager").setUnlocalizedName("molten.emerald");
GameRegistry.registerBlock(moltenEmerald, "molten.emerald");
Expand All @@ -582,7 +587,7 @@ void registerBlocks()
fluidBlocks[15] = moltenEmerald;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEmeraldFluid, 1000), new ItemStack(buckets, 1, 15), new ItemStack(Item.bucketEmpty)));

bloodFluid = new Fluid("Blood");
bloodFluid = new Fluid("fluid.blood");
FluidRegistry.registerFluid(bloodFluid);
blood = new LiquidMetalFinite(PHConstruct.blood, bloodFluid, "liquid_cow").setUnlocalizedName("liquid.blood");
GameRegistry.registerBlock(blood, "liquid.blood");
Expand All @@ -591,7 +596,7 @@ void registerBlocks()
fluidBlocks[16] = blood;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(bloodFluid, 1000), new ItemStack(buckets, 1, 16), new ItemStack(Item.bucketEmpty)));

moltenNickelFluid = new Fluid("nickel.molten");
moltenNickelFluid = new Fluid("fluid.nickel.molten");
FluidRegistry.registerFluid(moltenNickelFluid);
moltenNickel = new LiquidMetalFinite(PHConstruct.moltenNickel, moltenNickelFluid, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel");
GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel");
Expand All @@ -600,7 +605,7 @@ void registerBlocks()
fluidBlocks[17] = moltenNickel;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1000), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty)));

moltenLeadFluid = new Fluid("lead.molten");
moltenLeadFluid = new Fluid("fluid.lead.molten");
FluidRegistry.registerFluid(moltenLeadFluid);
moltenLead = new LiquidMetalFinite(PHConstruct.moltenLead, moltenLeadFluid, "liquid_lead").setUnlocalizedName("metal.molten.lead");
GameRegistry.registerBlock(moltenLead, "metal.molten.lead");
Expand All @@ -609,7 +614,7 @@ void registerBlocks()
fluidBlocks[18] = moltenLead;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1000), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty)));

moltenSilverFluid = new Fluid("silver.molten");
moltenSilverFluid = new Fluid("fluid.silver.molten");
FluidRegistry.registerFluid(moltenSilverFluid);
moltenSilver = new LiquidMetalFinite(PHConstruct.moltenSilver, moltenSilverFluid, "liquid_silver").setUnlocalizedName("metal.molten.silver");
GameRegistry.registerBlock(moltenSilver, "metal.molten.silver");
Expand All @@ -618,7 +623,7 @@ void registerBlocks()
fluidBlocks[19] = moltenSilver;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1000), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty)));

moltenShinyFluid = new Fluid("platinum.molten");
moltenShinyFluid = new Fluid("fluid.platinum.molten");
FluidRegistry.registerFluid(moltenShinyFluid);
moltenShiny = new LiquidMetalFinite(PHConstruct.moltenShiny, moltenShinyFluid, "liquid_shiny").setUnlocalizedName("metal.molten.shiny");
GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny");
Expand All @@ -627,7 +632,7 @@ void registerBlocks()
fluidBlocks[20] = moltenShiny;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1000), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty)));

moltenInvarFluid = new Fluid("invar.molten");
moltenInvarFluid = new Fluid("fluid.invar.molten");
FluidRegistry.registerFluid(moltenInvarFluid);
moltenInvar = new LiquidMetalFinite(PHConstruct.moltenInvar, moltenInvarFluid, "liquid_invar").setUnlocalizedName("metal.molten.invar");
GameRegistry.registerBlock(moltenInvar, "metal.molten.invar");
Expand All @@ -636,7 +641,7 @@ void registerBlocks()
fluidBlocks[21] = moltenInvar;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1000), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty)));

moltenElectrumFluid = new Fluid("electrum.molten");
moltenElectrumFluid = new Fluid("fluid.electrum.molten");
FluidRegistry.registerFluid(moltenElectrumFluid);
moltenElectrum = new LiquidMetalFinite(PHConstruct.moltenElectrum, moltenElectrumFluid, "liquid_electrum").setUnlocalizedName("metal.molten.electrum");
GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum");
Expand All @@ -645,7 +650,7 @@ void registerBlocks()
fluidBlocks[22] = moltenElectrum;
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1000), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty)));

moltenEnderFluid = new Fluid("ender");
moltenEnderFluid = new Fluid("fluid.ender");
FluidRegistry.registerFluid(moltenEnderFluid);
moltenEnder = new LiquidMetalFinite(PHConstruct.moltenEnder, moltenEnderFluid, "liquid_ender").setUnlocalizedName("liquid.ender");
GameRegistry.registerBlock(moltenEnder, "liquid.ender");
Expand Down

0 comments on commit c4e1f21

Please sign in to comment.