mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 01:37:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1272

Browse Source
This commit is contained in:
Anuken
2019-12-29 12:24:51 -05:00
parent 730d30ef98
commit 566052cabf
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/scripts/global.js
View File

@ -25,6 +25,7 @@ importPackage(Packages.arc.func)
importPackage(Packages.arc.graphics) importPackage(Packages.arc.graphics)
importPackage(Packages.arc.graphics.g2d) importPackage(Packages.arc.graphics.g2d)
importPackage(Packages.arc.math) importPackage(Packages.arc.math)
importPackage(Packages.arc.math.geom)
importPackage(Packages.arc.scene) importPackage(Packages.arc.scene)
importPackage(Packages.arc.scene.actions) importPackage(Packages.arc.scene.actions)
importPackage(Packages.arc.scene.event) importPackage(Packages.arc.scene.event)

1
core/src/mindustry/game/Schematics.java
View File

@ -249,6 +249,7 @@ public class Schematics implements Loadable{
public void placeLoadout(Schematic schem, int x, int y){ public void placeLoadout(Schematic schem, int x, int y){
Stile coreTile = schem.tiles.find(s -> s.block instanceof CoreBlock); Stile coreTile = schem.tiles.find(s -> s.block instanceof CoreBlock);
if(coreTile == null) throw new IllegalArgumentException("Schematic has no core tile. Exiting.");
int ox = x - coreTile.x, oy = y - coreTile.y; int ox = x - coreTile.x, oy = y - coreTile.y;
schem.tiles.each(st -> { schem.tiles.each(st -> {
Tile tile = world.tile(st.x + ox, st.y + oy); Tile tile = world.tile(st.x + ox, st.y + oy);

2
core/src/mindustry/mod/ClassAccess.java
View File

File diff suppressed because one or more lines are too long

3
tools/src/mindustry/tools/ScriptStubGenerator.java
View File

@ -26,7 +26,7 @@ public class ScriptStubGenerator{
Array<String> nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess"); Array<String> nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess");
Array<Class<?>> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, Array<Class<?>> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class,
Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class); Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class, DataInputStream.class, DataOutputStream.class);
Array<String> nopackage = Array.with("java.lang", "java"); Array<String> nopackage = Array.with("java.lang", "java");
String fileTemplate = "package mindustry.mod;\n" + String fileTemplate = "package mindustry.mod;\n" +
@ -49,6 +49,7 @@ public class ScriptStubGenerator{
.include(FilterBuilder.prefix("arc.func")) .include(FilterBuilder.prefix("arc.func"))
.include(FilterBuilder.prefix("arc.struct")) .include(FilterBuilder.prefix("arc.struct"))
.include(FilterBuilder.prefix("arc.scene")) .include(FilterBuilder.prefix("arc.scene"))
.include(FilterBuilder.prefix("arc.math"))
)); ));
Array<Class<?>> classes = Array.with(reflections.getSubTypesOf(Object.class)); Array<Class<?>> classes = Array.with(reflections.getSubTypesOf(Object.class));