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

Fixed some admin bugs

Browse Source
This commit is contained in:
Anuken
2018-02-26 22:05:07 -05:00
parent 00c204b589
commit 17b17222b6
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
android:theme="@style/GdxTheme" > android:theme="@style/GdxTheme" >
<activity <activity
android:name="io.anuke.mindustry.AndroidLauncher" android:name="io.anuke.mindustry.AndroidLauncher"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="sensorLandscape" android:screenOrientation="sensorLandscape"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"> android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
<intent-filter> <intent-filter>

2
core/assets/ui/uiskin.json
View File

@@ -62,7 +62,7 @@ io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: {
emptytoggle: {imageCheckedColor: white, imageDownColor: white, imageUpColor: lightgray}, emptytoggle: {imageCheckedColor: white, imageDownColor: white, imageUpColor: lightgray},
static: {up: button }, static: {up: button },
static-down: {up: button-down }, static-down: {up: button-down },
toggle: {checked: button-down, down: button-down, up: button }, toggle: {checked: button-down, down: button-down, up: button, imageDisabledColor: lightgray, imageUpColor: white },
togglemap: {down: button-map-down, up: button-map }, togglemap: {down: button-map-down, up: button-map },
select: {checked: button-select, up: clear }, select: {checked: button-select, up: clear },
close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button } close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button }

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 26 19:08:43 EST 2018 #Mon Feb 26 22:02:38 EST 2018
version=release version=release
androidBuildCode=292 androidBuildCode=303
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=custom build

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -283,7 +283,7 @@ public class NetServer extends Module{
}else if(packet.action == AdminAction.trace){ }else if(packet.action == AdminAction.trace){
TracePacket trace = new TracePacket(); TracePacket trace = new TracePacket();
trace.info = admins.getTrace(ip); trace.info = admins.getTrace(ip);
Net.sendTo(other.clientid, trace, SendMode.tcp); Net.sendTo(id, trace, SendMode.tcp);
Log.info("&lc{0} has requested trace info of {1}.", player.name, other.name); Log.info("&lc{0} has requested trace info of {1}.", player.name, other.name);
} }
}); });

5
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -24,13 +24,14 @@ public class BackgroundFragment implements Fragment {
Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f, Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f,
back.getRegionWidth()*backscl, back.getRegionHeight()*backscl); back.getRegionWidth()*backscl, back.getRegionHeight()*backscl);
float logoscl = (int)Unit.dp.scl(7); boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight();
float logoscl = (int)Unit.dp.scl(7) * (portrait ? 5f/7f : 1f);
TextureRegion logo = Core.skin.getRegion("logotext"); TextureRegion logo = Core.skin.getRegion("logotext");
float logow = logo.getRegionWidth()*logoscl; float logow = logo.getRegionWidth()*logoscl;
float logoh = logo.getRegionHeight()*logoscl; float logoh = logo.getRegionHeight()*logoscl;
Draw.color(); Draw.color();
Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15 + (portrait ? -Unit.dp.scl(30f) : 0f), logow, logoh);
}).visible(() -> state.is(State.menu)).grow(); }).visible(() -> state.is(State.menu)).grow();
} }
} }

7
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -15,6 +15,7 @@ import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.builders.button; import io.anuke.ucore.scene.builders.button;
import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table; import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Stack; import io.anuke.ucore.scene.ui.layout.Stack;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
@@ -160,8 +161,10 @@ public class PlayerListFragment implements Fragment{
NetEvents.handleAdminSet(player, true); NetEvents.handleAdminSet(player, true);
}); });
} }
}).update(b -> b.setChecked(connection != null && netServer.admins.isAdmin(connection.address))) }).update(b ->{
.disabled(Net.client()); b.setChecked(connection != null && netServer.admins.isAdmin(connection.address));
b.setDisabled(Net.client());
}).get().setTouchable(() -> Net.client() ? Touchable.disabled : Touchable.enabled);
//TODO trace info for player //TODO trace info for player
t.addImageButton("icon-zoom-small", 14*2, () -> NetEvents.handleTraceRequest(player)); t.addImageButton("icon-zoom-small", 14*2, () -> NetEvents.handleTraceRequest(player));