maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename fluids

Browse source
This commit is contained in:
modmuss50 2018-07-24 14:18:09 +01:00
parent b3002b6f57
commit 1be2752b72
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
3 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/techreborn/init/ModFluids.java
View file

@ -35,106 +35,106 @@ import techreborn.lib.ModInfo;
public class ModFluids { public class ModFluids {
public static Fluid BERYLLIUM = new TechRebornFluid("fluidberylium"); public static Fluid BERYLLIUM = new TechRebornFluid("berylium");
public static BlockFluidTechReborn BLOCK_BERYLLIUM; 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 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 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 BlockFluidTechReborn BLOCK_CHLORITE;
public static Fluid DEUTERIUM = new TechRebornFluid("fluiddeuterium"); public static Fluid DEUTERIUM = new TechRebornFluid("deuterium");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_GLYCERYL;
public static Fluid HELIUM = new TechRebornFluid("fluidhelium"); public static Fluid HELIUM = new TechRebornFluid("helium");
public static BlockFluidTechReborn BLOCK_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 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 BlockFluidTechReborn BLOCK_HELIUMPLASMA;
public static Fluid HYDROGEN = new TechRebornFluid("fluidhydrogen"); public static Fluid HYDROGEN = new TechRebornFluid("hydrogen");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_LITHIUM;
public static Fluid MERCURY = new TechRebornFluid("fluidmercury"); public static Fluid MERCURY = new TechRebornFluid("mercury");
public static BlockFluidTechReborn BLOCK_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 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 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 BlockFluidTechReborn BLOCK_NITROFUEL;
public static Fluid NITROGEN = new TechRebornFluid("fluidnitrogen"); public static Fluid NITROGEN = new TechRebornFluid("nitrogen");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_NITROGENDIOXIDE;
public static Fluid POTASSIUM = new TechRebornFluid("fluidpotassium"); public static Fluid POTASSIUM = new TechRebornFluid("potassium");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_SILICON;
public static Fluid SODIUM = new TechRebornFluid("fluidsodium"); public static Fluid SODIUM = new TechRebornFluid("sodium");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_SODIUMPERSULFATE;
public static Fluid TRITIUM = new TechRebornFluid("fluidtritium"); public static Fluid TRITIUM = new TechRebornFluid("tritium");
public static BlockFluidTechReborn BLOCK_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 BlockFluidTechReborn BLOCK_WOLFRAMIUM;
public static Fluid CARBON = new TechRebornFluid("fluidcarbon"); public static Fluid CARBON = new TechRebornFluid("carbon");
public static BlockFluidTechReborn BLOCK_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 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 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 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 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 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 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 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 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 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 BlockFluidTechReborn BLOCK_ELECTROLYZED_WATER;
public static void init() { public static void init() {

2
src/main/java/techreborn/items/ItemCells.java
View file

@ -40,7 +40,7 @@ public class ItemCells {
if (fluid == null) { if (fluid == null) {
fluid = FluidRegistry.getFluid(name.toLowerCase()); fluid = FluidRegistry.getFluid(name.toLowerCase());
if (fluid == null) { 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"); Validate.notNull(fluid, "The fluid " + name + " could not be found");

68
src/main/resources/assets/techreborn/blockstates/fluids.json
View file

@ -5,204 +5,204 @@
}, },
"variants": { "variants": {
"techreborn.berylium": [{ "techreborn.berylium": [{
"custom": { "fluid": "fluidberylium" } "custom": { "fluid": "berylium" }
}], }],
"techreborn.calcium": { "techreborn.calcium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidcalcium" "fluid": "calcium"
} }
}, },
"techreborn.calciumcarbonate": { "techreborn.calciumcarbonate": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidcalciumcarbonate" "fluid": "calciumcarbonate"
} }
}, },
"techreborn.carbon": { "techreborn.carbon": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidcarbon" "fluid": "carbon"
} }
}, },
"techreborn.carbonfiber": { "techreborn.carbonfiber": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidcarbonfiber" "fluid": "carbonfiber"
} }
}, },
"techreborn.chlorite": { "techreborn.chlorite": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidchlorite" "fluid": "chlorite"
} }
}, },
"techreborn.compressedair": { "techreborn.compressedair": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidcompressedair" "fluid": "compressedair"
} }
}, },
"techreborn.deuterium": { "techreborn.deuterium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluiddeuterium" "fluid": "deuterium"
} }
}, },
"techreborn.diesel": { "techreborn.diesel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluiddiesel" "fluid": "diesel"
} }
}, },
"techreborn.electrolyzedwater": { "techreborn.electrolyzedwater": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidelectrolyzedwater" "fluid": "electrolyzedwater"
} }
}, },
"techreborn.glyceryl": { "techreborn.glyceryl": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidglyceryl" "fluid": "glyceryl"
} }
}, },
"techreborn.helium": { "techreborn.helium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidhelium" "fluid": "helium"
} }
}, },
"techreborn.helium3": { "techreborn.helium3": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidhelium3" "fluid": "helium3"
} }
}, },
"techreborn.heliumplasma": { "techreborn.heliumplasma": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidheliumplasma" "fluid": "heliumplasma"
} }
}, },
"techreborn.hydrogen": { "techreborn.hydrogen": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidhydrogen" "fluid": "hydrogen"
} }
}, },
"techreborn.lithium": { "techreborn.lithium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidlithium" "fluid": "lithium"
} }
}, },
"techreborn.mercury": { "techreborn.mercury": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidmercury" "fluid": "mercury"
} }
}, },
"techreborn.methane": { "techreborn.methane": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidmethane" "fluid": "methane"
} }
}, },
"techreborn.nitrocarbon": { "techreborn.nitrocarbon": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrocarbon" "fluid": "nitrocarbon"
} }
}, },
"techreborn.nitrocoalfuel": { "techreborn.nitrocoalfuel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrocoalfuel" "fluid": "nitrocoalfuel"
} }
}, },
"techreborn.nitrodiesel": { "techreborn.nitrodiesel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrodiesel" "fluid": "nitrodiesel"
} }
}, },
"techreborn.nitrofuel": { "techreborn.nitrofuel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrofuel" "fluid": "nitrofuel"
} }
}, },
"techreborn.nitrogen": { "techreborn.nitrogen": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrogen" "fluid": "nitrogen"
} }
}, },
"techreborn.nitrogendioxide": { "techreborn.nitrogendioxide": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrogendioxide" "fluid": "nitrogendioxide"
} }
}, },
"techreborn.oil": { "techreborn.oil": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidoil" "fluid": "oil"
} }
}, },
"techreborn.potassium": { "techreborn.potassium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidpotassium" "fluid": "potassium"
} }
}, },
"techreborn.silicon": { "techreborn.silicon": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsilicon" "fluid": "silicon"
} }
}, },
"techreborn.sodium": { "techreborn.sodium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsodium" "fluid": "sodium"
} }
}, },
"techreborn.sodiumpersulfate": { "techreborn.sodiumpersulfate": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsodiumpersulfate" "fluid": "sodiumpersulfate"
} }
}, },
"techreborn.sodiumsulfide": { "techreborn.sodiumsulfide": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsodiumsulfide" "fluid": "sodiumsulfide"
} }
}, },
"techreborn.sulfur": { "techreborn.sulfur": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsulfur" "fluid": "sulfur"
} }
}, },
"techreborn.sulfuricacid": { "techreborn.sulfuricacid": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidsulfuricacid" "fluid": "sulfuricacid"
} }
}, },
"techreborn.tritium": { "techreborn.tritium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidtritium" "fluid": "tritium"
} }
}, },
"techreborn.wolframium": { "techreborn.wolframium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidwolframium" "fluid": "wolframium"
} }
} }
} }