Skip to content

Commit

Permalink
Change dimension method signatures
Browse files Browse the repository at this point in the history
  • Loading branch information
@senseiwells
senseiwells committed Dec 18, 2024
1 parent a9cd3fa commit d18b761
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 73 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
14 changes: 7 additions & 7 deletions arcade-dimensions/src/main/kotlin/net/casual/arcade/dimensions/ArcadeDimensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The added level.
*/
@JvmStatic
public fun add(server: MinecraftServer, level: CustomLevel): ServerLevel {
public fun add(server: MinecraftServer, level: CustomLevel): CustomLevel {
return server.addCustomLevel(level)
}

Expand All @@ -81,7 +81,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The added level.
*/
@JvmStatic
public fun add(server: MinecraftServer, builder: CustomLevelBuilder): ServerLevel {
public fun add(server: MinecraftServer, builder: CustomLevelBuilder): CustomLevel {
return server.addCustomLevel(builder)
}

Expand All @@ -102,7 +102,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The added level.
*/
@JvmStatic
public fun add(server: MinecraftServer, block: CustomLevelBuilder.() -> Unit): ServerLevel {
public fun add(server: MinecraftServer, block: CustomLevelBuilder.() -> Unit): CustomLevel {
return server.addCustomLevel(block)
}

Expand All @@ -122,7 +122,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The level, or `null` if it does not exist.
*/
@JvmStatic
public fun load(server: MinecraftServer, location: ResourceLocation): ServerLevel? {
public fun load(server: MinecraftServer, location: ResourceLocation): CustomLevel? {
return server.loadCustomLevel(location)
}

Expand All @@ -142,7 +142,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The level, or `null` if it does not exist.
*/
@JvmStatic
public fun load(server: MinecraftServer, key: ResourceKey<Level>): ServerLevel? {
public fun load(server: MinecraftServer, key: ResourceKey<Level>): CustomLevel? {
return server.loadCustomLevel(key)
}

Expand All @@ -164,7 +164,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The level.
*/
@JvmStatic
public fun loadOrAdd(server: MinecraftServer, location: ResourceLocation, block: CustomLevelBuilder.() -> Unit): ServerLevel {
public fun loadOrAdd(server: MinecraftServer, location: ResourceLocation, block: CustomLevelBuilder.() -> Unit): CustomLevel {
return server.loadOrAddCustomLevel(location, block)
}

Expand All @@ -186,7 +186,7 @@ public object ArcadeDimensions: ModInitializer {
* @return The level.
*/
@JvmStatic
public fun loadOrAdd(server: MinecraftServer, key: ResourceKey<Level>, block: CustomLevelBuilder.() -> Unit): ServerLevel {
public fun loadOrAdd(server: MinecraftServer, key: ResourceKey<Level>, block: CustomLevelBuilder.() -> Unit): CustomLevel {
return server.loadOrAddCustomLevel(key, block)
}

Expand Down
19 changes: 11 additions & 8 deletions arcade-dimensions/src/main/kotlin/net/casual/arcade/dimensions/utils/DimensionUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import kotlin.io.path.isDirectory
* @param level The level to add.
* @return The added level.
*/
public fun MinecraftServer.addCustomLevel(level: CustomLevel): ServerLevel {
public fun MinecraftServer.addCustomLevel(level: CustomLevel): CustomLevel {
val levels = (this as MinecraftServerAccessor).levels
val dimension = level.dimension()
if (levels.containsKey(dimension)) {
Expand Down Expand Up @@ -82,7 +82,7 @@ public fun MinecraftServer.addCustomLevel(level: CustomLevel): ServerLevel {
* @param builder The builder to create the level.
* @return The added level.
*/
public fun MinecraftServer.addCustomLevel(builder: CustomLevelBuilder): ServerLevel {
public fun MinecraftServer.addCustomLevel(builder: CustomLevelBuilder): CustomLevel {
return this.addCustomLevel(builder.build(this))
}

Expand All @@ -101,7 +101,7 @@ public fun MinecraftServer.addCustomLevel(builder: CustomLevelBuilder): ServerLe
* @param block The method to configure the builder.
* @return The added level.
*/
public inline fun MinecraftServer.addCustomLevel(block: CustomLevelBuilder.() -> Unit): ServerLevel {
public inline fun MinecraftServer.addCustomLevel(block: CustomLevelBuilder.() -> Unit): CustomLevel {
val builder = CustomLevelBuilder()
builder.block()
return this.addCustomLevel(builder)
Expand All @@ -121,7 +121,7 @@ public inline fun MinecraftServer.addCustomLevel(block: CustomLevelBuilder.() ->
* @param location The location of the level.
* @return The level, or `null` if it does not exist.
*/
public fun MinecraftServer.loadCustomLevel(location: ResourceLocation): ServerLevel? {
public fun MinecraftServer.loadCustomLevel(location: ResourceLocation): CustomLevel? {
return this.loadCustomLevel(ResourceKey.create(Registries.DIMENSION, location))
}

Expand All @@ -139,10 +139,13 @@ public fun MinecraftServer.loadCustomLevel(location: ResourceLocation): ServerLe
* @param key The key of the level.
* @return The level, or `null` if it does not exist.
*/
public fun MinecraftServer.loadCustomLevel(key: ResourceKey<Level>): ServerLevel? {
public fun MinecraftServer.loadCustomLevel(key: ResourceKey<Level>): CustomLevel? {
val loaded = this.getLevel(key)
if (loaded != null) {
return loaded
if (loaded is CustomLevel) {
return loaded
}
throw IllegalArgumentException("Tried to load custom level $key but it wasn't a CustomLevel instance")
}
val custom = CustomLevel.read(this, key) ?: return null
return this.addCustomLevel(custom)
Expand All @@ -167,7 +170,7 @@ public fun MinecraftServer.loadCustomLevel(key: ResourceKey<Level>): ServerLevel
public inline fun MinecraftServer.loadOrAddCustomLevel(
location: ResourceLocation,
block: CustomLevelBuilder.() -> Unit
): ServerLevel {
): CustomLevel {
return this.loadCustomLevel(location) ?: this.addCustomLevel { dimensionKey(location).block() }
}

Expand All @@ -190,7 +193,7 @@ public inline fun MinecraftServer.loadOrAddCustomLevel(
public inline fun MinecraftServer.loadOrAddCustomLevel(
key: ResourceKey<Level>,
block: CustomLevelBuilder.() -> Unit
): ServerLevel {
): CustomLevel {
return this.loadCustomLevel(key) ?: this.addCustomLevel { dimensionKey(key).block() }
}

Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
java
}

val modVersion = "0.4.0-alpha.15"
val modVersion = "0.4.0-alpha.16"

allprojects {
apply(plugin = "org.jetbrains.kotlin.jvm")
Expand Down Expand Up @@ -116,7 +116,7 @@ allprojects {

subprojects {
afterEvaluate {
updateDocumentedDependencies("../docs/${name}/getting-started.md")
// updateDocumentedDependencies("../docs/${name}/getting-started.md")
}
}

Expand Down
8 changes: 4 additions & 4 deletions docs/arcade-commands/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
6 changes: 3 additions & 3 deletions docs/arcade-datagen/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-datagen:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-datagen:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```
10 changes: 5 additions & 5 deletions docs/arcade-dimensions/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-dimensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-dimensions:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
8 changes: 4 additions & 4 deletions docs/arcade-extensions/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```
2 changes: 1 addition & 1 deletion docs/arcade-items/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-items:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-items:0.4.0-alpha.16+1.21.4")!!)
}
```
22 changes: 11 additions & 11 deletions docs/arcade-minigames/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-minigames:0.4.0-alpha.15+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-dimensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-visuals:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-minigames:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-dimensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-visuals:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/arcade-resource-pack-host/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-resource-pack-host:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack-host:0.4.0-alpha.16+1.21.4")!!)
}
```
12 changes: 6 additions & 6 deletions docs/arcade-resource-pack/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("eu.pb4:polymer-core:0.11.2+1.21.4")!!)
include(modImplementation("eu.pb4:polymer-resource-pack:0.11.2+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack-host:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack-host:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```
8 changes: 4 additions & 4 deletions docs/arcade-scheduler/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/arcade-utils/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```
16 changes: 8 additions & 8 deletions docs/arcade-visuals/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-visuals:0.4.0-alpha.15+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-visuals:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-resource-pack:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```

Expand Down
14 changes: 7 additions & 7 deletions docs/arcade-world-border/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ repositories {
}

dependencies {
include(modImplementation("net.casualchampionships:arcade-world-border:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-world-border:0.4.0-alpha.16+1.21.4")!!)

include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.15+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-commands:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-event-registry:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-events-server:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-extensions:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-scheduler:0.4.0-alpha.16+1.21.4")!!)
include(modImplementation("net.casualchampionships:arcade-utils:0.4.0-alpha.16+1.21.4")!!)
}
```

0 comments on commit d18b761

Please sign in to comment.