Renamed some fluids to keep underscores so Prospector can read them.

This commit is contained in:
drcrazy 2019-08-08 00:38:30 +03:00
parent 4c25ba221c
commit ce56a1da31
116 changed files with 173 additions and 173 deletions

View file

@ -34,7 +34,7 @@ import reborncore.common.fluid.*;
import techreborn.TechReborn; import techreborn.TechReborn;
public enum ModFluids { public enum ModFluids {
BERYLIUM, BERYLLIUM,
CALCIUM, CALCIUM,
CALCIUM_CARBONATE, CALCIUM_CARBONATE,
CARBON, CARBON,
@ -46,7 +46,7 @@ public enum ModFluids {
ELECTROLYZED_WATER, ELECTROLYZED_WATER,
GLYCERYL, GLYCERYL,
HELIUM, HELIUM,
HELIUM_3, HELIUM3,
HELIUMPLASMA, HELIUMPLASMA,
HYDROGEN, HYDROGEN,
LITHIUM, LITHIUM,
@ -57,13 +57,13 @@ public enum ModFluids {
NITROCOAL_FUEL, NITROCOAL_FUEL,
NITROFUEL, NITROFUEL,
NITROGEN, NITROGEN,
NITROGENDIOXIDE, NITROGEN_DIOXIDE,
OIL, OIL,
POTASSIUM, POTASSIUM,
SILICON, SILICON,
SODIUM, SODIUM,
SODIUM_SULFIDE, SODIUM_SULFIDE,
SODIUMPERSULFATE, SODIUM_PERSULFATE,
SULFUR, SULFUR,
SULFURIC_ACID, SULFURIC_ACID,
TRITIUM, TRITIUM,
@ -77,11 +77,11 @@ public enum ModFluids {
private final Identifier identifier; private final Identifier identifier;
ModFluids() { ModFluids() {
this.identifier = new Identifier(TechReborn.MOD_ID, this.name().replace("_", "").toLowerCase()); this.identifier = new Identifier(TechReborn.MOD_ID, this.toString().toLowerCase());
FluidSettings fluidSettings = FluidSettings.create(); FluidSettings fluidSettings = FluidSettings.create();
Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.name().replace("_", "").toLowerCase() + "_flowing"); Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase() + "_flowing");
fluidSettings.setStillTexture(texture); fluidSettings.setStillTexture(texture);
fluidSettings.setFlowingTexture(texture); fluidSettings.setFlowingTexture(texture);

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/berylium" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/beryllium" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/calcium_carbonate" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/calciumcarbonate" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/carbon_fiber" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/carbonfiber" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/compressed_air" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/compressedair" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/electrolyzed_water" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/electrolyzedwater" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitro_carbon" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitro_diesel" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrocarbon" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrocoal_fuel" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrocoalfuel" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrodiesel" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrogen_dioxide" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/nitrogendioxide" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sodium_persulfate" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sodium_sulfide" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sodiumpersulfate" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sodiumsulfide" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sulfuric_acid" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/fluid/sulfuricacid" }
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/berylium_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/beryllium_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/calcium_carbonate_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/calciumcarbonate_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/carbon_fiber_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/carbonfiber_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/compressed_air_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/compressedair_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/electrolyzed_water_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/electrolyzedwater_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitro_carbon_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitro_diesel_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrocarbon_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrocoal_fuel_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrocoalfuel_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrodiesel_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrogen_dioxide_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/nitrogendioxide_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/sodium_persulfate_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/sodium_sulfide_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/sodiumpersulfate_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/sodiumsulfide_flowing"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "techreborn:block/fluids/sulfuric_acid_flowing"
}
}

View file

@ -1,5 +0,0 @@
{
"textures": {
"particle": "techreborn:block/fluids/sulfuricacid_flowing"
}
}

View file

@ -8,7 +8,7 @@
"item": "minecraft:iron_ore" "item": "minecraft:iron_ore"
}, },
{ {
"fluid": "techreborn:calciumcarbonate", "fluid": "techreborn:calcium_carbonate",
"holder": "techreborn:cell" "holder": "techreborn:cell"
} }
], ],

View file

@ -8,7 +8,7 @@
"item": "techreborn:pyrite_ore" "item": "techreborn:pyrite_ore"
}, },
{ {
"fluid": "techreborn:calciumcarbonate", "fluid": "techreborn:calcium_carbonate",
"holder": "techreborn:cell" "holder": "techreborn:cell"
} }
], ],

View file

@ -5,7 +5,7 @@
"heat": 1500, "heat": 1500,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:calciumcarbonate", "fluid": "techreborn:silicon",
"holder": "techreborn:cell", "holder": "techreborn:cell",
"count": 2 "count": 2
} }

