mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2022-09-25 07:11:26 -04:00
commit edaa0652bd
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/world/draw/DrawHeatRegion.java
View File

@ -12,10 +12,15 @@ import mindustry.world.blocks.production.HeatCrafter.*;
public class DrawHeatRegion extends DrawBlock{ public class DrawHeatRegion extends DrawBlock{
public Color color = new Color(1f, 0.22f, 0.22f, 0.8f); public Color color = new Color(1f, 0.22f, 0.22f, 0.8f);
public float pulse = 0.3f, pulseScl = 10f; public float pulse = 0.3f, pulseScl = 10f;
public float layer = Layer.blockAdditive;
public TextureRegion heat; public TextureRegion heat;
public String suffix = "-glow"; public String suffix = "-glow";
public DrawHeatRegion(float layer){
this.layer = layer;
}
public DrawHeatRegion(String suffix){ public DrawHeatRegion(String suffix){
this.suffix = suffix; this.suffix = suffix;
} }
@ -27,13 +32,16 @@ public class DrawHeatRegion extends DrawBlock{
public void draw(Building build){ public void draw(Building build){
Draw.z(Layer.blockAdditive); Draw.z(Layer.blockAdditive);
if(build instanceof HeatCrafterBuild hc && hc.heat > 0){ if(build instanceof HeatCrafterBuild hc && hc.heat > 0){
float z = Draw.z();
if(layer > 0) Draw.z(layer);
Draw.blend(Blending.additive); Draw.blend(Blending.additive);
Draw.color(color, Mathf.clamp(hc.heat / hc.heatRequirement()) * (color.a * (1f - pulse + Mathf.absin(pulseScl, pulse)))); Draw.color(color, Mathf.clamp(hc.heat / hc.heatRequirement()) * (color.a * (1f - pulse + Mathf.absin(pulseScl, pulse))));
Draw.rect(heat, build.x, build.y); Draw.rect(heat, build.x, build.y);
Draw.blend(); Draw.blend();
Draw.color(); Draw.color();
Draw.z(z);
} }
Draw.z(Layer.block);
} }
@Override @Override

9
servers_v6.json
View File

@ -13,7 +13,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n5.yeet.ml", "n1.yeet.ml:6568","n5.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571", "n1.yeet.ml:6609"] "address": ["n1.mindustry.me:6614","n1.mindustry.me:6568","n1.mindustry.me:6612","n1.mindustry.me:6570","n1.mindustry.me:6609"]
}, },
{ {
"name": "EasyPlay", "name": "EasyPlay",
@ -131,17 +131,12 @@
"name": "Shard", "name": "Shard",
"address": ["59.12.120.171"] "address": ["59.12.120.171"]
}, },
{
"name": "OMNIDUSTRY",
"address": ["109.94.209.233"]
}
{ {
"name": "New Campaign Like", "name": "New Campaign Like",
"address": ["n5.yeet.ml:6568"] "address": ["n5.yeet.ml:6568"]
}, },
{ {
"name": "AlternightBR" "name": "AlternightBR",
"address": ["mindustrypt.ga:8300"] "address": ["mindustrypt.ga:8300"]
} }
] ]

12
servers_v7.json
View File

@ -33,7 +33,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n5.yeet.ml:6605", "n5.yeet.ml:6606", "n1.yeet.ml:6608","n1.yeet.ml:6599", "n1.yeet.ml:6567"] "address": ["n1.mindustry.me:6572","n1.mindustry.me:6573","n1.mindustry.me:6574","n1.mindustry.me:6604","n1.mindustry.me:6569","n1.mindustry.me:6611","n1.mindustry.me:6610","n1.mindustry.me:6599","n1.mindustry.me","n1.mindustry.me:6608"]
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",
@ -101,7 +101,7 @@
}, },
{ {
"name": "Fish", "name": "Fish",
"address": ["170.187.144.235"] "address": ["170.187.144.235", "45.79.203.155"]
}, },
{ {
"name": "Harders", "name": "Harders",
@ -109,7 +109,7 @@
}, },
{ {
"name": "OMNIDUSTRY", "name": "OMNIDUSTRY",
"address": ["109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573","109.94.209.233:6574"] "address": ["109.94.209.233","109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573","109.94.209.233:6574"]
}, },
{ {
"name": "The Devil", "name": "The Devil",
@ -129,6 +129,10 @@
}, },
{ {
"name": "LightDustry", "name": "LightDustry",
"address": ["own-formerly.craft.playit.gg:26618", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568"] "address": ["own-formerly.craft.playit.gg:26618", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568", "209.25.142.180:39065"]
},
{
"name": "Simply",
"address": ["178.203.202.107"]
} }
] ]