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

Mod path resolving fixes

Browse Source
This commit is contained in:
Anuken
2019-12-15 16:00:50 -05:00
parent ab21b88001
commit 7d2354a653
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/FileTree.java
View File

@@ -17,6 +17,8 @@ public class FileTree implements FileHandleResolver{
public FileHandle get(String path){ public FileHandle get(String path){
if(files.containsKey(path)){ if(files.containsKey(path)){
return files.get(path); return files.get(path);
}else if(files.containsKey("/" + path)){
return files.get("/" + path);
}else{ }else{
return Core.files.internal(path); return Core.files.internal(path);
} }

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -150,7 +150,7 @@ public class DesktopInput extends InputHandler{
if(state.is(State.menu) || Core.scene.hasDialog()) return; if(state.is(State.menu) || Core.scene.hasDialog()) return;
//zoom camera //zoom camera
if(Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((block == null || !block.rotate) && selectRequests.isEmpty()))){ if(!Core.scene.hasScroll() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((block == null || !block.rotate) && selectRequests.isEmpty()))){
renderer.scaleCamera(Core.input.axisTap(Binding.zoom)); renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
} }

2
core/src/io/anuke/mindustry/mod/Mods.java
View File

@@ -663,7 +663,7 @@ public class Mods implements Loadable{
/** Content with intialization code. */ /** Content with intialization code. */
public ObjectSet<Content> erroredContent = new ObjectSet<>(); public ObjectSet<Content> erroredContent = new ObjectSet<>();
/** Current state of this mod. */ /** Current state of this mod. */
public ModState state = ModState.disabled; public ModState state = ModState.enabled;
public LoadedMod(FileHandle file, FileHandle root, Mod main, ModMeta meta){ public LoadedMod(FileHandle file, FileHandle root, Mod main, ModMeta meta){
this.root = root; this.root = root;

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=3076d3a079f4bf388432c40d8e6c4bf9927dce9a archash=60d97c3e52131d2d8be45a1d2f1bfe19c2e343a2