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

Display content in mod error

Browse Source
This commit is contained in:
Anuken
2019-10-23 14:37:22 -04:00
parent 151dca6fb9
commit b0409b31d8
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/core/ContentLoader.java
View File

@@ -7,6 +7,7 @@ import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.ctype.*;
import io.anuke.mindustry.entities.bullet.*;
import io.anuke.mindustry.mod.Mods.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
@@ -113,7 +114,7 @@ public class ContentLoader{
callable.accept(content);
}catch(Throwable e){
if(content.mod != null){
mods.handleError(e, content.mod);
mods.handleError(new ModLoadException(content, e), content.mod);
}else{
throw new RuntimeException(e);
}

8
core/src/io/anuke/mindustry/mod/Mods.java
View File

@@ -567,5 +567,13 @@ public class Mods implements Loadable{
this.mod = content.mod;
}
}
public ModLoadException(@Nullable Content content, Throwable cause){
super(cause);
this.content = content;
if(content != null){
this.mod = content.mod;
}
}
}
}

3
core/src/io/anuke/mindustry/type/Mech.java
View File

@@ -4,6 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.ArcAnnotate.*;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.ctype.UnlockableContent;
import io.anuke.mindustry.graphics.Pal;
@@ -31,7 +32,7 @@ public class Mech extends UnlockableContent{
public float compoundSpeed, compoundSpeedBoost;
public float weaponOffsetX, weaponOffsetY, engineOffset = 5f, engineSize = 2.5f;
public Weapon weapon;
public @NonNull Weapon weapon;
public TextureRegion baseRegion, legRegion, region;