Rename fluids
This commit is contained in:
modmuss50
parent
b3002b6f57
commit
1be2752b72
3 changed files with 69 additions and 69 deletions
|
|
@ -35,106 +35,106 @@ import techreborn.lib.ModInfo;
|
|||
|
||||
public class ModFluids {
|
||||
|
||||
public static Fluid BERYLLIUM = new TechRebornFluid("fluidberylium");
|
||||
public static Fluid BERYLLIUM = new TechRebornFluid("berylium");
|
||||
public static BlockFluidTechReborn BLOCK_BERYLLIUM;
|
||||
|
||||
public static Fluid CALCIUM = new TechRebornFluid("fluidcalcium");
|
||||
public static Fluid CALCIUM = new TechRebornFluid("calcium");
|
||||
public static BlockFluidTechReborn BLOCK_CALCIUM;
|
||||
|
||||
public static Fluid CALCIUM_CARBONATE = new TechRebornFluid("fluidcalciumcarbonate");
|
||||
public static Fluid CALCIUM_CARBONATE = new TechRebornFluid("calciumcarbonate");
|
||||
public static BlockFluidTechReborn BLOCK_CALCIUM_CARBONATE;
|
||||
|
||||
public static Fluid CHLORITE = new TechRebornFluid("fluidchlorite");
|
||||
public static Fluid CHLORITE = new TechRebornFluid("chlorite");
|
||||
public static BlockFluidTechReborn BLOCK_CHLORITE;
|
||||
|
||||
public static Fluid DEUTERIUM = new TechRebornFluid("fluiddeuterium");
|
||||
public static Fluid DEUTERIUM = new TechRebornFluid("deuterium");
|
||||
public static BlockFluidTechReborn BLOCK_DEUTERIUM;
|
||||
|
||||
public static Fluid GLYCERYL = new TechRebornFluid("fluidglyceryl");
|
||||
public static Fluid GLYCERYL = new TechRebornFluid("glyceryl");
|
||||
public static BlockFluidTechReborn BLOCK_GLYCERYL;
|
||||
|
||||
public static Fluid HELIUM = new TechRebornFluid("fluidhelium");
|
||||
public static Fluid HELIUM = new TechRebornFluid("helium");
|
||||
public static BlockFluidTechReborn BLOCK_HELIUM;
|
||||
|
||||
public static Fluid HELIUM_3 = new TechRebornFluid("fluidhelium3");
|
||||
public static Fluid HELIUM_3 = new TechRebornFluid("helium3");
|
||||
public static BlockFluidTechReborn BLOCK_HELIUM_3;
|
||||
|
||||
public static Fluid HELIUMPLASMA = new TechRebornFluid("fluidheliumplasma");
|
||||
public static Fluid HELIUMPLASMA = new TechRebornFluid("heliumplasma");
|
||||
public static BlockFluidTechReborn BLOCK_HELIUMPLASMA;
|
||||
|
||||
public static Fluid HYDROGEN = new TechRebornFluid("fluidhydrogen");
|
||||
public static Fluid HYDROGEN = new TechRebornFluid("hydrogen");
|
||||
public static BlockFluidTechReborn BLOCK_HYDROGEN;
|
||||
|
||||
public static Fluid LITHIUM = new TechRebornFluid("fluidlithium");
|
||||
public static Fluid LITHIUM = new TechRebornFluid("lithium");
|
||||
public static BlockFluidTechReborn BLOCK_LITHIUM;
|
||||
|
||||
public static Fluid MERCURY = new TechRebornFluid("fluidmercury");
|
||||
public static Fluid MERCURY = new TechRebornFluid("mercury");
|
||||
public static BlockFluidTechReborn BLOCK_MERCURY;
|
||||
|
||||
public static Fluid METHANE = new TechRebornFluid("fluidmethane");
|
||||
public static Fluid METHANE = new TechRebornFluid("methane");
|
||||
public static BlockFluidTechReborn BLOCK_METHANE;
|
||||
|
||||
public static Fluid NITROCOAL_FUEL = new TechRebornFluid("fluidnitrocoalfuel");
|
||||
public static Fluid NITROCOAL_FUEL = new TechRebornFluid("nitrocoalfuel");
|
||||
public static BlockFluidTechReborn BLOCK_NITROCOAL_FUEL;
|
||||
|
||||
public static Fluid NITROFUEL = new TechRebornFluid("fluidnitrofuel");
|
||||
public static Fluid NITROFUEL = new TechRebornFluid("nitrofuel");
|
||||
public static BlockFluidTechReborn BLOCK_NITROFUEL;
|
||||
|
||||
public static Fluid NITROGEN = new TechRebornFluid("fluidnitrogen");
|
||||
public static Fluid NITROGEN = new TechRebornFluid("nitrogen");
|
||||
public static BlockFluidTechReborn BLOCK_NITROGEN;
|
||||
|
||||
public static Fluid NITROGENDIOXIDE = new TechRebornFluid("fluidnitrogendioxide");
|
||||
public static Fluid NITROGENDIOXIDE = new TechRebornFluid("nitrogendioxide");
|
||||
public static BlockFluidTechReborn BLOCK_NITROGENDIOXIDE;
|
||||
|
||||
public static Fluid POTASSIUM = new TechRebornFluid("fluidpotassium");
|
||||
public static Fluid POTASSIUM = new TechRebornFluid("potassium");
|
||||
public static BlockFluidTechReborn BLOCK_POTASSIUM;
|
||||
|
||||
public static Fluid SILICON = new TechRebornFluid("fluidsilicon");
|
||||
public static Fluid SILICON = new TechRebornFluid("silicon");
|
||||
public static BlockFluidTechReborn BLOCK_SILICON;
|
||||
|
||||
public static Fluid SODIUM = new TechRebornFluid("fluidsodium");
|
||||
public static Fluid SODIUM = new TechRebornFluid("sodium");
|
||||
public static BlockFluidTechReborn BLOCK_SODIUM;
|
||||
|
||||
public static Fluid SODIUMPERSULFATE = new TechRebornFluid("fluidsodiumpersulfate");
|
||||
public static Fluid SODIUMPERSULFATE = new TechRebornFluid("sodiumpersulfate");
|
||||
public static BlockFluidTechReborn BLOCK_SODIUMPERSULFATE;
|
||||
|
||||
public static Fluid TRITIUM = new TechRebornFluid("fluidtritium");
|
||||
public static Fluid TRITIUM = new TechRebornFluid("tritium");
|
||||
public static BlockFluidTechReborn BLOCK_TRITIUM;
|
||||
|
||||
public static Fluid WOLFRAMIUM = new TechRebornFluid("fluidwolframium");
|
||||
public static Fluid WOLFRAMIUM = new TechRebornFluid("wolframium");
|
||||
public static BlockFluidTechReborn BLOCK_WOLFRAMIUM;
|
||||
|
||||
public static Fluid CARBON = new TechRebornFluid("fluidcarbon");
|
||||
public static Fluid CARBON = new TechRebornFluid("carbon");
|
||||
public static BlockFluidTechReborn BLOCK_CARBON;
|
||||
|
||||
public static Fluid CARBON_FIBER = new TechRebornFluid("fluidcarbonfiber");
|
||||
public static Fluid CARBON_FIBER = new TechRebornFluid("carbonfiber");
|
||||
public static BlockFluidTechReborn BLOCK_CARBON_FIBER;
|
||||
|
||||
public static Fluid NITRO_CARBON = new TechRebornFluid("fluidnitrocarbon");
|
||||
public static Fluid NITRO_CARBON = new TechRebornFluid("nitrocarbon");
|
||||
public static BlockFluidTechReborn BLOCK_NITRO_CARBON;
|
||||
|
||||
public static Fluid SULFUR = new TechRebornFluid("fluidSulfur");
|
||||
public static Fluid SULFUR = new TechRebornFluid("Sulfur");
|
||||
public static BlockFluidTechReborn BLOCK_SULFUR;
|
||||
|
||||
public static Fluid SODIUM_SULFIDE = new TechRebornFluid("fluidsodiumSulfide");
|
||||
public static Fluid SODIUM_SULFIDE = new TechRebornFluid("sodiumSulfide");
|
||||
public static BlockFluidTechReborn BLOCK_SODIUM_SULFIDE;
|
||||
|
||||
public static Fluid DIESEL = new TechRebornFluid("fluiddiesel");
|
||||
public static Fluid DIESEL = new TechRebornFluid("diesel");
|
||||
public static BlockFluidTechReborn BLOCK_DIESEL;
|
||||
|
||||
public static Fluid NITRO_DIESEL = new TechRebornFluid("fluidnitrodiesel");
|
||||
public static Fluid NITRO_DIESEL = new TechRebornFluid("nitrodiesel");
|
||||
public static BlockFluidTechReborn BLOCK_NITRO_DIESEL;
|
||||
|
||||
public static Fluid OIL = new TechRebornFluid("fluidoil");
|
||||
public static Fluid OIL = new TechRebornFluid("oil");
|
||||
public static BlockFluidTechReborn BLOCK_OIL;
|
||||
|
||||
public static Fluid SULFURIC_ACID = new TechRebornFluid("fluidsulfuricacid");
|
||||
public static Fluid SULFURIC_ACID = new TechRebornFluid("sulfuricacid");
|
||||
public static BlockFluidTechReborn BLOCK_SULFURIC_ACID;
|
||||
|
||||
public static Fluid COMPRESSED_AIR = new TechRebornFluid("fluidcompressedair");
|
||||
public static Fluid COMPRESSED_AIR = new TechRebornFluid("compressedair");
|
||||
public static BlockFluidTechReborn BLOCK_COMPRESSED_AIR;
|
||||
|
||||
public static Fluid ELECTROLYZED_WATER = new TechRebornFluid("fluidelectrolyzedwater");
|
||||
public static Fluid ELECTROLYZED_WATER = new TechRebornFluid("electrolyzedwater");
|
||||
public static BlockFluidTechReborn BLOCK_ELECTROLYZED_WATER;
|
||||
|
||||
public static void init() {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public class ItemCells {
|
|||
if (fluid == null) {
|
||||
fluid = FluidRegistry.getFluid(name.toLowerCase());
|
||||
if (fluid == null) {
|
||||
fluid = FluidRegistry.getFluid("fluid" + StringUtils.toFirstCapital(name.toLowerCase()));
|
||||
fluid = FluidRegistry.getFluid(name.toLowerCase());
|
||||
}
|
||||
}
|
||||
Validate.notNull(fluid, "The fluid " + name + " could not be found");
|
||||
|
|
|
|||
|
|
@ -5,204 +5,204 @@
|
|||
},
|
||||
"variants": {
|
||||
"techreborn.berylium": [{
|
||||
"custom": { "fluid": "fluidberylium" }
|
||||
"custom": { "fluid": "berylium" }
|
||||
}],
|
||||
"techreborn.calcium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidcalcium"
|
||||
"fluid": "calcium"
|
||||
}
|
||||
},
|
||||
"techreborn.calciumcarbonate": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidcalciumcarbonate"
|
||||
"fluid": "calciumcarbonate"
|
||||
}
|
||||
},
|
||||
"techreborn.carbon": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidcarbon"
|
||||
"fluid": "carbon"
|
||||
}
|
||||
},
|
||||
"techreborn.carbonfiber": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidcarbonfiber"
|
||||
"fluid": "carbonfiber"
|
||||
}
|
||||
},
|
||||
"techreborn.chlorite": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidchlorite"
|
||||
"fluid": "chlorite"
|
||||
}
|
||||
},
|
||||
"techreborn.compressedair": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidcompressedair"
|
||||
"fluid": "compressedair"
|
||||
}
|
||||
},
|
||||
"techreborn.deuterium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluiddeuterium"
|
||||
"fluid": "deuterium"
|
||||
}
|
||||
},
|
||||
"techreborn.diesel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluiddiesel"
|
||||
"fluid": "diesel"
|
||||
}
|
||||
},
|
||||
"techreborn.electrolyzedwater": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidelectrolyzedwater"
|
||||
"fluid": "electrolyzedwater"
|
||||
}
|
||||
},
|
||||
"techreborn.glyceryl": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidglyceryl"
|
||||
"fluid": "glyceryl"
|
||||
}
|
||||
},
|
||||
"techreborn.helium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidhelium"
|
||||
"fluid": "helium"
|
||||
}
|
||||
},
|
||||
"techreborn.helium3": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidhelium3"
|
||||
"fluid": "helium3"
|
||||
}
|
||||
},
|
||||
"techreborn.heliumplasma": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidheliumplasma"
|
||||
"fluid": "heliumplasma"
|
||||
}
|
||||
},
|
||||
"techreborn.hydrogen": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidhydrogen"
|
||||
"fluid": "hydrogen"
|
||||
}
|
||||
},
|
||||
"techreborn.lithium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidlithium"
|
||||
"fluid": "lithium"
|
||||
}
|
||||
},
|
||||
"techreborn.mercury": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidmercury"
|
||||
"fluid": "mercury"
|
||||
}
|
||||
},
|
||||
"techreborn.methane": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidmethane"
|
||||
"fluid": "methane"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrocarbon": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrocarbon"
|
||||
"fluid": "nitrocarbon"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrocoalfuel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrocoalfuel"
|
||||
"fluid": "nitrocoalfuel"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrodiesel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrodiesel"
|
||||
"fluid": "nitrodiesel"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrofuel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrofuel"
|
||||
"fluid": "nitrofuel"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrogen": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrogen"
|
||||
"fluid": "nitrogen"
|
||||
}
|
||||
},
|
||||
"techreborn.nitrogendioxide": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidnitrogendioxide"
|
||||
"fluid": "nitrogendioxide"
|
||||
}
|
||||
},
|
||||
"techreborn.oil": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidoil"
|
||||
"fluid": "oil"
|
||||
}
|
||||
},
|
||||
"techreborn.potassium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidpotassium"
|
||||
"fluid": "potassium"
|
||||
}
|
||||
},
|
||||
"techreborn.silicon": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsilicon"
|
||||
"fluid": "silicon"
|
||||
}
|
||||
},
|
||||
"techreborn.sodium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsodium"
|
||||
"fluid": "sodium"
|
||||
}
|
||||
},
|
||||
"techreborn.sodiumpersulfate": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsodiumpersulfate"
|
||||
"fluid": "sodiumpersulfate"
|
||||
}
|
||||
},
|
||||
"techreborn.sodiumsulfide": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsodiumsulfide"
|
||||
"fluid": "sodiumsulfide"
|
||||
}
|
||||
},
|
||||
"techreborn.sulfur": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsulfur"
|
||||
"fluid": "sulfur"
|
||||
}
|
||||
},
|
||||
"techreborn.sulfuricacid": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidsulfuricacid"
|
||||
"fluid": "sulfuricacid"
|
||||
}
|
||||
},
|
||||
"techreborn.tritium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidtritium"
|
||||
"fluid": "tritium"
|
||||
}
|
||||
},
|
||||
"techreborn.wolframium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": {
|
||||
"fluid": "fluidwolframium"
|
||||
"fluid": "wolframium"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue