diff --git a/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json b/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json index 5fe217384..1fdfbaadb 100644 --- a/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json +++ b/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json @@ -1,7 +1,10 @@ { "variants": { - "": { + "active=false": { "model": "galacticraft:machine/oxygen_bubble_distributor" + }, + "active=true": { + "model": "galacticraft:machine/oxygen_bubble_distributor_active" } } } \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json b/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json index 50ecd2ec6..32cdc6e08 100644 --- a/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json +++ b/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json @@ -1,7 +1,10 @@ { "variants": { - "": { + "active=false": { "model": "galacticraft:machine/oxygen_collector" + }, + "active=true": { + "model": "galacticraft:machine/oxygen_collector_active" } } } \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json new file mode 100644 index 000000000..312ce6cc3 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json @@ -0,0 +1,6 @@ +{ + "machinelib:generate": "machinelib:single", + "sprites": { + "sprite": "galacticraft:block/oxygen_bubble_distributor_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json index 305edaef6..13a90126b 100644 --- a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json @@ -1,7 +1,6 @@ { "machinelib:generate": "machinelib:single", "sprites": { - "sprite": "galacticraft:block/oxygen_collector", - "particle": "galacticraft:block/oxygen_collector" + "sprite": "galacticraft:block/oxygen_collector" } } \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json new file mode 100644 index 000000000..1c14ef31c --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json @@ -0,0 +1,6 @@ +{ + "machinelib:generate": "machinelib:single", + "sprites": { + "sprite": "galacticraft:block/oxygen_collector_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png index e92087453..8ed817329 100644 Binary files a/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png and b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png differ diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png new file mode 100644 index 000000000..c58487787 Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png differ diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta similarity index 54% rename from src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta rename to src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta index 01955dc7e..24f9c2fae 100644 --- a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta +++ b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 0.5 + "frametime": 1 } } diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png index f9bfd112d..e4643210c 100644 Binary files a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png and b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png differ diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png new file mode 100644 index 000000000..bdc6fd720 Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png differ diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png.mcmeta b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +}