Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-07-08 09:29:36 -04:00
parent 64ab8328b8 6f2033a455
commit a0c5ed3761
47 changed files with 178 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -801,12 +801,12 @@ public class Blocks implements ContentList{
}};
disassembler = new Separator("disassembler"){{
requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70));
requirements(Category.crafting, with(Items.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80));
results = with(
Items.sand, 4,
Items.graphite, 2,
Items.titanium, 2,
Items.thorium, 1
Items.thorium, 2
);
hasPower = true;
craftTime = 15f;

9
core/src/mindustry/content/UnitTypes.java
View File

@@ -120,7 +120,7 @@ public class UnitTypes implements ContentList{
hitSize = 13f;
rotateSpeed = 3f;
targetAir = false;
health = 820;
health = 900;
armor = 9f;
mechFrontSway = 0.55f;
@@ -133,15 +133,15 @@ public class UnitTypes implements ContentList{
shake = 2f;
ejectEffect = Fx.casing2;
shootSound = Sounds.artillery;
bullet = new ArtilleryBulletType(2f, 8, "shell"){{
bullet = new ArtilleryBulletType(2f, 20, "shell"){{
hitEffect = Fx.blastExplosion;
knockback = 0.8f;
lifetime = 120f;
width = height = 14f;
collides = true;
collidesTiles = true;
splashDamageRadius = 30f;
splashDamage = 60f;
splashDamageRadius = 35f;
splashDamage = 80f;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
}};
@@ -2155,6 +2155,7 @@ public class UnitTypes implements ContentList{
bullet = new EmpBulletType(){{
float rad = 100f;
scaleVelocity = true;
lightOpacity = 0.7f;
unitDamageScl = 0.8f;
healPercent = 20f;

2
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -93,7 +93,7 @@ public class BulletType extends Content implements Cloneable{
public boolean collides = true;
/** Whether velocity is inherited from the shooter. */
public boolean keepVelocity = true;
/** Whether to scale velocity to disappear at the target position. Used for artillery. */
/** Whether to scale lifetime (not actually velocity!) to disappear at the target position. Used for artillery. */
public boolean scaleVelocity;
/** Whether this bullet can be hit by point defense. */
public boolean hittable = true;

7
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -44,6 +44,13 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
}
}
//bullets always considered local
@Override
@Replace
public boolean isLocal(){
return true;
}
@Override
public void add(){
type.init(self());

4
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -16,8 +16,8 @@ abstract class ShieldComp implements Healthc, Posc{
/** Absorbs health damage. */
float shield;
/** Subtracts an amount from damage. */
float armor;
/** Subtracts an amount from damage. No need to save. */
transient float armor;
/** Shield opacity. */
transient float shieldAlpha = 0f;

18
core/src/mindustry/entities/comp/VelComp.java
View File

@@ -13,20 +13,24 @@ import static mindustry.Vars.*;
abstract class VelComp implements Posc{
@Import float x, y;
//TODO @SyncLocal this? does it even need to be sent?
transient final Vec2 vel = new Vec2();
@SyncLocal Vec2 vel = new Vec2();
transient float drag = 0f;
//velocity needs to be called first, as it affects delta and lastPosition
@MethodPriority(-1)
@Override
public void update(){
float px = x, py = y;
move(vel.x * Time.delta, vel.y * Time.delta);
if(Mathf.equal(px, x)) vel.x = 0;
if(Mathf.equal(py, y)) vel.y = 0;
//do not update velocity on the client at all, unless it's non-interpolated
//velocity conflicts with interpolation.
if(!net.client() || isLocal()){
float px = x, py = y;
move(vel.x * Time.delta, vel.y * Time.delta);
if(Mathf.equal(px, x)) vel.x = 0;
if(Mathf.equal(py, y)) vel.y = 0;
vel.scl(Math.max(1f - drag * Time.delta, 0));
vel.scl(Math.max(1f - drag * Time.delta, 0));
}
}
/** @return function to use for check solid state. if null, no checking is done. */

2
core/src/mindustry/logic/LCanvas.java
View File

@@ -181,7 +181,7 @@ public class LCanvas extends Table{
float dst = Math.min(y - this.y, Core.graphics.getHeight() - y);
if(dst < Scl.scl(100f)){ //scroll margin
int sign = Mathf.sign(Core.graphics.getHeight()/2f - y);
pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f));
pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f) * Time.delta);
}
}
}

35
core/src/mindustry/net/BeControl.java
View File

@@ -1,7 +1,6 @@
package mindustry.net;
import arc.*;
import arc.Net.*;
import arc.files.*;
import arc.func.*;
import arc.util.*;
@@ -62,27 +61,25 @@ public class BeControl{
/** asynchronously checks for updates. */
public void checkUpdate(Boolc done){
Core.net.httpGet("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest", res -> {
if(res.getStatus() == HttpStatus.OK){
Jval val = Jval.read(res.getResultAsString());
int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
if(newBuild > Version.build){
Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
String url = asset.getString("browser_download_url", "");
updateAvailable = true;
updateBuild = newBuild;
updateUrl = url;
Core.app.post(() -> {
showUpdateDialog();
done.get(true);
});
}else{
Core.app.post(() -> done.get(false));
}
Http.get("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest")
.error(e -> {}) //ignore errors
.submit(res -> {
Jval val = Jval.read(res.getResultAsString());
int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
if(newBuild > Version.build){
Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
String url = asset.getString("browser_download_url", "");
updateAvailable = true;
updateBuild = newBuild;
updateUrl = url;
Core.app.post(() -> {
showUpdateDialog();
done.get(true);
});
}else{
Core.app.post(() -> done.get(false));
}
}, error -> {}); //ignore errors
});
}
/** @return whether a new update is available */

9
core/src/mindustry/net/CrashSender.java
View File

@@ -1,7 +1,6 @@
package mindustry.net;
import arc.*;
import arc.Net.*;
import arc.files.*;
import arc.func.*;
import arc.struct.*;
@@ -150,12 +149,12 @@ public class CrashSender{
Log.info("Sending crash report.");
//post to crash report URL, exit code indicates send success
new arc.Net().http(new HttpRequest().block(true).method(HttpMethod.POST).content(value.toJson(OutputType.json)).url(Vars.crashReportURL), r -> {
Log.info("Crash sent successfully.");
System.exit(1);
}, t -> {
Http.post(Vars.crashReportURL, value.toJson(OutputType.json)).error(t -> {
Log.info("Crash report not sent.");
System.exit(-1);
}).block(r -> {
Log.info("Crash sent successfully.");
System.exit(1);
});
ret();

2
core/src/mindustry/ui/Styles.java
View File

@@ -39,6 +39,8 @@ public class Styles{
public static TreeStyle defaultTree;
public static void load(){
var whiteui = (TextureRegionDrawable)Tex.whiteui;
black = whiteui.tint(0f, 0f, 0f, 1f);
black9 = whiteui.tint(0f, 0f, 0f, 0.9f);
black8 = whiteui.tint(0f, 0f, 0f, 0.8f);

52
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -1,7 +1,6 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.Net.*;
import arc.graphics.*;
import arc.input.*;
import arc.math.*;
@@ -533,38 +532,27 @@ public class JoinDialog extends BaseDialog{
Log.info("Fetching community servers at @", url);
//get servers
Core.net.httpGet(url, result -> {
try{
if(result.getStatus() != HttpStatus.OK){
Log.warn("Failed to fetch community servers: @", result.getStatus());
return;
Http.get(url)
.error(t -> Log.err("Failed to fetch community servers", t))
.submit(result -> {
Jval val = Jval.read(result.getResultAsString());
Seq<ServerGroup> servers = new Seq<>();
val.asArray().each(child -> {
String name = child.getString("name", "");
String[] addresses;
if(child.has("addresses") || (child.has("address") && child.get("address").isArray())){
addresses = (child.has("addresses") ? child.get("addresses") : child.get("address")).asArray().map(Jval::asString).toArray(String.class);
}else{
addresses = new String[]{child.getString("address", "<invalid>")};
}
Jval val = Jval.read(result.getResultAsString());
Core.app.post(() -> {
try{
defaultServers.clear();
val.asArray().each(child -> {
String name = child.getString("name", "");
String[] addresses;
if(child.has("addresses") || (child.has("address") && child.get("address").isArray())){
addresses = (child.has("addresses") ? child.get("addresses") : child.get("address")).asArray().map(Jval::asString).toArray(String.class);
}else{
addresses = new String[]{child.getString("address", "<invalid>")};
}
defaultServers.add(new ServerGroup(name, addresses));
});
Log.info("Fetched @ community servers.", defaultServers.size);
}catch(Throwable e){
Log.err("Failed to parse community servers.");
Log.err(e);
}
});
}catch(Throwable e){
Log.err("Failed to fetch community servers.");
Log.err(e);
}
}, Log::err);
servers.add(new ServerGroup(name, addresses));
});
//modify default servers on main thread
Core.app.post(() -> {
defaultServers.addAll(servers);
Log.info("Fetched @ community servers.", defaultServers.size);
});
});
}
private void saveServers(){

161
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -1,7 +1,7 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.Net.*;
import arc.util.Http.*;
import arc.files.*;
import arc.func.*;
import arc.graphics.*;
@@ -104,6 +104,8 @@ public class ModsDialog extends BaseDialog{
if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){
ui.showErrorMessage("@feature.unsupported");
}else if(error instanceof HttpStatusException st){
ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase())));
}else{
ui.showException(error);
}
@@ -111,33 +113,27 @@ public class ModsDialog extends BaseDialog{
void getModList(Cons<Seq<ModListing>> listener){
if(modList == null){
Core.net.httpGet("https://raw.githubusercontent.com/Anuken/MindustryMods/master/mods.json", response -> {
Http.get("https://raw.githubusercontent.com/Anuken/MindustryMods/master/mods.json", response -> {
String strResult = response.getResultAsString();
var status = response.getStatus();
Core.app.post(() -> {
if(status != HttpStatus.OK){
ui.showErrorMessage(Core.bundle.format("connectfail", status));
}else{
try{
modList = JsonIO.json.fromJson(Seq.class, ModListing.class, strResult);
try{
modList = JsonIO.json.fromJson(Seq.class, ModListing.class, strResult);
var d = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
Func<String, Date> parser = text -> {
try{
return d.parse(text);
}catch(Exception e){
return new Date();
}
};
modList.sortComparing(m -> parser.get(m.lastUpdated)).reverse();
listener.get(modList);
}catch(Exception e){
e.printStackTrace();
ui.showException(e);
}
var d = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
Func<String, Date> parser = text -> {
try{
return d.parse(text);
}catch(Exception e){
return new Date();
}
};
modList.sortComparing(m -> parser.get(m.lastUpdated)).reverse();
listener.get(modList);
}catch(Exception e){
e.printStackTrace();
ui.showException(e);
}
});
}, error -> Core.app.post(() -> modError(error)));
@@ -423,21 +419,19 @@ public class ModsDialog extends BaseDialog{
//textures are only requested when the rendering happens; this assists with culling
if(!textureCache.containsKey(repo)){
textureCache.put(repo, last = Tex.nomap.getRegion());
Core.net.httpGet("https://raw.githubusercontent.com/Anuken/MindustryMods/master/icons/" + repo.replace("/", "_"), res -> {
if(res.getStatus() == HttpStatus.OK){
Pixmap pix = new Pixmap(res.getResult());
Core.app.post(() -> {
try{
var tex = new Texture(pix);
tex.setFilter(TextureFilter.linear);
textureCache.put(repo, new TextureRegion(tex));
pix.dispose();
}catch(Exception e){
Log.err(e);
}
});
}
textureCache.put(repo, last = Core.atlas.find("nomap"));
Http.get("https://raw.githubusercontent.com/Anuken/MindustryMods/master/icons/" + repo.replace("/", "_"), res -> {
Pixmap pix = new Pixmap(res.getResult());
Core.app.post(() -> {
try{
var tex = new Texture(pix);
tex.setFilter(TextureFilter.linear);
textureCache.put(repo, new TextureRegion(tex));
pix.dispose();
}catch(Exception e){
Log.err(e);
}
});
}, err -> {});
}
@@ -522,19 +516,17 @@ public class ModsDialog extends BaseDialog{
githubImportJavaMod(repo);
}else{
ui.loadfrag.show();
Core.net.httpGet(ghApi + "/repos/" + repo, res -> {
if(checkError(res)){
var json = Jval.read(res.getResultAsString());
String mainBranch = json.getString("default_branch");
String language = json.getString("language", "<none>");
Http.get(ghApi + "/repos/" + repo, res -> {
var json = Jval.read(res.getResultAsString());
String mainBranch = json.getString("default_branch");
String language = json.getString("language", "<none>");
//this is a crude heuristic for class mods; only required for direct github import
//TODO make a more reliable way to distinguish java mod repos
if(language.equals("Java") || language.equals("Kotlin")){
githubImportJavaMod(repo);
}else{
githubImportBranch(mainBranch, repo, this::showStatus);
}
//this is a crude heuristic for class mods; only required for direct github import
//TODO make a more reliable way to distinguish java mod repos
if(language.equals("Java") || language.equals("Kotlin")){
githubImportJavaMod(repo);
}else{
githubImportBranch(mainBranch, repo);
}
}, this::importFail);
}
@@ -542,62 +534,33 @@ public class ModsDialog extends BaseDialog{
private void githubImportJavaMod(String repo){
//grab latest release
Core.net.httpGet(ghApi + "/repos/" + repo + "/releases/latest", res -> {
if(checkError(res)){
var json = Jval.read(res.getResultAsString());
var assets = json.get("assets").asArray();
Http.get(ghApi + "/repos/" + repo + "/releases/latest", res -> {
var json = Jval.read(res.getResultAsString());
var assets = json.get("assets").asArray();
//prioritize dexed jar, as that's what Sonnicon's mod template outputs
var dexedAsset = assets.find(j -> j.getString("name").startsWith("dexed") && j.getString("name").endsWith(".jar"));
var asset = dexedAsset == null ? assets.find(j -> j.getString("name").endsWith(".jar")) : dexedAsset;
//prioritize dexed jar, as that's what Sonnicon's mod template outputs
var dexedAsset = assets.find(j -> j.getString("name").startsWith("dexed") && j.getString("name").endsWith(".jar"));
var asset = dexedAsset == null ? assets.find(j -> j.getString("name").endsWith(".jar")) : dexedAsset;
if(asset != null){
//grab actual file
var url = asset.getString("browser_download_url");
Core.net.httpGet(url, result -> {
if(checkError(result)){
handleMod(repo, result);
}
}, this::importFail);
}else{
throw new ArcRuntimeException("No JAR file found in releases. Make sure you have a valid jar file in the mod's latest Github Release.");
}
if(asset != null){
//grab actual file
var url = asset.getString("browser_download_url");
Http.get(url, result -> handleMod(repo, result), this::importFail);
}else{
throw new ArcRuntimeException("No JAR file found in releases. Make sure you have a valid jar file in the mod's latest Github Release.");
}
}, this::importFail);
}
private boolean checkError(HttpResponse res){
if(res.getStatus() == HttpStatus.OK){
return true;
}else{
showStatus(res.getStatus());
return false;
}
}
private void showStatus(HttpStatus status){
Core.app.post(() -> {
ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(status.toString().toLowerCase())));
ui.loadfrag.hide();
});
}
private void githubImportBranch(String branch, String repo, Cons<HttpStatus> err){
Core.net.httpGet(ghApi + "/repos/" + repo + "/zipball/" + branch, loc -> {
if(loc.getStatus() == HttpStatus.OK){
if(loc.getHeader("Location") != null){
Core.net.httpGet(loc.getHeader("Location"), result -> {
if(result.getStatus() != HttpStatus.OK){
err.get(result.getStatus());
}else{
handleMod(repo, result);
}
}, this::importFail);
}else{
handleMod(repo, loc);
}
private void githubImportBranch(String branch, String repo){
Http.get(ghApi + "/repos/" + repo + "/zipball/" + branch, loc -> {
if(loc.getHeader("Location") != null){
Http.get(loc.getHeader("Location"), result -> {
handleMod(repo, result);
}, this::importFail);
}else{
err.get(loc.getStatus());
handleMod(repo, loc);
}
}, this::importFail);
}

2
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -85,7 +85,7 @@ public class LiquidTurret extends Turret{
@Override
public boolean shouldActiveSound(){
return wasShooting;
return wasShooting && enabled;
}
@Override

2
core/src/mindustry/world/blocks/environment/Prop.java
View File

@@ -12,8 +12,6 @@ public class Prop extends Block{
breakable = true;
alwaysReplace = true;
instantDeconstruct = true;
deconstructThreshold = 0.35f;
breakEffect = Fx.breakProp;
}

2
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View File

@@ -34,7 +34,7 @@ public class PayloadMassDriver extends PayloadBlock{
public Sound shootSound = Sounds.shootBig;
public float shake = 3f;
public Effect transferEffect = new Effect(11f, 300f, e -> {
public Effect transferEffect = new Effect(11f, 600f, e -> {
if(!(e.data instanceof PayloadMassDriverData data)) return;
Tmp.v1.set(data.x, data.y).lerp(data.ox, data.oy, Interp.sineIn.apply(e.fin()));
data.payload.set(Tmp.v1.x, Tmp.v1.y, e.rotation);

15
core/src/mindustry/world/blocks/production/Separator.java
View File

@@ -128,19 +128,17 @@ public class Separator extends Block{
return !consumes.itemFilters.get(item.id);
}
//TODO write seed in 128 release, don't write it now for compatibility with 127.x
//@Override
//public byte version(){
// return 1;
//}
@Override
public byte version(){
return 1;
}
@Override
public void write(Writes write){
super.write(write);
write.f(progress);
write.f(warmup);
//TODO see above
//write.i(seed);
write.i(seed);
}
@Override
@@ -148,8 +146,7 @@ public class Separator extends Block{
super.read(read, revision);
progress = read.f();
warmup = read.f();
//TODO see above
//if(revision == 1) seed = read.i();
if(revision == 1) seed = read.i();
}
}
}