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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-09-19 12:31:06 -04:00
parent 9b0947a6e5 c865dbb465
commit ce8e060f29
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/bundles/bundle.properties
View File

@@ -789,6 +789,9 @@ keybind.diagonal_placement.name = Diagonal Placement
keybind.pick.name = Pick Block keybind.pick.name = Pick Block
keybind.break_block.name = Break Block keybind.break_block.name = Break Block
keybind.deselect.name = Deselect keybind.deselect.name = Deselect
keybind.pickupCargo.name = Pickup Cargo
keybind.dropCargo.name = Drop Cargo
keybind.command.name = Command
keybind.shoot.name = Shoot keybind.shoot.name = Shoot
keybind.zoom.name = Zoom keybind.zoom.name = Zoom
keybind.menu.name = Menu keybind.menu.name = Menu

10
core/src/mindustry/content/TechTree.java
View File

@@ -522,13 +522,13 @@ public class TechTree implements ContentList{
}); });
} }
private static void setup(){ public static void setup(){
TechNode.context = null; TechNode.context = null;
map = new ObjectMap<>(); map = new ObjectMap<>();
all = new Seq<>(); all = new Seq<>();
} }
private static TechNode node(UnlockableContent content, Runnable children){ public static TechNode node(UnlockableContent content, Runnable children){
ItemStack[] requirements; ItemStack[] requirements;
if(content instanceof Block){ if(content instanceof Block){
@@ -547,17 +547,17 @@ public class TechTree implements ContentList{
return node(content, requirements, children); return node(content, requirements, children);
} }
private static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){ public static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
return new TechNode(content, requirements, children); return new TechNode(content, requirements, children);
} }
private static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){ public static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
TechNode node = new TechNode(content, empty, children); TechNode node = new TechNode(content, empty, children);
node.objectives = objectives; node.objectives = objectives;
return node; return node;
} }
private static TechNode node(UnlockableContent block){ public static TechNode node(UnlockableContent block){
return node(block, () -> {}); return node(block, () -> {});
} }