Renamed some fluids to keep underscores so Prospector can read them.
|
@ -34,7 +34,7 @@ import reborncore.common.fluid.*;
|
|||
import techreborn.TechReborn;
|
||||
|
||||
public enum ModFluids {
|
||||
BERYLIUM,
|
||||
BERYLLIUM,
|
||||
CALCIUM,
|
||||
CALCIUM_CARBONATE,
|
||||
CARBON,
|
||||
|
@ -46,7 +46,7 @@ public enum ModFluids {
|
|||
ELECTROLYZED_WATER,
|
||||
GLYCERYL,
|
||||
HELIUM,
|
||||
HELIUM_3,
|
||||
HELIUM3,
|
||||
HELIUMPLASMA,
|
||||
HYDROGEN,
|
||||
LITHIUM,
|
||||
|
@ -57,13 +57,13 @@ public enum ModFluids {
|
|||
NITROCOAL_FUEL,
|
||||
NITROFUEL,
|
||||
NITROGEN,
|
||||
NITROGENDIOXIDE,
|
||||
NITROGEN_DIOXIDE,
|
||||
OIL,
|
||||
POTASSIUM,
|
||||
SILICON,
|
||||
SODIUM,
|
||||
SODIUM_SULFIDE,
|
||||
SODIUMPERSULFATE,
|
||||
SODIUM_PERSULFATE,
|
||||
SULFUR,
|
||||
SULFURIC_ACID,
|
||||
TRITIUM,
|
||||
|
@ -77,11 +77,11 @@ public enum ModFluids {
|
|||
private final Identifier identifier;
|
||||
|
||||
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();
|
||||
|
||||
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.setFlowingTexture(texture);
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/berylium" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/beryllium" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/calcium_carbonate" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/calciumcarbonate" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/carbon_fiber" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/carbonfiber" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/compressed_air" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/compressedair" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/electrolyzed_water" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/electrolyzedwater" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitro_carbon" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitro_diesel" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrocarbon" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrocoal_fuel" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrocoalfuel" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrodiesel" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrogen_dioxide" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/nitrogendioxide" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sodium_persulfate" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sodium_sulfide" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sodiumpersulfate" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sodiumsulfide" }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sulfuric_acid" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "techreborn:block/fluid/sulfuricacid" }
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/berylium_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/beryllium_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/calcium_carbonate_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/calciumcarbonate_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/carbon_fiber_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/carbonfiber_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/compressed_air_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/compressedair_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/electrolyzed_water_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/electrolyzedwater_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitro_carbon_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitro_diesel_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrocarbon_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrocoal_fuel_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrocoalfuel_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrodiesel_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrogen_dioxide_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/nitrogendioxide_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sodium_persulfate_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sodium_sulfide_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sodiumpersulfate_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sodiumsulfide_flowing"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sulfuric_acid_flowing"
|
||||
}
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"textures": {
|
||||
"particle": "techreborn:block/fluids/sulfuricacid_flowing"
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 104 B After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
@ -8,7 +8,7 @@
|
|||
"item": "minecraft:iron_ore"
|
||||
},
|
||||
{
|
||||
"fluid": "techreborn:calciumcarbonate",
|
||||
"fluid": "techreborn:calcium_carbonate",
|
||||
"holder": "techreborn:cell"
|
||||
}
|
||||
],
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"item": "techreborn:pyrite_ore"
|
||||
},
|
||||
{
|
||||
"fluid": "techreborn:calciumcarbonate",
|
||||
"fluid": "techreborn:calcium_carbonate",
|
||||
"holder": "techreborn:cell"
|
||||
}
|
||||
],
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
"heat": 1500,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:calciumcarbonate",
|
||||
"fluid": "techreborn:silicon",
|
||||
"holder": "techreborn:cell",
|
||||
"count": 2
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
"time": 5,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:calciumcarbonate",
|
||||
"fluid": "techreborn:calcium_carbonate",
|
||||
"holder": "techreborn:cell"
|
||||
}
|
||||
],
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 2,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:calciumcarbonate"
|
||||
"fluid": "techreborn:calcium_carbonate"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -4,7 +4,7 @@
|
|||
"time": 600,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:nitrocarbon",
|
||||
"fluid": "techreborn:nitro_carbon",
|
||||
"holder": "techreborn:cell"
|
||||
},
|
||||
{
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 2,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:nitrocarbon"
|
||||
"fluid": "techreborn:nitro_carbon"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 5,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:nitrodiesel"
|
||||
"fluid": "techreborn:nitro_diesel"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 5,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:nitrocoalfuel"
|
||||
"fluid": "techreborn:nitrocoal_fuel"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -4,7 +4,7 @@
|
|||
"time": 400,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:compressedair",
|
||||
"fluid": "techreborn:compressed_air",
|
||||
"holder": "techreborn:cell"
|
||||
},
|
||||
{
|
||||
|
@ -16,7 +16,7 @@
|
|||
{
|
||||
"item": "techreborn:cell",
|
||||
"nbt": {
|
||||
"fluid": "techreborn:nitrogendioxide"
|
||||
"fluid": "techreborn:nitrogen_dioxide"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -4,11 +4,11 @@
|
|||
"time": 800,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:sodiumsulfide",
|
||||
"fluid": "techreborn:sodium_sulfide",
|
||||
"holder": "techreborn:cell"
|
||||
},
|
||||
{
|
||||
"fluid": "techreborn:compressedair",
|
||||
"fluid": "techreborn:compressed_air",
|
||||
"holder": "techreborn:cell"
|
||||
}
|
||||
],
|
||||
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 2,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:sodiumpersulfate"
|
||||
"fluid": "techreborn:sodium_persulfate"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 2,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:sodiumsulfide"
|
||||
"fluid": "techreborn:sodium_sulfide"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -17,7 +17,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:sulfuricacid"
|
||||
"fluid": "techreborn:sulfuric_acid"
|
||||
}
|
||||
}
|
||||
]
|
|
@ -4,7 +4,7 @@
|
|||
"time": 400,
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "techreborn:compressedair",
|
||||
"fluid": "techreborn:compressed_air",
|
||||
"holder": "techreborn:cell"
|
||||
},
|
||||
{
|
|
@ -26,7 +26,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 16,
|
||||
"nbt": {
|
||||
"fluid": "techreborn:sulfuricacid"
|
||||
"fluid": "techreborn:sulfuric_acid"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"power": 20,
|
||||
"time": 100,
|
||||
"tank": {
|
||||
"fluid": "techreborn:carbonfiber",
|
||||
"fluid": "techreborn:carbon_fiber",
|
||||
"amount": 1000
|
||||
},
|
||||
"ingredients": [
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"power": 20,
|
||||
"time": 100,
|
||||
"tank": {
|
||||
"fluid": "techreborn:compressedair",
|
||||
"fluid": "techreborn:compressed_air",
|
||||
"amount": 1000
|
||||
},
|
||||
"ingredients": [
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"tag": {
|
||||
"fluid": "techreborn:berylium"
|
||||
"fluid": "techreborn:beryllium"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -36,7 +36,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 9,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 6,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 3,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 6,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"item": "techreborn:cell",
|
||||
"count": 6,
|
||||
"tag": {
|
||||
"fluid": "techreborn:compressedair"
|
||||
"fluid": "techreborn:compressed_air"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|