Skip to content

Commit 41a772f

Browse files
Basic functionallity working
1 parent 48c765b commit 41a772f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/main/java/bammerbom/ultimatecore/sponge/UltimateCore.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import org.spongepowered.api.event.Listener;
7070
import org.spongepowered.api.event.Order;
7171
import org.spongepowered.api.event.cause.Cause;
72+
import org.spongepowered.api.event.cause.EventContext;
7273
import org.spongepowered.api.event.game.GameReloadEvent;
7374
import org.spongepowered.api.event.game.state.*;
7475
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
@@ -168,9 +169,7 @@ public void onPreInit(GamePreInitializationEvent ev) {
168169
sm.setProvider(this, ErrorService.class, errorService);
169170

170171
//Load modules
171-
Messages.log("a");
172172
for (Module module : moduleService.findModules()) {
173-
Messages.log("b");
174173
try {
175174
if (moduleService.registerModule(module)) {
176175
if (!module.getIdentifier().equals("default")) {
@@ -202,7 +201,7 @@ public void onInit(GameInitializationEvent ev) {
202201
//Initialize modules
203202
for (Module module : getModuleService().getModules()) {
204203
try {
205-
ModuleInitializeEvent event = new ModuleInitializeEvent(module, ev, Cause.builder().append(getContainer()).build(ev.getContext()));
204+
ModuleInitializeEvent event = new ModuleInitializeEvent(module, ev, Cause.builder().append(getContainer()).build(EventContext.builder().build()));
206205
Sponge.getEventManager().post(event);
207206
module.onInit(ev);
208207
} catch (Exception ex) {
@@ -259,7 +258,7 @@ public String getValue() {
259258
//Post-initialize modules
260259
for (Module module : getModuleService().getModules()) {
261260
try {
262-
ModulePostInitializeEvent event = new ModulePostInitializeEvent(module, ev, Cause.builder().append(getContainer()).build(ev.getContext()));
261+
ModulePostInitializeEvent event = new ModulePostInitializeEvent(module, ev, Cause.builder().append(getContainer()).build(EventContext.builder().build()));
263262
Sponge.getEventManager().post(event);
264263
module.onPostInit(ev);
265264
} catch (Exception ex) {
@@ -292,7 +291,7 @@ public void onStopping(GameStoppingEvent ev) {
292291
//Stop modules
293292
for (Module module : getModuleService().getModules()) {
294293
try {
295-
ModuleStoppingEvent event = new ModuleStoppingEvent(module, ev, Cause.builder().append(getContainer()).build(ev.getContext()));
294+
ModuleStoppingEvent event = new ModuleStoppingEvent(module, ev, Cause.builder().append(getContainer()).build(EventContext.builder().build()));
296295
Sponge.getEventManager().post(event);
297296
module.onStop(ev);
298297
} catch (Exception ex) {

src/main/java/bammerbom/ultimatecore/sponge/modules/sign/listeners/SignListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void onSignCreate(ChangeSignEvent event, @Root Player p) {
6868
if (!p.hasPermission(sign.getCreatePermission().get())) {
6969
Messages.send(p, "core.nopermissions");
7070
}
71-
SignCreateEvent cevent = new SignCreateEvent(sign, event.getTargetTile().getLocation(), Cause.builder().append(UltimateCore.getContainer()).append(p).build(event.getContext()));
71+
SignCreateEvent cevent = new SignCreateEvent(sign, event.getTargetTile().getLocation(), Cause.builder().append(UltimateCore.getContainer()).append(p).build(EventContext.builder().build()));
7272
Sponge.getEventManager().post(cevent);
7373
if (!cevent.isCancelled() && sign.onCreate(p, event)) {
7474
//Color sign
@@ -93,7 +93,7 @@ public void onSignClick(InteractBlockEvent.Secondary event, @Root Player p) {
9393
if (!p.hasPermission(usign.getUsePermission().get())) {
9494
Messages.send(p, "core.nopermissions");
9595
}
96-
SignUseEvent cevent = new SignUseEvent(usign, sign.getLocation(), Cause.builder().append(UltimateCore.getContainer()).append(p).build(event.getContext()));
96+
SignUseEvent cevent = new SignUseEvent(usign, sign.getLocation(), Cause.builder().append(UltimateCore.getContainer()).append(p).build(EventContext.builder().build()));
9797
Sponge.getEventManager().post(cevent);
9898
if (!cevent.isCancelled()) {
9999
usign.onExecute(p, sign);

0 commit comments

Comments
 (0)