mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-10 02:47:02 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug and missing dependency preventing MapViewer from running correctly

Browse Source
This commit is contained in:
Collin Smith 2020-06-23 18:41:45 -07:00
parent cc1c43b7e6
commit 24eb6f1c9b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/riiablo/map/Map.java
View File

@ -1,6 +1,10 @@
package com.riiablo.map; package com.riiablo.map;
import java.util.Arrays;
import org.apache.commons.lang3.builder.ToStringBuilder;
import com.artemis.ComponentMapper; import com.artemis.ComponentMapper;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.ai.pfa.GraphPath; import com.badlogic.gdx.ai.pfa.GraphPath;
import com.badlogic.gdx.ai.pfa.SmoothableGraphPath; import com.badlogic.gdx.ai.pfa.SmoothableGraphPath;
@ -19,6 +23,7 @@ import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.IntSet; import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.Pool; import com.badlogic.gdx.utils.Pool;
import com.badlogic.gdx.utils.Pools; import com.badlogic.gdx.utils.Pools;
import com.riiablo.Riiablo; import com.riiablo.Riiablo;
import com.riiablo.codec.COFD2; import com.riiablo.codec.COFD2;
import com.riiablo.codec.excel.Levels; import com.riiablo.codec.excel.Levels;
@ -30,10 +35,6 @@ import com.riiablo.engine.server.component.Warp;
import com.riiablo.map.pfa.AStarPathFinder; import com.riiablo.map.pfa.AStarPathFinder;
import com.riiablo.map.pfa.Point2; import com.riiablo.map.pfa.Point2;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Arrays;
public class Map implements Disposable { public class Map implements Disposable {
private static final String TAG = "Map"; private static final String TAG = "Map";
private static final boolean DEBUG = true; private static final boolean DEBUG = true;

11
tools/src/com/riiablo/map/MapViewer.java
View File

@ -1,11 +1,15 @@
package com.riiablo.map; package com.riiablo.map;
import org.apache.commons.lang3.math.NumberUtils;
import com.artemis.BaseSystem; import com.artemis.BaseSystem;
import com.artemis.ComponentMapper; import com.artemis.ComponentMapper;
import com.artemis.World; import com.artemis.World;
import com.artemis.WorldConfiguration; import com.artemis.WorldConfiguration;
import com.artemis.WorldConfigurationBuilder; import com.artemis.WorldConfigurationBuilder;
import com.artemis.managers.TagManager; import com.artemis.managers.TagManager;
import net.mostlyoriginal.api.event.common.EventSystem;
import com.badlogic.gdx.Application; import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
@ -24,6 +28,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.utils.UIUtils; import com.badlogic.gdx.scenes.scene2d.utils.UIUtils;
import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.GdxRuntimeException;
import com.riiablo.COFs; import com.riiablo.COFs;
import com.riiablo.Colors; import com.riiablo.Colors;
import com.riiablo.Files; import com.riiablo.Files;
@ -64,6 +69,7 @@ import com.riiablo.engine.server.AnimDataResolver;
import com.riiablo.engine.server.AnimStepper; import com.riiablo.engine.server.AnimStepper;
import com.riiablo.engine.server.CofManager; import com.riiablo.engine.server.CofManager;
import com.riiablo.engine.server.ItemInteractor; import com.riiablo.engine.server.ItemInteractor;
import com.riiablo.engine.server.ItemManager;
import com.riiablo.engine.server.ObjectInitializer; import com.riiablo.engine.server.ObjectInitializer;
import com.riiablo.engine.server.ObjectInteractor; import com.riiablo.engine.server.ObjectInteractor;
import com.riiablo.engine.server.Pathfinder; import com.riiablo.engine.server.Pathfinder;
@ -83,10 +89,6 @@ import com.riiablo.map.pfa.GraphPath;
import com.riiablo.mpq.MPQFileHandleResolver; import com.riiablo.mpq.MPQFileHandleResolver;
import com.riiablo.util.DebugUtils; import com.riiablo.util.DebugUtils;
import net.mostlyoriginal.api.event.common.EventSystem;
import org.apache.commons.lang3.math.NumberUtils;
public class MapViewer extends ApplicationAdapter { public class MapViewer extends ApplicationAdapter {
private static final String TAG = "MapViewer"; private static final String TAG = "MapViewer";
@ -206,6 +208,7 @@ public class MapViewer extends ApplicationAdapter {
.with(mapManager) .with(mapManager)
.with(new CofManager()) .with(new CofManager())
.with(new ObjectInitializer()) .with(new ObjectInitializer())
.with(new ItemManager())
.with(new ObjectInteractor(), new WarpInteractor(), new ItemInteractor()) .with(new ObjectInteractor(), new WarpInteractor(), new ItemInteractor())
.with(new MenuManager(), new DialogManager()) .with(new MenuManager(), new DialogManager())