Skip to content

Commit 66a2d96

Browse files
committed
Remove all non-math related changes
These will be re-added in other PRs (SilkMC#66 and SilkMC#67) Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
1 parent 627290f commit 66a2d96

33 files changed

+5
-1115
lines changed

buildSrc/src/main/kotlin/BuildConstants.kt

+1-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ object BuildConstants {
2020
const val paperMinecraftVersion = "1.21.1"
2121
const val fabricLoaderVersion = "0.16.2"
2222
const val fabricLanguageKotlinVersion = "1.12.1+kotlin.2.0.20"
23-
const val fabricApiVersion = "0.100.8+1.21"
2423

2524
const val kotestVersion = "5.9.1"
2625
const val mockkVersion = "1.13.12"
2726

28-
val commonModules = listOf(
27+
val uploadModules = listOf(
2928
"commands",
3029
"core",
3130
"game",
@@ -34,8 +33,4 @@ object BuildConstants {
3433
"network",
3534
"persistence",
3635
)
37-
val uploadModules = commonModules + listOf(
38-
"paper",
39-
"fabric"
40-
)
4136
}

buildSrc/src/main/kotlin/kotlin-project-script.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ kotlin {
2929

3030
sourceSets.all {
3131
languageSettings {
32-
val whitelistModules = BuildConstants.uploadModules
32+
val whitelistModules = BuildConstants.uploadModules.plus("paper")
3333
if (project.name.removePrefix(rootProject.name + "-") in whitelistModules) {
3434
listOf("InternalSilkApi", "DelicateSilkApi", "ExperimentalSilkApi").forEach {
3535
optIn("net.silkmc.silk.core.annotations.${it}")

settings.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ include("$projectName-network")
2020
include("$projectName-persistence")
2121

2222
include("$projectName-paper")
23-
include("$projectName-fabric")
2423

2524
include("$projectName-testmod")

silk-all/build.gradle.kts

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ plugins {
77
}
88

99
dependencies {
10-
BuildConstants.commonModules.forEach {
10+
BuildConstants.uploadModules.forEach {
1111
implementation(include(modProject(":${rootProject.name}-${it}"))!!)
1212
}
13-
implementation(include(modProject(":${rootProject.name}-fabric"))!!)
1413
}
1514

1615
val modName by extra("$projectTitle (All modules)")

silk-core/src/main/java/net/silkmc/silk/core/mixin/client/AbstractContainerScreenAccessor.java

-14
This file was deleted.

silk-core/src/main/kotlin/net/silkmc/silk/core/inventory/ContainerExtensions.kt

-48
This file was deleted.

silk-core/src/main/kotlin/net/silkmc/silk/core/recipe/Ingredient.kt

-19
This file was deleted.

silk-core/src/main/kotlin/net/silkmc/silk/core/screen/ScreenExtensions.kt

-10
This file was deleted.

silk-core/src/main/kotlin/net/silkmc/silk/core/server/ServerExtensions.kt

-20
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package net.silkmc.silk.core.server
22

33
import net.minecraft.commands.CommandSourceStack
4-
import net.minecraft.core.registries.Registries
5-
import net.minecraft.resources.ResourceKey
6-
import net.minecraft.resources.ResourceLocation
74
import net.minecraft.server.MinecraftServer
8-
import net.minecraft.server.level.ServerLevel
95
import net.minecraft.server.level.ServerPlayer
106
import java.nio.file.Path
117
import kotlin.io.path.absolute
@@ -46,19 +42,3 @@ val MinecraftServer.players: List<ServerPlayer>
4642
)
4743
val MinecraftServer.serverPath: Path
4844
get() = serverDirectory.absolute()
49-
50-
/**
51-
* Retrieves the level for an associated with an id is present
52-
*
53-
* @param id The id of the level to check
54-
* @return The level
55-
*/
56-
fun MinecraftServer.getLevel(id: ResourceLocation): ServerLevel? = getLevel(ResourceKey.create(Registries.DIMENSION, id))
57-
58-
/**
59-
* Checks if the level associated with an id is present
60-
*
61-
* @param id The id of the level to check
62-
* @return If the level is present
63-
*/
64-
fun MinecraftServer.hasLevel(id: ResourceLocation): Boolean = getLevel(id) != null

silk-core/src/main/kotlin/net/silkmc/silk/core/world/WorldExtensions.kt

-65
This file was deleted.

silk-core/src/main/resources/silk-core.mixins.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"server.MixinServerConfigurationPacketListenerImpl",
1212
"server.MixinServerGamePacketListenerImpl",
1313
"server.MixinServerLoginPacketListenerImpl"
14-
], "client": [ "client.AbstractContainerScreenAccessor" ]
14+
]
1515
}

silk-fabric/build.gradle.kts

-18
This file was deleted.

silk-fabric/src/main/kotlin/net/silkmc/silk/fabric/client/KeyMappingExtensions.kt

-13
This file was deleted.

silk-fabric/src/main/kotlin/net/silkmc/silk/fabric/registry/ArmorMaterialRegistry.kt

-68
This file was deleted.

silk-fabric/src/main/kotlin/net/silkmc/silk/fabric/registry/BlockEntityRegistry.kt

-25
This file was deleted.

0 commit comments

Comments
 (0)