Skip to content

Commit 711fd07

Browse files
committed
change: remove default for postdown and preup
1 parent ceb5200 commit 711fd07

File tree

8 files changed

+85
-0
lines changed

8 files changed

+85
-0
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
4949
throw new UnsupportedOperationException();
5050
}
5151

52+
@Override
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+
5262
@Override
5363
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
5464
throw new UnsupportedOperationException();
@@ -58,6 +68,11 @@ public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable ca
5868
public int toVanillaLevel() {
5969
return ChunkLevels.INACCESSIBLE + 1;
6070
}
71+
72+
@Override
73+
public String toString() {
74+
return "unloaded";
75+
}
6176
};
6277
statuses.add(NEW);
6378
DEFERRED = new Deferred(statuses.size());

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,23 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
1717
return Completable.complete();
1818
}
1919

20+
@Override
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+
2030
@Override
2131
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
2232
return Completable.complete();
2333
}
34+
35+
@Override
36+
public String toString() {
37+
return "deferred";
38+
}
2439
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ protected Completable finalizeLoading(ChunkLoadingContext context, Single<ProtoC
120120
return new ProtoChunk(context.holder().getKey(), UpgradeData.NO_UPGRADE_DATA, world, world.getRegistryManager().get(RegistryKeys.BIOME), null);
121121
}
122122

123+
@Override
124+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
125+
return Completable.complete();
126+
}
127+
123128
@Override
124129
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
125130
return Completable.defer(() -> Completable.fromCompletionStage(syncWithLightEngine(context)))

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
6969
.subscribeOn(Schedulers.from(((IThreadedAnvilChunkStorage) context.tacs()).getMainThreadExecutor()));
7070
}
7171

72+
@Override
73+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
74+
return Completable.complete();
75+
}
76+
7277
private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverWorld) {
7378
WorldChunk worldChunk;
7479
if (protoChunk instanceof WrapperProtoChunk) {
@@ -84,6 +89,11 @@ private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverW
8489
return worldChunk;
8590
}
8691

92+
@Override
93+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
94+
return Completable.complete();
95+
}
96+
8797
@Override
8898
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
8999
ChunkState state = context.holder().getItem().get();

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
2727
return Completable.complete();
2828
}
2929

30+
@Override
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+
3040
@Override
3141
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
3242
return Completable.complete();

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ private static void sendChunkToPlayer(ChunkLoadingContext context) {
125125
}
126126
}
127127

128+
@Override
129+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
130+
return Completable.complete();
131+
}
132+
133+
@Override
134+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
135+
return Completable.complete();
136+
}
137+
128138
@Override
129139
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
130140
ServerWorld serverWorld = ((IThreadedAnvilChunkStorage) context.tacs()).getWorld();

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
5757
return Completable.complete();
5858
}
5959

60+
@Override
61+
public Completable postUpgradeToThis(ChunkLoadingContext context) {
62+
return Completable.complete();
63+
}
64+
65+
@Override
66+
public Completable preDowngradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
67+
return Completable.complete();
68+
}
69+
6070
@Override
6171
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
6272
if (LateModStatuses.fabric_lifecycle_events_v1_CHUNK_LEVEL_TYPE_CHANGE && LifecycleEventInvoker.needsInvokeChunkLevelTypeChange()) {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@ public Completable upgradeToThis(ChunkLoadingContext context, Cancellable cancel
148148
}
149149
}
150150

151+
@Override
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+
151161
@Override
152162
public Completable downgradeFromThis(ChunkLoadingContext context, Cancellable cancellable) {
153163
return Completable.complete();

0 commit comments

Comments
 (0)