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

schematic server setting

Browse Source
This commit is contained in:
J-VdS 2020-08-19 19:10:25 +02:00
parent 4334a3c24b
commit 4938aac731
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ schematic.saved = Schematic saved.
schematic.delete.confirm = This schematic will be utterly eradicated.
schematic.rename = Rename Schematic
schematic.info = {0}x{1}, {2} blocks
schematic.disabled = [scarlet]Schematics are not allowed!
stat.wave = Waves Defeated:[accent] {0}
stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@ -824,6 +825,7 @@ rules.lighting = Lighting
rules.ambientlight = Ambient Light
rules.solarpowermultiplier = Solar Power Multiplier
content.item.name = Items
content.liquid.name = Liquids
content.unit.name = Units

16
core/src/mindustry/input/DesktopInput.java
View File

@ -329,7 +329,7 @@ public class DesktopInput extends InputHandler{
table.button(Icon.paste, Styles.clearPartiali, () -> {
ui.schematics.show();
}).tooltip("Schematics");
}).tooltip("Schematics").disabled(d -> !state.rules.schematicAllowed);
table.button(Icon.tree, Styles.clearPartiali, () -> {
ui.research.show();
@ -387,6 +387,8 @@ public class DesktopInput extends InputHandler{
if(Core.input.keyTap(Binding.schematic_menu) && !Core.scene.hasKeyboard()){
if(ui.schematics.isShown()){
ui.schematics.hide();
}else if(!state.rules.schematicAllowed) {
ui.showInfoToast("@schematic.disabled", 3f);
}else{
ui.schematics.show();
ui.schematics.focusSearchField();
@ -399,10 +401,14 @@ public class DesktopInput extends InputHandler{
}
if(Core.input.keyRelease(Binding.schematic_select) && !Core.scene.hasKeyboard()){
lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
useSchematic(lastSchematic);
if(selectRequests.isEmpty()){
lastSchematic = null;
if(!state.rules.schematicAllowed){
ui.showInfoToast("@schematic.disabled", 3f);
}else {
lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
useSchematic(lastSchematic);
if (selectRequests.isEmpty()) {
lastSchematic = null;
}
}
}

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@ -90,7 +90,7 @@ public class HudFragment extends Fragment{
select.button(Icon.menu, style, ui.paused::show);
flip = select.button(Icon.upOpen, style, this::toggleMenus).get();
select.button(Icon.paste, style, ui.schematics::show).disabled(!state.rules.schematicAllowed);
select.button(Icon.paste, style, ui.schematics::show).disabled(d -> !state.rules.schematicAllowed);
select.button(Icon.pause, style, () -> {
if(net.active()){

2
server/src/mindustry/server/ServerControl.java
View File

@ -61,7 +61,7 @@ public class ServerControl implements ApplicationListener{
"bans", "",
"admins", "",
"shufflemode", "custom",
"globalrules", "{reactorExplosions: false}"
"globalrules", "{reactorExplosions: false, schematicAllowed: true}"
);
Log.setLogger((level, text) -> {