diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 1730c2c048..280650b8dc 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -50,7 +50,6 @@ importPackage(Packages.mindustry.editor) importPackage(Packages.mindustry.world.blocks.defense.turrets) importPackage(Packages.arc) importPackage(Packages.arc.scene.utils) -importPackage(Packages.arc.scene.actions) importPackage(Packages.arc.scene.event) importPackage(Packages.mindustry.ui) importPackage(Packages.mindustry.entities.bullet) @@ -58,14 +57,14 @@ importPackage(Packages.mindustry.graphics.g3d) importPackage(Packages.arc.math.geom) importPackage(Packages.arc.scene.ui.layout) importPackage(Packages.mindustry.world.blocks.liquid) -importPackage(Packages.mindustry.world.blocks.defense) importPackage(Packages.mindustry.world.blocks.environment) importPackage(Packages.mindustry.world.blocks.experimental) +importPackage(Packages.mindustry.world.blocks.defense) importPackage(Packages.mindustry.maps.filters) importPackage(Packages.mindustry.world.blocks.storage) importPackage(Packages.mindustry.graphics) -importPackage(Packages.arc.scene) importPackage(Packages.mindustry.world.blocks.power) +importPackage(Packages.arc.scene.actions) importPackage(Packages.mindustry.ui.fragments) importPackage(Packages.mindustry.ai.formations) importPackage(Packages.mindustry.world.modules) @@ -73,13 +72,14 @@ importPackage(Packages.arc.graphics) importPackage(Packages.mindustry.maps.generators) importPackage(Packages.mindustry.world.producers) importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.mindustry.ui.layout) importPackage(Packages.arc.util) importPackage(Packages.mindustry.world.consumers) -importPackage(Packages.mindustry.maps) -importPackage(Packages.mindustry.ui.layout) importPackage(Packages.mindustry.world.blocks.payloads) -importPackage(Packages.mindustry.entities) +importPackage(Packages.mindustry.maps) +importPackage(Packages.arc.scene) importPackage(Packages.mindustry.async) +importPackage(Packages.mindustry.entities) importPackage(Packages.mindustry) importPackage(Packages.mindustry.entities.units) importPackage(Packages.mindustry.ai.types) diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 5ad3716f30..673030a87e 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -269,7 +269,7 @@ public class DesktopInput extends InputHandler{ if(isPlacing() && mode == placing){ updateLine(selectX, selectY); }else if(!selectRequests.isEmpty()){ - rotateRequests(selectRequests, (int)Core.input.axisTap(Binding.rotate)); + rotateRequests(selectRequests, Mathf.sign(Core.input.axisTap(Binding.rotate))); } }