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

Updated wiki links

Browse Source
This commit is contained in:
Anuken
2020-11-28 23:59:56 -05:00
parent 3d6fd8a351
commit 23fc86fac1
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View File

@@ -56,7 +56,7 @@ public class Vars implements Loadable{
/** URL for sending crash reports to */ /** URL for sending crash reports to */
public static final String crashReportURL = "http://192.99.169.18/report"; public static final String crashReportURL = "http://192.99.169.18/report";
/** URL the links to the wiki's modding guide.*/ /** URL the links to the wiki's modding guide.*/
public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/"; public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/1-modding/";
/** URL to the JSON file containing all the global, public servers. Not queried in BE. */ /** URL to the JSON file containing all the global, public servers. Not queried in BE. */
public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json"; public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json";
/** URL to the JSON file containing all the BE servers. Only queried in BE. */ /** URL to the JSON file containing all the BE servers. Only queried in BE. */

4
core/src/mindustry/mod/ContentParser.java
View File

@@ -309,6 +309,10 @@ public class ContentParser{
} }
if(value.has("controller")){
unit.defaultController = make(resolve(value.getString("controller"), "mindustry.ai.type"));
}
//read extra default waves //read extra default waves
if(value.has("waves")){ if(value.has("waves")){
JsonValue waves = value.remove("waves"); JsonValue waves = value.remove("waves");

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

@@ -4,7 +4,7 @@ import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import mindustry.world.*; import mindustry.world.*;
/**A type of floor that is overlaid on top of over floors.*/ /**A type of floor that is overlaid on top of other floors.*/
public class OverlayFloor extends Floor{ public class OverlayFloor extends Floor{
public OverlayFloor(String name){ public OverlayFloor(String name){

16
core/src/mindustry/world/blocks/units/ControlCenter.java
View File

@@ -1,16 +0,0 @@
package mindustry.world.blocks.units;
import mindustry.gen.*;
import mindustry.world.*;
public class ControlCenter extends Block{
public ControlCenter(String name){
super(name);
update = true;
}
public class ControlCenterBuild extends Building{
}
}