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

🔥🔥🔥🔥🔥🔥maximum breakage

Browse Source
This commit is contained in:
Anuken
2018-12-20 12:38:27 -05:00
parent cabcfc7136
commit 94908bc599
309 changed files with 1883 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/Map.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.maps;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.ucore.function.Supplier;
import io.anuke.arc.function.Supplier;
import java.io.InputStream;

4
core/src/io/anuke/mindustry/maps/MapMeta.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.maps;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
public class MapMeta{
public final int version;
@@ -31,7 +31,7 @@ public class MapMeta{
}
public String tag(String name){
return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Bundles.get("text.unknown");
return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Core.bundle.get("text.unknown");
}
public boolean hasOreGen(){

4
core/src/io/anuke/mindustry/maps/MapTileData.java
View File

@@ -4,8 +4,8 @@ import io.anuke.arc.utils.IntIntMap;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.world.Block;
import io.anuke.ucore.util.Bits;
import io.anuke.ucore.util.Structs;
import io.anuke.arc.util.Bits;
import io.anuke.arc.util.Structs;
import java.nio.ByteBuffer;

6
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -7,9 +7,9 @@ import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.Disposable;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.io.MapIO;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.ThreadArray;
import io.anuke.arc.function.Supplier;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.ThreadArray;
import java.io.DataInputStream;
import java.io.IOException;

2
core/src/io/anuke/mindustry/maps/Sector.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.maps.missions.*;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.ucore.util.Bits;
import io.anuke.arc.util.Bits;
import static io.anuke.mindustry.Vars.control;
import static io.anuke.mindustry.Vars.headless;

4
core/src/io/anuke/mindustry/maps/SectorPresets.java
View File

@@ -12,8 +12,8 @@ import io.anuke.mindustry.content.blocks.UpgradeBlocks;
import io.anuke.mindustry.entities.units.UnitCommand;
import io.anuke.mindustry.maps.missions.*;
import io.anuke.mindustry.type.Item;
import io.anuke.ucore.util.GridMap;
import io.anuke.ucore.util.Structs;
import io.anuke.arc.util.GridMap;
import io.anuke.arc.util.Structs;
import static io.anuke.mindustry.Vars.mobile;

12
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -27,8 +27,8 @@ import io.anuke.mindustry.type.Recipe.RecipeVisibility;
import io.anuke.mindustry.world.ColorMapper;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.defense.Wall;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.*;
import io.anuke.arc.core.Settings;
import io.anuke.arc.util.*;
import static io.anuke.mindustry.Vars.*;
@@ -161,7 +161,7 @@ public class Sectors{
}
grid.clear();
Array<Sector> out = Settings.getObject("sector-data-2", Array.class, Array::new);
Array<Sector> out = Core.settings.getObject("sector-data-2", Array.class, Array::new);
for(Sector sector : out){
@@ -190,8 +190,8 @@ public class Sectors{
}
}
Settings.putObject("sector-data-2", out);
Settings.save();
Core.settings.putObject("sector-data-2", out);
Core.settings.save();
}
private void initSector(Sector sector){
@@ -307,7 +307,7 @@ public class Sectors{
}
}
Core.app.postRunnable(() -> {
Core.app.post(() -> {
sector.texture = new Texture(pixmap);
pixmap.dispose();
});

2
core/src/io/anuke/mindustry/maps/TutorialSector.java
View File

@@ -62,7 +62,7 @@ public class TutorialSector{
new BlockMission(ProductionBlocks.mechanicalDrill).setMessage("$tutorial.generatordrill"),
new BlockMission(PowerBlocks.powerNode).setMessage("$tutorial.node"),
//TODO fix positions
new ConditionMission(Bundles.get("text.mission.linknode"), () -> world.tile(54, 52).entity != null && world.tile(54, 52).entity.power != null && world.tile(54, 52).entity.power.amount >= 0.01f)
new ConditionMission(Core.bundle.get("text.mission.linknode"), () -> world.tile(54, 52).entity != null && world.tile(54, 52).entity.power != null && world.tile(54, 52).entity.power.amount >= 0.01f)
.setMessage("$tutorial.nodelink"),
new ItemMission(Items.silicon, 70).setMessage("$tutorial.silicon"),

10
core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
View File

@@ -29,11 +29,11 @@ import io.anuke.mindustry.world.blocks.power.SolarGenerator;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import io.anuke.mindustry.world.blocks.storage.StorageBlock;
import io.anuke.mindustry.world.blocks.units.UnitFactory;
import io.anuke.ucore.function.BiFunction;
import io.anuke.ucore.function.IntPositionConsumer;
import io.anuke.ucore.function.TriFunction;
import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf;
import io.anuke.arc.function.BiFunction;
import io.anuke.arc.function.IntPositionConsumer;
import io.anuke.arc.function.TriFunction;
import io.anuke.arc.util.Geometry;
import io.anuke.arc.util.Mathf;
import static io.anuke.mindustry.Vars.content;

4
core/src/io/anuke/mindustry/maps/generation/Generation.java
View File

@@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.production.Drill;
import io.anuke.ucore.util.Structs;
import io.anuke.ucore.util.SeedRandom;
import io.anuke.arc.util.Structs;
import io.anuke.arc.util.SeedRandom;
public class Generation{
public final Sector sector;

12
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -21,12 +21,12 @@ import io.anuke.mindustry.world.Pos;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.ucore.noise.RidgedPerlin;
import io.anuke.ucore.noise.Simplex;
import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.SeedRandom;
import io.anuke.ucore.util.Structs;
import io.anuke.arc.noise.RidgedPerlin;
import io.anuke.arc.noise.Simplex;
import io.anuke.arc.util.Geometry;
import io.anuke.arc.util.Mathf;
import io.anuke.arc.util.SeedRandom;
import io.anuke.arc.util.Structs;
import static io.anuke.mindustry.Vars.*;

4
core/src/io/anuke/mindustry/maps/missions/ActionMission.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
import static io.anuke.mindustry.Vars.threads;
@@ -27,6 +27,6 @@ public class ActionMission extends Mission{
@Override
public String displayString(){
return Bundles.get("text.loading");
return Core.bundle.get("text.loading");
}
}

4
core/src/io/anuke/mindustry/maps/missions/BattleMission.java
View File

@@ -8,7 +8,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.maps.generation.FortressGenerator;
import io.anuke.mindustry.maps.generation.Generation;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
import static io.anuke.mindustry.Vars.*;
@@ -43,7 +43,7 @@ public class BattleMission extends MissionWithStartingCore{
@Override
public String displayString(){
return Bundles.get("text.mission.battle");
return Core.bundle.get("text.mission.battle");
}
@Override

18
core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java
View File

@@ -2,12 +2,12 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.world.Block;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Mathf;
import io.anuke.arc.core.Timers;
import io.anuke.arc.graphics.Draw;
import io.anuke.arc.graphics.Lines;
import io.anuke.arc.util.Angles;
import io.anuke.arc.util.Bundles;
import io.anuke.arc.util.Mathf;
import static io.anuke.mindustry.Vars.players;
import static io.anuke.mindustry.Vars.tilesize;
@@ -36,10 +36,10 @@ public class BlockLocMission extends Mission{
Lines.stroke(2f);
Draw.color(Palette.accentBack);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1f, block.size * tilesize/2f + 1f+ Mathf.absin(Timers.time(), 6f, 2f));
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1f, block.size * tilesize/2f + 1f+ Mathf.absin(Time.time(), 6f, 2f));
Draw.color(Palette.accent);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize/2f + 1f+ Mathf.absin(Timers.time(), 6f, 2f));
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize/2f + 1f+ Mathf.absin(Time.time(), 6f, 2f));
if(block.rotate){
@@ -67,6 +67,6 @@ public class BlockLocMission extends Mission{
@Override
public String displayString(){
return Bundles.format("text.mission.block", block.formalName);
return Core.bundle.format("text.mission.block", block.formalName);
}
}

4
core/src/io/anuke/mindustry/maps/missions/CommandMission.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.units.UnitCommand;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
public class CommandMission extends Mission{
private final UnitCommand command;
@@ -24,6 +24,6 @@ public class CommandMission extends Mission{
@Override
public String displayString(){
return Bundles.format("text.mission.command", command.localized());
return Core.bundle.format("text.mission.command", command.localized());
}
}

2
core/src/io/anuke/mindustry/maps/missions/ConditionMission.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.ucore.function.BooleanProvider;
import io.anuke.arc.function.BooleanProvider;
public class ConditionMission extends Mission{
private final BooleanProvider complete;

4
core/src/io/anuke/mindustry/maps/missions/ContentMission.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
public class ContentMission extends Mission {
private final UnlockableContent content;
@@ -30,6 +30,6 @@ public class ContentMission extends Mission {
@Override
public String displayString() {
return Bundles.format("text.mission.create", content.localizedName());
return Core.bundle.format("text.mission.create", content.localizedName());
}
}

6
core/src/io/anuke/mindustry/maps/missions/ItemMission.java
View File

@@ -4,7 +4,7 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
import static io.anuke.mindustry.Vars.state;
@@ -32,11 +32,11 @@ public class ItemMission extends Mission{
public String displayString(){
TileEntity core = Vars.players[0].getClosestCore();
if(core == null) return "imminent doom";
return Bundles.format("text.mission.resource", item.localizedName(), core.items.get(item), amount);
return Core.bundle.format("text.mission.resource", item.localizedName(), core.items.get(item), amount);
}
@Override
public String menuDisplayString(){
return Bundles.format("text.mission.resource.menu", item.localizedName(), amount);
return Core.bundle.format("text.mission.resource.menu", item.localizedName(), amount);
}
}

4
core/src/io/anuke/mindustry/maps/missions/MechMission.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.type.Mech;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
public class MechMission extends Mission{
private final Mech mech;
@@ -24,6 +24,6 @@ public class MechMission extends Mission{
@Override
public String displayString(){
return Bundles.format("text.mission.mech", mech.localizedName());
return Core.bundle.format("text.mission.mech", mech.localizedName());
}
}

10
core/src/io/anuke/mindustry/maps/missions/Mission.java
View File

@@ -7,9 +7,9 @@ import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.maps.Sector;
import io.anuke.mindustry.maps.generation.Generation;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.core.Timers;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Bundles;
import static io.anuke.mindustry.Vars.*;
@@ -76,12 +76,12 @@ public abstract class Mission{
}
public void onBegin(){
Timers.runTask(60f, this::showMessage);
Time.runTask(60f, this::showMessage);
}
public void onComplete(){
if(showComplete && !headless){
threads.runGraphics(() -> ui.hudfrag.showToast("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Bundles.get("text.mission.complete")));
threads.runGraphics(() -> ui.hudfrag.showToast("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Core.bundle.get("text.mission.complete")));
}
}

4
core/src/io/anuke/mindustry/maps/missions/UnitMission.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
public class UnitMission extends Mission{
private final UnitType type;
@@ -24,6 +24,6 @@ public class UnitMission extends Mission{
@Override
public String displayString(){
return Bundles.format("text.mission.unit", type.localizedName());
return Core.bundle.format("text.mission.unit", type.localizedName());
}
}

2
core/src/io/anuke/mindustry/maps/missions/VictoryMission.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.game.GameMode;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Table;
public class VictoryMission extends Mission{
@Override

8
core/src/io/anuke/mindustry/maps/missions/WaveMission.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.Waves;
import io.anuke.mindustry.maps.Sector;
import io.anuke.mindustry.maps.generation.Generation;
import io.anuke.ucore.util.Bundles;
import io.anuke.arc.util.Bundles;
import static io.anuke.mindustry.Vars.*;
@@ -59,16 +59,16 @@ public class WaveMission extends MissionWithStartingCore{
@Override
public String displayString(){
return state.wave > target ?
Bundles.format(
Core.bundle.format(
state.enemies() > 1 ?
"text.mission.wave.enemies" :
"text.mission.wave.enemy", target, target, state.enemies()) :
Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60));
Core.bundle.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60));
}
@Override
public String menuDisplayString(){
return Bundles.format("text.mission.wave.menu", target);
return Core.bundle.format("text.mission.wave.menu", target);
}
@Override