From cdc1337fcb5ad7928f5b0ae575f38cfef08ebcc6 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 19 Sep 2020 10:00:33 +0100 Subject: [PATCH 1/2] make techtree funcs public --- core/src/mindustry/content/TechTree.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 9900d75b0a..0afcf554e8 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -522,13 +522,13 @@ public class TechTree implements ContentList{ }); } - private static void setup(){ + public static void setup(){ TechNode.context = null; map = new ObjectMap<>(); all = new Seq<>(); } - private static TechNode node(UnlockableContent content, Runnable children){ + public static TechNode node(UnlockableContent content, Runnable children){ ItemStack[] requirements; if(content instanceof Block){ @@ -547,17 +547,17 @@ public class TechTree implements ContentList{ 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); } - private static TechNode node(UnlockableContent content, Seq objectives, Runnable children){ + public static TechNode node(UnlockableContent content, Seq objectives, Runnable children){ TechNode node = new TechNode(content, empty, children); node.objectives = objectives; return node; } - private static TechNode node(UnlockableContent block){ + public static TechNode node(UnlockableContent block){ return node(block, () -> {}); } From 68cf2af6e00d25912559fccc9e8798090852f1f2 Mon Sep 17 00:00:00 2001 From: Felix Corvus Date: Sat, 19 Sep 2020 17:34:49 +0300 Subject: [PATCH 2/2] missing keybind lines --- core/assets/bundles/bundle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4c98dcac96..6198519882 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -789,6 +789,9 @@ keybind.diagonal_placement.name = Diagonal Placement keybind.pick.name = Pick Block keybind.break_block.name = Break Block keybind.deselect.name = Deselect +keybind.pickupCargo.name = Pickup Cargo +keybind.dropCargo.name = Drop Cargo +keybind.command.name = Command keybind.shoot.name = Shoot keybind.zoom.name = Zoom keybind.menu.name = Menu