mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Block classes are now responsible for flipping of blocks in schematics. (#6254)

Browse Source
This commit is contained in:
Zelaux 2021-10-31 18:35:16 +05:00 committed by GitHub
parent d16739f86a
commit 24810ddbf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/input/InputHandler.java
View File

@ -696,9 +696,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}); });
//flip rotation //flip rotation
if(x == (req.rotation % 2 == 0)){ req.block.flipRotation(req, x);
req.rotation = Mathf.mod(req.rotation + 2, 4);
}
}); });
} }

9
core/src/mindustry/world/Block.java
View File

@ -468,7 +468,7 @@ public class Block extends UnlockableContent{
if(hasItems && configurable){ if(hasItems && configurable){
bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity)); bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
} }
if(unitCapModifier != 0){ if(unitCapModifier != 0){
stats.add(Stat.maxUnits, (unitCapModifier < 0 ? "-" : "+") + Math.abs(unitCapModifier)); stats.add(Stat.maxUnits, (unitCapModifier < 0 ? "-" : "+") + Math.abs(unitCapModifier));
} }
@ -824,7 +824,7 @@ public class Block extends UnlockableContent{
} }
clipSize = Math.max(clipSize, size * tilesize); clipSize = Math.max(clipSize, size * tilesize);
//only kept to ensure compatibility with v6 mods. //only kept to ensure compatibility with v6 mods.
if(expanded){ if(expanded){
clipSize += tilesize * 10f; clipSize += tilesize * 10f;
@ -989,4 +989,9 @@ public class Block extends UnlockableContent{
packer.add(PageType.editor, name + "-icon-editor", editorBase); packer.add(PageType.editor, name + "-icon-editor", editorBase);
} }
public void flipRotation(BuildPlan req, boolean x){
if(x == (req.rotation % 2 == 0)){
req.rotation = Mathf.mod(req.rotation + 2, 4);
}
}
} }