Mod path resolving fixes
This commit is contained in:
@@ -17,6 +17,8 @@ public class FileTree implements FileHandleResolver{
|
||||
public FileHandle get(String path){
|
||||
if(files.containsKey(path)){
|
||||
return files.get(path);
|
||||
}else if(files.containsKey("/" + path)){
|
||||
return files.get("/" + path);
|
||||
}else{
|
||||
return Core.files.internal(path);
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ public class DesktopInput extends InputHandler{
|
||||
if(state.is(State.menu) || Core.scene.hasDialog()) return;
|
||||
|
||||
//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));
|
||||
}
|
||||
|
||||
|
||||
@@ -663,7 +663,7 @@ public class Mods implements Loadable{
|
||||
/** Content with intialization code. */
|
||||
public ObjectSet<Content> erroredContent = new ObjectSet<>();
|
||||
/** 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){
|
||||
this.root = root;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||
archash=3076d3a079f4bf388432c40d8e6c4bf9927dce9a
|
||||
archash=60d97c3e52131d2d8be45a1d2f1bfe19c2e343a2
|
||||
|
||||
Reference in New Issue
Block a user