View file

@ -4,7 +4,7 @@
"time": 5, "time": 5,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:calciumcarbonate", "fluid": "techreborn:calcium_carbonate",
"holder": "techreborn:cell" "holder": "techreborn:cell"
} }
], ],

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 2, "count": 2,
"nbt": { "nbt": {
"fluid": "techreborn:calciumcarbonate" "fluid": "techreborn:calcium_carbonate"
} }
} }
] ]

View file

@ -4,7 +4,7 @@
"time": 600, "time": 600,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:nitrocarbon", "fluid": "techreborn:nitro_carbon",
"holder": "techreborn:cell" "holder": "techreborn:cell"
}, },
{ {

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 2, "count": 2,
"nbt": { "nbt": {
"fluid": "techreborn:nitrocarbon" "fluid": "techreborn:nitro_carbon"
} }
} }
] ]

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 5, "count": 5,
"nbt": { "nbt": {
"fluid": "techreborn:nitrodiesel" "fluid": "techreborn:nitro_diesel"
} }
} }
] ]

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 5, "count": 5,
"nbt": { "nbt": {
"fluid": "techreborn:nitrocoalfuel" "fluid": "techreborn:nitrocoal_fuel"
} }
} }
] ]

View file

@ -4,7 +4,7 @@
"time": 400, "time": 400,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:compressedair", "fluid": "techreborn:compressed_air",
"holder": "techreborn:cell" "holder": "techreborn:cell"
}, },
{ {
@ -16,7 +16,7 @@
{ {
"item": "techreborn:cell", "item": "techreborn:cell",
"nbt": { "nbt": {
"fluid": "techreborn:nitrogendioxide" "fluid": "techreborn:nitrogen_dioxide"
} }
} }
] ]

View file

@ -4,11 +4,11 @@
"time": 800, "time": 800,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:sodiumsulfide", "fluid": "techreborn:sodium_sulfide",
"holder": "techreborn:cell" "holder": "techreborn:cell"
}, },
{ {
"fluid": "techreborn:compressedair", "fluid": "techreborn:compressed_air",
"holder": "techreborn:cell" "holder": "techreborn:cell"
} }
], ],
@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 2, "count": 2,
"nbt": { "nbt": {
"fluid": "techreborn:sodiumpersulfate" "fluid": "techreborn:sodium_persulfate"
} }
} }
] ]

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 2, "count": 2,
"nbt": { "nbt": {
"fluid": "techreborn:sodiumsulfide" "fluid": "techreborn:sodium_sulfide"
} }
} }
] ]

View file

@ -17,7 +17,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"nbt": { "nbt": {
"fluid": "techreborn:sulfuricacid" "fluid": "techreborn:sulfuric_acid"
} }
} }
] ]

View file

@ -4,7 +4,7 @@
"time": 400, "time": 400,
"ingredients": [ "ingredients": [
{ {
"fluid": "techreborn:compressedair", "fluid": "techreborn:compressed_air",
"holder": "techreborn:cell" "holder": "techreborn:cell"
}, },
{ {

View file

@ -26,7 +26,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 16, "count": 16,
"nbt": { "nbt": {
"fluid": "techreborn:sulfuricacid" "fluid": "techreborn:sulfuric_acid"
} }
}, },
{ {

View file

@ -3,7 +3,7 @@
"power": 20, "power": 20,
"time": 100, "time": 100,
"tank": { "tank": {
"fluid": "techreborn:carbonfiber", "fluid": "techreborn:carbon_fiber",
"amount": 1000 "amount": 1000
}, },
"ingredients": [ "ingredients": [

View file

@ -3,7 +3,7 @@
"power": 20, "power": 20,
"time": 100, "time": 100,
"tank": { "tank": {
"fluid": "techreborn:compressedair", "fluid": "techreborn:compressed_air",
"amount": 1000 "amount": 1000
}, },
"ingredients": [ "ingredients": [

View file

@ -33,7 +33,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -25,7 +25,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -22,7 +22,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -22,7 +22,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"tag": { "tag": {
"fluid": "techreborn:berylium" "fluid": "techreborn:beryllium"
} }
}, },
{ {
@ -36,7 +36,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 9, "count": 9,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -33,7 +33,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 6, "count": 6,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -32,7 +32,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 3, "count": 3,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -36,7 +36,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 6, "count": 6,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

View file

@ -36,7 +36,7 @@
"item": "techreborn:cell", "item": "techreborn:cell",
"count": 6, "count": 6,
"tag": { "tag": {
"fluid": "techreborn:compressedair" "fluid": "techreborn:compressed_air"
} }
} }
] ]

Some files were not shown because too many files have changed in this diff Show more