Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 68104fd

Browse files
xtexxxtexx
committed
build(deps): partially bump to 1.19.3
1 parent 5f42000 commit 68104fd

37 files changed

+252
-188
lines changed

‎build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ indra {
4141
}
4242
}
4343

44+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
4445
compileKotlin {
4546
kotlinOptions {
4647
jvmTarget = '17'

‎gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
org.gradle.jvmargs=-Xmx2G
22
kotlin.code.style=official
33

4-
minecraft_version=1.19.2
5-
yarn_mappings=1.19.2+build.18
6-
loader_version=0.14.9
4+
minecraft_version=1.19.3
5+
yarn_mappings=1.19.3+build.5
6+
loader_version=0.14.12
77

8-
fabric_version=0.61.0+1.19.2
8+
fabric_version=0.72.0+1.19.3

‎src/main/java/scpsharp/mixin/ServerPlayerEntityMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
@Mixin(ServerPlayerEntity.class)
2525
public abstract class ServerPlayerEntityMixin extends PlayerEntity {
2626

27-
public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
28-
super(world, pos, yaw, gameProfile, publicKey);
27+
public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
28+
super(world, pos, yaw, gameProfile);
2929
}
3030

3131
@Inject(

‎src/main/kotlin/scpsharp/content/facility/generator/Component.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
package scpsharp.content.facility.generator
77

88
import com.mojang.serialization.Lifecycle
9-
import net.minecraft.tag.TagKey
9+
import net.minecraft.registry.*
10+
import net.minecraft.registry.entry.RegistryEntry
11+
import net.minecraft.registry.tag.TagKey
1012
import net.minecraft.util.math.BlockBox
1113
import net.minecraft.util.math.BlockPos
1214
import net.minecraft.util.math.Direction
13-
import net.minecraft.util.registry.*
1415
import scpsharp.util.id
1516
import java.util.function.Predicate
1617
import java.util.stream.Stream
@@ -63,12 +64,12 @@ abstract class ComponentFactory<T : Component> {
6364
companion object {
6465

6566
val REGISTRY_ID = id("worldgen/scpsharp_facility_component")
66-
val REGISTRY_KEY: RegistryKey<Registry<ComponentFactory<*>>> = RegistryKey.ofRegistry<ComponentFactory<*>>(REGISTRY_ID)
67-
val REGISTRY = SimpleRegistry(REGISTRY_KEY, Lifecycle.stable(), ComponentFactory<*>::registryEntry)
67+
val REGISTRY_KEY: RegistryKey<Registry<ComponentFactory<*>>> = RegistryKey.ofRegistry(REGISTRY_ID)
68+
val REGISTRY = SimpleRegistry(REGISTRY_KEY, Lifecycle.stable(), true)
6869

6970
init {
7071
@Suppress("UNCHECKED_CAST")
71-
Registry.ROOT.add(REGISTRY_KEY as RegistryKey<MutableRegistry<*>>, REGISTRY, REGISTRY.lifecycle)
72+
Registries.ROOT.add(REGISTRY_KEY as RegistryKey<MutableRegistry<*>>, REGISTRY, REGISTRY.lifecycle)
7273
}
7374

7475
}
@@ -92,7 +93,7 @@ abstract class ComponentFactory<T : Component> {
9293
maxTries: Int = 2,
9394
maxDepth: Int = 16
9495
): T? {
95-
if(depth >= maxDepth) {
96+
if (depth >= maxDepth) {
9697
return null
9798
}
9899
for (i in 0 until maxTries) {

‎src/main/kotlin/scpsharp/content/facility/generator/ComponentTags.kt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,30 @@
66
package scpsharp.content.facility.generator
77

88
import net.minecraft.block.Block
9-
import net.minecraft.tag.TagKey
10-
import net.minecraft.util.registry.Registry
9+
import net.minecraft.registry.Registries
10+
import net.minecraft.registry.tag.TagKey
1111
import scpsharp.util.id
1212

1313
object ComponentTags {
1414

15-
val FACILITY_KEEP: TagKey<Block> = TagKey.of(Registry.BLOCK_KEY, id("facility_keep"))
15+
val FACILITY_KEEP: TagKey<Block> = TagKey.of(Registries.BLOCK.key, id("facility_keep"))
1616

1717
val FACILITY_START: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_start"))
1818
val FACILITY_PART: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_part"))
19-
val FACILITY_CONTAINMENT_ROOM: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_containment_room"))
20-
val FACILITY_CORRIDOR: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_corridor"))
21-
val FACILITY_CROSSING: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_crossing"))
19+
val FACILITY_CONTAINMENT_ROOM: TagKey<ComponentFactory<*>> =
20+
TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_containment_room"))
21+
val FACILITY_CORRIDOR: TagKey<ComponentFactory<*>> =
22+
TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_corridor"))
23+
val FACILITY_CROSSING: TagKey<ComponentFactory<*>> =
24+
TagKey.of(ComponentFactory.REGISTRY_KEY, id("facility_crossing"))
2225

2326
val SITE63: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63"))
2427
val SITE63_START: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_start"))
25-
val SITE63_GENERATING: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_generating"))
28+
val SITE63_GENERATING: TagKey<ComponentFactory<*>> =
29+
TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_generating"))
2630
val SITE63_CORRIDOR: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_corridor"))
27-
val SITE63_CORRIDOR_CONNECTED: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_corridor_connected"))
31+
val SITE63_CORRIDOR_CONNECTED: TagKey<ComponentFactory<*>> =
32+
TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_corridor_connected"))
2833
val SITE63_CROSSING: TagKey<ComponentFactory<*>> = TagKey.of(ComponentFactory.REGISTRY_KEY, id("site63_crossing"))
2934

3035
}

‎src/main/kotlin/scpsharp/content/facility/generator/FacilityGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import net.minecraft.block.BlockState
1010
import net.minecraft.entity.Entity
1111
import net.minecraft.entity.EntityType
1212
import net.minecraft.entity.SpawnReason
13+
import net.minecraft.registry.entry.RegistryEntry
14+
import net.minecraft.registry.tag.TagKey
1315
import net.minecraft.server.world.ServerChunkManager
1416
import net.minecraft.server.world.ServerWorld
15-
import net.minecraft.tag.TagKey
1617
import net.minecraft.util.math.*
1718
import net.minecraft.util.math.random.Random
18-
import net.minecraft.util.registry.RegistryEntry
1919
import net.minecraft.world.Heightmap
2020
import net.minecraft.world.StructureWorldAccess
2121
import net.minecraft.world.gen.chunk.ChunkGenerator
@@ -143,6 +143,6 @@ class FacilityGenerator(
143143
fun spawnEntity(entity: Entity) = access.spawnEntity(entity)
144144

145145
fun spawnEntity(type: EntityType<*>, pos: BlockPos) =
146-
access.spawnEntity(type.spawn(world, null, null, null, pos, SpawnReason.CHUNK_GENERATION, false, false))
146+
access.spawnEntity(type.spawn(world, pos, SpawnReason.CHUNK_GENERATION))
147147

148148
}

‎src/main/kotlin/scpsharp/content/facility/site63/Site63.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
package scpsharp.content.facility.site63
77

8+
import net.minecraft.registry.Registry
89
import net.minecraft.util.math.BlockPos
910
import net.minecraft.util.math.Direction
10-
import net.minecraft.util.registry.Registry
1111
import scpsharp.content.facility.generator.ComponentFactory
1212
import scpsharp.content.facility.generator.ComponentTags
1313
import scpsharp.content.facility.generator.FacilityGenerator

‎src/main/kotlin/scpsharp/content/facility/site63/Site63Feature.kt

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ package scpsharp.content.facility.site63
77

88
import net.fabricmc.fabric.api.biome.v1.BiomeModifications
99
import net.fabricmc.fabric.api.biome.v1.ModificationPhase
10-
import net.minecraft.tag.BiomeTags
11-
import net.minecraft.util.registry.BuiltinRegistries
12-
import net.minecraft.util.registry.Registry
13-
import net.minecraft.world.biome.Biome
10+
import net.minecraft.registry.BuiltinRegistries
11+
import net.minecraft.registry.Registries
12+
import net.minecraft.registry.Registry
13+
import net.minecraft.registry.RegistryKey
14+
import net.minecraft.registry.RegistryKeys
15+
import net.minecraft.registry.tag.BiomeTags
1416
import net.minecraft.world.dimension.DimensionOptions
1517
import net.minecraft.world.gen.GenerationStep
1618
import net.minecraft.world.gen.feature.*
@@ -26,39 +28,20 @@ object Site63Feature : Feature<DefaultFeatureConfig>(DefaultFeatureConfig.CODEC)
2628

2729
val IDENTIFIER = id("site63")
2830

29-
val DEFAULT_CONFIGURATION = ConfiguredFeature(this, FeatureConfig.DEFAULT)
30-
31-
val DEFAULT_PLACE: PlacedFeature
31+
val DEFAULT_CONFIGURATION_KEY = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, IDENTIFIER)
32+
val DEFAULT_PLACE_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, IDENTIFIER)
3233

3334
init {
34-
Registry.register(Registry.FEATURE, IDENTIFIER, this)
35-
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, IDENTIFIER, DEFAULT_CONFIGURATION)
36-
DEFAULT_PLACE = PlacedFeature(
37-
BuiltinRegistries.CONFIGURED_FEATURE.getOrCreateEntry(
38-
BuiltinRegistries.CONFIGURED_FEATURE.getKey(
39-
DEFAULT_CONFIGURATION
40-
).orElseThrow()
41-
),
42-
arrayListOf(
43-
BiomePlacementModifier.of(),
44-
RarityFilterPlacementModifier.of(512),
45-
SquarePlacementModifier()
46-
)
47-
)
48-
Registry.register(BuiltinRegistries.PLACED_FEATURE, IDENTIFIER, DEFAULT_PLACE)
35+
Registry.register(Registries.FEATURE, IDENTIFIER, this)
4936
BiomeModifications.create(IDENTIFIER)
5037
.add(ModificationPhase.ADDITIONS, { context ->
5138
context.canGenerateIn(DimensionOptions.OVERWORLD)
5239
&& !context.hasTag(BiomeTags.IS_RIVER)
5340
&& !context.hasTag(BiomeTags.IS_OCEAN)
5441
&& !context.hasTag(BiomeTags.IS_DEEP_OCEAN)
5542
&& context.biomeKey.value.namespace == "minecraft"
56-
&& BuiltinRegistries.BIOME.containsId(context.biomeKey.value)
5743
}) { context ->
58-
context.generationSettings.addFeature(
59-
GenerationStep.Feature.UNDERGROUND_STRUCTURES,
60-
BuiltinRegistries.PLACED_FEATURE.getKey(DEFAULT_PLACE).orElseThrow()
61-
)
44+
context.generationSettings.addFeature(GenerationStep.Feature.UNDERGROUND_STRUCTURES, DEFAULT_PLACE_KEY)
6245
}
6346
}
6447

‎src/main/kotlin/scpsharp/content/facility/site63/components/Corridor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package scpsharp.content.facility.site63.components
77

88
import net.minecraft.block.Blocks
9+
import net.minecraft.registry.Registry
910
import net.minecraft.util.math.BlockBox
1011
import net.minecraft.util.math.BlockPos
1112
import net.minecraft.util.math.Direction
12-
import net.minecraft.util.registry.Registry
1313
import scpsharp.content.facility.generator.*
1414
import scpsharp.util.BlockBox
1515
import scpsharp.util.id

‎src/main/kotlin/scpsharp/content/facility/site63/components/Crossing.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package scpsharp.content.facility.site63.components
77

88
import net.minecraft.block.Blocks
9+
import net.minecraft.registry.Registry
910
import net.minecraft.util.math.BlockBox
1011
import net.minecraft.util.math.BlockPos
1112
import net.minecraft.util.math.Direction
12-
import net.minecraft.util.registry.Registry
1313
import scpsharp.content.facility.generator.*
1414
import scpsharp.util.BlockBox
1515
import scpsharp.util.id

0 commit comments

Comments
 (0)