diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java index 310f8e2906..e933eafdbf 100644 --- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java @@ -91,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{ } public static TypeName tname(String pack, String simple){ - return ClassName.get(pack, simple ); + return ClassName.get(pack, simple); } public static TypeName tname(String name){ diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png index 0a6766ab69..6c95894959 100644 Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ diff --git a/core/assets/sounds/wind3.ogg b/core/assets/sounds/wind3.ogg index 35e732725b..315edc4146 100644 Binary files a/core/assets/sounds/wind3.ogg and b/core/assets/sounds/wind3.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b5566e463a..6746e14984 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -609,7 +609,7 @@ public class Blocks implements ContentList{ rotate = false; solid = true; outputsLiquid = true; - drawer = new DrawMixer(); + drawer = new DrawMixer(true); consumes.power(1f); consumes.item(Items.titanium); diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index dbe7caa19f..bd343988fa 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -60,7 +60,7 @@ public class ResearchDialog extends BaseDialog{ //add global counts of each sector for(Planet planet : content.planets()){ for(Sector sector : planet.sectors){ - if(sector.hasSave() && sector.hasBase()){ + if(sector.hasBase()){ ItemSeq cached = sector.items(); cache.put(sector, cached); cached.each((item, amount) -> { diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 5fc4654cd2..cf54cb6eae 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -207,7 +207,7 @@ public class HudFragment extends Fragment{ logic.skipWave(); } }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).name("skip"); - }).width(dsize * 5 + 4f); + }).width(dsize * 5 + 4f).name("statustable"); wavesMain.row(); diff --git a/core/src/mindustry/world/draw/DrawLiquid.java b/core/src/mindustry/world/draw/DrawLiquid.java index 16cfd14934..ae246a5c67 100644 --- a/core/src/mindustry/world/draw/DrawLiquid.java +++ b/core/src/mindustry/world/draw/DrawLiquid.java @@ -3,18 +3,36 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; import mindustry.graphics.*; +import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.GenericCrafter.*; +import mindustry.world.consumers.*; public class DrawLiquid extends DrawBlock{ - public TextureRegion liquid, top; + public TextureRegion inLiquid, liquid, top; + public boolean useOutputSprite = false; + + public DrawLiquid(){ + } + + public DrawLiquid(boolean useOutputSprite){ + this.useOutputSprite = useOutputSprite; + } @Override public void draw(GenericCrafterBuild build){ Draw.rect(build.block.region, build.x, build.y); GenericCrafter type = (GenericCrafter)build.block; + if((inLiquid.found() || useOutputSprite) && type.consumes.has(ConsumeType.liquid)){ + Liquid input = type.consumes.get(ConsumeType.liquid).liquid; + Drawf.liquid(useOutputSprite ? liquid : inLiquid, build.x, build.y, + build.liquids.get(input) / type.liquidCapacity, + input.color + ); + } + if(type.outputLiquid != null && build.liquids.get(type.outputLiquid.liquid) > 0){ Drawf.liquid(liquid, build.x, build.y, build.liquids.get(type.outputLiquid.liquid) / type.liquidCapacity, @@ -29,6 +47,7 @@ public class DrawLiquid extends DrawBlock{ public void load(Block block){ top = Core.atlas.find(block.name + "-top"); liquid = Core.atlas.find(block.name + "-liquid"); + inLiquid = Core.atlas.find(block.name + "-input-liquid"); } @Override diff --git a/core/src/mindustry/world/draw/DrawMixer.java b/core/src/mindustry/world/draw/DrawMixer.java index 850ac5c6dd..a2ff14b7f8 100644 --- a/core/src/mindustry/world/draw/DrawMixer.java +++ b/core/src/mindustry/world/draw/DrawMixer.java @@ -2,19 +2,37 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; +import mindustry.graphics.*; +import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.GenericCrafter.*; +import mindustry.world.consumers.*; public class DrawMixer extends DrawBlock{ - public TextureRegion liquid, top, bottom; + public TextureRegion inLiquid, liquid, top, bottom; + public boolean useOutputSprite; + + public DrawMixer(){ + } + + public DrawMixer(boolean useOutputSprite){ + this.useOutputSprite = useOutputSprite; + } @Override public void draw(GenericCrafterBuild build){ float rotation = build.block.rotate ? build.rotdeg() : 0; - Draw.rect(bottom, build.x, build.y, rotation); + if((inLiquid.found() || useOutputSprite) && build.block.consumes.has(ConsumeType.liquid)){ + Liquid input = build.block.consumes.get(ConsumeType.liquid).liquid; + Drawf.liquid(useOutputSprite ? liquid : inLiquid, build.x, build.y, + build.liquids.get(input) / build.block.liquidCapacity, + input.color + ); + } + if(build.liquids.total() > 0.001f){ Draw.color(((GenericCrafter)build.block).outputLiquid.liquid.color); Draw.alpha(build.liquids.get(((GenericCrafter)build.block).outputLiquid.liquid) / build.block.liquidCapacity); @@ -27,6 +45,7 @@ public class DrawMixer extends DrawBlock{ @Override public void load(Block block){ + inLiquid = Core.atlas.find(block.name + "-input-liquid"); liquid = Core.atlas.find(block.name + "-liquid"); top = Core.atlas.find(block.name + "-top"); bottom = Core.atlas.find(block.name + "-bottom"); diff --git a/servers_v6.json b/servers_v6.json index 59224c074f..f9bb12257a 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -57,7 +57,7 @@ }, { "name": "Omega", - "address": ["178.170.47.34:20204", "157.90.213.2:30308", "157.90.180.53:25738", "185.86.230.61:25578", "mindustry.me:7172"] + "address": ["yeeth.mindustry.me:2004"] }, { "name": "md.obvilionnetwork.ru", diff --git a/servers_v7.json b/servers_v7.json index eccd6ced6d..b7dbd2b066 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -13,7 +13,7 @@ }, { "name": "Omega", - "address": ["yeet.mindustry.me", "yeet.mindustry.me:2345", "n3.mindustry.me:4444","n2.mindustry.me:4040", "n2.mindustry.me:4002", "n2.mindustry.me:4001", "n3.mindustry.me", "n2.mindustry.me:4004"] + "address": ["yeet.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] }, { "name": "MeowLand",