Fluid overhaul (#2693)

* Update ModFluids.java

update to add still textures.

* Add files via upload

add still models

* Add files via upload

all new textures including still 
all based off vanilla water templates

* Add files via upload

updated animation files for flowing and still textures
This commit is contained in:
xanthian 2021-12-30 19:37:20 +00:00 committed by GitHub
parent 5f7570cfff
commit 1a2b6e0d9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
176 changed files with 489 additions and 348 deletions

View file

@ -85,10 +85,11 @@ public enum ModFluids {
FluidSettings fluidSettings = FluidSettings.create(); FluidSettings fluidSettings = FluidSettings.create();
Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_flowing"); Identifier texture_still = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_still");
Identifier texture_flowing = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase(Locale.ROOT) + "_flowing");
fluidSettings.setStillTexture(texture); fluidSettings.setStillTexture(texture_still);
fluidSettings.setFlowingTexture(texture); fluidSettings.setFlowingTexture(texture_flowing);
stillFluid = new RebornFluid(true, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid) { stillFluid = new RebornFluid(true, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid) {
}; };

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/biofuel_flowing" "particle": "techreborn:block/fluids/biofuel_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/calcium_flowing" "particle": "techreborn:block/fluids/calcium_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/carbon_flowing" "particle": "techreborn:block/fluids/carbon_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/chlorite_flowing" "particle": "techreborn:block/fluids/chlorite_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/deuterium_flowing" "particle": "techreborn:block/fluids/deuterium_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/diesel_flowing" "particle": "techreborn:block/fluids/diesel_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/glyceryl_flowing" "particle": "techreborn:block/fluids/glyceryl_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/helium_flowing" "particle": "techreborn:block/fluids/helium_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/helium3_flowing" "particle": "techreborn:block/fluids/helium3_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/heliumplasma_flowing" "particle": "techreborn:block/fluids/heliumplasma_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/hydrogen_flowing" "particle": "techreborn:block/fluids/hydrogen_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/lithium_flowing" "particle": "techreborn:block/fluids/lithium_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/mercury_flowing" "particle": "techreborn:block/fluids/mercury_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/methane_flowing" "particle": "techreborn:block/fluids/methane_still"
} }
} }

View file

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

View file

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

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/nitrofuel_flowing" "particle": "techreborn:block/fluids/nitrofuel_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/nitrogen_flowing" "particle": "techreborn:block/fluids/nitrogen_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/oil_flowing" "particle": "techreborn:block/fluids/oil_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/potassium_flowing" "particle": "techreborn:block/fluids/potassium_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/silicon_flowing" "particle": "techreborn:block/fluids/silicon_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/sodium_flowing" "particle": "techreborn:block/fluids/sodium_still"
} }
} }

View file

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

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/sulfur_flowing" "particle": "techreborn:block/fluids/sulfur_still"
} }
} }

View file

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

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/tritium_flowing" "particle": "techreborn:block/fluids/tritium_still"
} }
} }

View file

@ -1,5 +1,6 @@
{ {
"textures": { "textures": {
"particle": "techreborn:block/fluids/wolframium_flowing" "particle": "techreborn:block/fluids/wolframium_still"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":4
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 B

After

Width:  |  Height:  |  Size: 7.9 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":1
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Before After
Before After

View file

@ -1,5 +1,3 @@
{ {
"animation":{ "animation": {}
"frametime":2
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

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