Merge branch 'development' into feature/launch-by-uuid

This commit is contained in:
Jak
2018-09-07 18:23:45 +01:00
committed by GitHub
3 changed files with 51 additions and 30 deletions
+16 -15
View File
@@ -1,30 +1,31 @@
- name: priority:low labels:
- name: priority:low
color: bfe5bf color: bfe5bf
- name: priority:medium - name: priority:medium
color: bfe5bf color: bfe5bf
- name: priority:high - name: priority:high
color: bfe5bf color: bfe5bf
- name: status:accepted - name: status:accepted
color: fef2c0 color: fef2c0
- name: status:unconfirmed - name: status:unconfirmed
color: fef2c0 color: fef2c0
- name: status:needs more info - name: status:needs more info
color: fef2c0 color: fef2c0
- name: status:rejected - name: status:rejected
color: fef2c0 color: fef2c0
- name: status:under consideration - name: status:under consideration
color: fef2c0 color: fef2c0
- name: type:bug - name: type:bug
color: f7c6c7 color: f7c6c7
- name: type:feature - name: type:feature
color: f7c6c7 color: f7c6c7
- name: type:improvement - name: type:improvement
color: f7c6c7 color: f7c6c7
- name: type:question - name: type:question
color: f7c6c7 color: f7c6c7
- name: os:windows - name: os:windows
color: "666699" color: "666699"
- name: os:mac - name: os:mac
color: "666699" color: "666699"
- name: os:other - name: os:other
color: "666699" color: "666699"
@@ -185,9 +185,13 @@ public class Context {
panel.add(gameApplet); panel.add(gameApplet);
panel.validate(); panel.validate();
serverProvider.preAppletInit();
gameApplet.init(); gameApplet.init();
gameApplet.start(); gameApplet.start();
serverProvider.postAppletStart();
java.util.Timer t = new java.util.Timer(); java.util.Timer t = new java.util.Timer();
t.schedule(new TimerTask() { t.schedule(new TimerTask() {
@Override @Override
@@ -146,4 +146,20 @@ public abstract class ServerProvider implements Opcodes {
} }
/**
* Called in Context.setApplet before applet.init() is called. Exclusively used for manipulating the Frame attached
* to the applet of Roatpkz.
*/
public void preAppletInit() {
}
/**
* Called in Context.setApplet before after applet.start() and applet.init() are called. Exclusively used for manipulating the Frame attached
* to the applet of Roatpkz.
*/
public void postAppletStart() {
}
} }