Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-21 13:28:12 +03:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-10-23 16:04:19 -04:00
parent b7c1660b07
commit f1a423f8fb
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@ -40,10 +40,15 @@ public class TechTreeDialog extends FloatingDialog{
titleTable.remove();
margin(0f).marginBottom(8);
cont.stack(view = new View(), items = new ItemsDisplay()).grow();
Stack stack = cont.stack(view = new View(), items = new ItemsDisplay()).grow().get();
Events.on(ContentReloadEvent.class, e -> {
nodes.clear();
root = new TechTreeNode(TechTree.root, null);
checkNodes(root);
treeLayout();
stack.getChildren().get(0).remove();
stack.addChildAt(0, view = new View());
});
shown(() -> {
@ -357,7 +362,6 @@ public class TechTreeDialog extends FloatingDialog{
infoTable.table(t -> t.margin(3f).left().labelWrap(node.block.description).color(Color.lightGray).growX()).fillX();
}
addChild(infoTable);
infoTable.pack();
infoTable.act(Core.graphics.getDeltaTime());

3
core/src/io/anuke/mindustry/world/blocks/production/Separator.java
View File

@ -4,6 +4,7 @@ import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.ArcAnnotate.*;
import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
@ -20,7 +21,7 @@ import io.anuke.mindustry.world.meta.values.ItemFilterValue;
* Extracts a random list of items from an input item and an input liquid.
*/
public class Separator extends Block{
protected ItemStack[] results;
protected @NonNull ItemStack[] results;
protected float craftTime;
protected float spinnerRadius = 2.5f;
protected float spinnerLength = 1f;

3
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
View File

@ -6,6 +6,7 @@ import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
import io.anuke.arc.util.*;
import io.anuke.arc.util.ArcAnnotate.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.traits.*;
@ -23,7 +24,7 @@ import java.io.*;
import static io.anuke.mindustry.Vars.*;
public class MechPad extends Block{
protected Mech mech;
protected @NonNull Mech mech;
protected float buildTime = 60 * 5;
public MechPad(String name){