Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dir change #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix dir change #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions src/betamindy/BetaMindy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
import arc.*;
import arc.func.*;
import arc.struct.*;
import arc.util.Log;
import arc.util.*;
import betamindy.content.*;
import betamindy.util.*;
import betamindy.util.xelo.XeloUtil;
import mindustry.*;
import mindustry.ctype.*;
import mindustry.game.EventType.*;
import mindustry.mod.*;
import mindustry.mod.Mods.*;
import betamindy.content.*;
import mindustry.net.*;
import mindustry.ui.*;
import mindustry.world.*;
Expand All @@ -22,26 +21,24 @@ public class BetaMindy extends Mod{
public static final String githubURL = "https://github.com/sk7725/BetaMindy";
public static final String shortName = "[#b59e72]Demo of Chaos Itself[]"; //do not use bundles unless you want to region-lock the multiplayer experience
public static SettingAdder settingAdder = new SettingAdder();
public static XeloUtil pushUtil = new XeloUtil();
public static MobileFunctions mobileUtil = new MobileFunctions();
public static Seq<Block> visibleBlockList = new Seq<>();
//public static UnitGravity gravity = new UnitGravity();

private final ContentList[] mindyContent = {
new OverWriter(),
new MindyStatusEffects(),
new MindyItems(),
new MindyBullets(),
new MindyUnitTypes(),
new MindyBlocks(),
new MindyTechTree(),
new MindyWeathers()
new OverWriter(),
new MindyStatusEffects(),
new MindyItems(),
new MindyBullets(),
new MindyUnitTypes(),
new MindyBlocks(),
new MindyTechTree(),
new MindyWeathers()
};

public BetaMindy() {
public BetaMindy(){
super();
MindySounds.load();
pushUtil.init();
if(Vars.mobile) mobileUtil.init();

Events.run(DisposeEvent.class, MindySounds::dispose);
Expand Down Expand Up @@ -75,7 +72,7 @@ public void init(){

//used for block weather
Events.run(ClientLoadEvent.class, () -> {
for(Block block : Vars.content.blocks()) {
for(Block block : Vars.content.blocks()){
if((block instanceof ConstructBlock || !block.hasBuilding()) || block.icon(Cicon.medium) == Core.atlas.find("error")) return;
visibleBlockList.add(block);
}
Expand Down
8 changes: 4 additions & 4 deletions src/betamindy/util/xelo/Movable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package betamindy.util.xelo;

import arc.math.geom.Point2;
import arc.util.pooling.Pool;
import mindustry.gen.Building;
import arc.math.geom.*;
import arc.util.pooling.*;
import mindustry.gen.*;

public interface Movable extends Pool.Poolable {
public interface Movable extends Pool.Poolable{

void set(Building building, Point2 direction);

Expand Down
19 changes: 9 additions & 10 deletions src/betamindy/util/xelo/Movables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
package betamindy.util.xelo;

import arc.util.pooling.Pools;
import betamindy.util.xelo.movables.BridgeMovable;
import betamindy.util.xelo.movables.PowerNodeMovable;
import mindustry.gen.Building;
import mindustry.world.blocks.distribution.ItemBridge;
import mindustry.world.blocks.power.PowerNode;
import arc.util.pooling.*;
import betamindy.util.xelo.movables.*;
import mindustry.gen.*;
import mindustry.world.blocks.distribution.*;
import mindustry.world.blocks.power.*;

public class Movables {
public class Movables{

public static Movable get(Building building) {
if(building instanceof ItemBridge.ItemBridgeBuild) {
public static Movable get(Building building){
if(building instanceof ItemBridge.ItemBridgeBuild){
// We don't need to check for LiquidBridgeBuild as it extend ItemBridgeBuild
return Pools.obtain(BridgeMovable.class, BridgeMovable::new);
}
if(building instanceof PowerNode.PowerNodeBuild) {
if(building instanceof PowerNode.PowerNodeBuild){
return Pools.obtain(PowerNodeMovable.class, PowerNodeMovable::new);
}

Expand Down
Loading