mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-10 15:19:24 +07:00
Cleanup
This commit is contained in:
parent
c6fc103bff
commit
9ddd76d6cb
@ -343,7 +343,6 @@ public class World{
|
|||||||
dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
|
dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO tweak noise and radius
|
|
||||||
if(state.hasSector()){
|
if(state.hasSector()){
|
||||||
int circleBlend = 14;
|
int circleBlend = 14;
|
||||||
//quantized angle
|
//quantized angle
|
||||||
|
@ -21,7 +21,6 @@ import mindustry.game.EventType.*;
|
|||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
import mindustry.graphics.*;
|
import mindustry.graphics.*;
|
||||||
import mindustry.graphics.MultiPacker.*;
|
import mindustry.graphics.MultiPacker.*;
|
||||||
import mindustry.plugin.*;
|
|
||||||
import mindustry.type.*;
|
import mindustry.type.*;
|
||||||
import mindustry.ui.*;
|
import mindustry.ui.*;
|
||||||
|
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
package mindustry.plugin;
|
package mindustry.mod;
|
||||||
|
|
||||||
import mindustry.mod.*;
|
|
||||||
|
|
||||||
/** Defines a special type of mod that is always hidden. */
|
/** Defines a special type of mod that is always hidden. */
|
||||||
public abstract class Plugin extends Mod{
|
public abstract class Plugin extends Mod{
|
@ -55,6 +55,8 @@ public class Planet extends UnlockableContent{
|
|||||||
public @NonNull Planet solarSystem;
|
public @NonNull Planet solarSystem;
|
||||||
/** All planets orbiting this one, in ascending order of radius. */
|
/** All planets orbiting this one, in ascending order of radius. */
|
||||||
public Array<Planet> children = new Array<>();
|
public Array<Planet> children = new Array<>();
|
||||||
|
/** Sattelites orbiting this planet. */
|
||||||
|
public Array<Satellite> satellites = new Array<>();
|
||||||
/** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */
|
/** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */
|
||||||
protected Prov<PlanetMesh> meshLoader = () -> new SunMesh(this, 2);
|
protected Prov<PlanetMesh> meshLoader = () -> new SunMesh(this, 2);
|
||||||
|
|
||||||
|
12
core/src/mindustry/type/Satellite.java
Normal file
12
core/src/mindustry/type/Satellite.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package mindustry.type;
|
||||||
|
|
||||||
|
import arc.util.ArcAnnotate.*;
|
||||||
|
|
||||||
|
/** Any object that is orbiting a planet. */
|
||||||
|
public class Satellite{
|
||||||
|
public @NonNull Planet planet;
|
||||||
|
|
||||||
|
public Satellite(@NonNull Planet orbiting){
|
||||||
|
this.planet = orbiting;
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +1,3 @@
|
|||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||||
archash=66e5566de0832e721ea552ccd31f0febfb6233d7
|
archash=e925e63ed9201fd2f20a06cc6736f07c936f6882
|
||||||
|
Loading…
Reference in New Issue
Block a user