Skip to content

Commit 3aa26df

Browse files
committed
change: remove default for postdown and preup
1 parent 35e8b70 commit 3aa26df

File tree

9 files changed

+84
-9
lines changed

9 files changed

+84
-9
lines changed

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/NewChunkStatus.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,17 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
5050
}
5151

5252
@Override
53-
public Completable downgradeFromThis(ChunkLoadingContext context) {
53+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
54+
return Completable.complete();
55+
}
56+
57+
@Override
58+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
59+
return Completable.complete();
60+
}
61+
62+
@Override
63+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
5464
throw new UnsupportedOperationException();
5565
}
5666

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/Deferred.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
1818
}
1919

2020
@Override
21-
public Completable downgradeFromThis(ChunkLoadingContext context) {
21+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
22+
return Completable.complete();
23+
}
24+
25+
@Override
26+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
27+
return Completable.complete();
28+
}
29+
30+
@Override
31+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
2232
return Completable.complete();
2333
}
2434

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ReadFromDisk.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
153153
}
154154
}
155155

156+
@Override
157+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
158+
return Completable.complete();
159+
}
160+
156161
@Override
157162
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
158163
return Completable.defer(() -> Completable.fromCompletionStage(syncWithLightEngine(context)))
@@ -168,7 +173,7 @@ public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable
168173
}
169174

170175
@Override
171-
public Completable downgradeFromThis(ChunkLoadingContext context) {
176+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
172177
final AtomicBoolean loadedToWorld = new AtomicBoolean(false);
173178
return Completable.defer(() -> {
174179
Assertions.assertTrue(((IThreadedAnvilChunkStorage) context.tacs()).getMainThreadExecutor().isOnThread());

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
7878
.subscribeOn(Schedulers.from(((IThreadedAnvilChunkStorage) context.tacs()).getMainThreadExecutor()));
7979
}
8080

81+
@Override
82+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
83+
return Completable.complete();
84+
}
85+
8186
private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverWorld) {
8287
WorldChunk worldChunk;
8388
if (protoChunk instanceof WrapperProtoChunk) {
@@ -96,7 +101,12 @@ private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverW
96101
}
97102

98103
@Override
99-
public Completable downgradeFromThis(ChunkLoadingContext context) {
104+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
105+
return Completable.complete();
106+
}
107+
108+
@Override
109+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
100110
ChunkState state = context.holder().getItem().get();
101111
final Chunk chunk = state.chunk();
102112
Preconditions.checkState(chunk instanceof WorldChunk, "Chunk must be a full chunk");

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessibleChunkSending.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,17 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
2828
}
2929

3030
@Override
31-
public Completable downgradeFromThis(ChunkLoadingContext context) {
31+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
32+
return Completable.complete();
33+
}
34+
35+
@Override
36+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
37+
return Completable.complete();
38+
}
39+
40+
@Override
41+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
3242
return Completable.complete();
3343
}
3444

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerBlockTicking.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,17 @@ private static void sendChunkToPlayer(ChunkLoadingContext context) {
129129
}
130130

131131
@Override
132-
public Completable downgradeFromThis(ChunkLoadingContext context) {
132+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
133+
return Completable.complete();
134+
}
135+
136+
@Override
137+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
138+
return Completable.complete();
139+
}
140+
141+
@Override
142+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
133143
ServerWorld serverWorld = ((IThreadedAnvilChunkStorage) context.tacs()).getWorld();
134144
final WorldChunk chunk = (WorldChunk) context.holder().getItem().get().chunk();
135145
((WorldChunkExtension) chunk).c2me$setBlockTicking(false);

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerEntityTicking.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,17 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
5959
}
6060

6161
@Override
62-
public Completable downgradeFromThis(ChunkLoadingContext context) {
62+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
63+
return Completable.complete();
64+
}
65+
66+
@Override
67+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
68+
return Completable.complete();
69+
}
70+
71+
@Override
72+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
6373
if (ModStatuses.fabric_lifecycle_events_v1 && LifecycleEventInvoker.needsInvokeChunkLevelTypeChange()) {
6474
return Completable
6575
.fromRunnable(() -> {

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/VanillaWorldGenerationDelegate.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,17 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
149149
}
150150

151151
@Override
152-
public Completable downgradeFromThis(ChunkLoadingContext context) {
152+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
153+
return Completable.complete();
154+
}
155+
156+
@Override
157+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
158+
return Completable.complete();
159+
}
160+
161+
@Override
162+
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
153163
return Completable.complete();
154164
}
155165

0 commit comments

Comments
 (0)