Update for Cobweb 1.3.0 and SSP 2.0.0.

Crystal-Nest · Jan 1, 2025 · 50cabbe · 50cabbe
1 parent faaaf93
commit 50cabbe
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/common/src/main/java/it/crystalnest/nightworld/Constants.java b/common/src/main/java/it/crystalnest/nightworld/Constants.java
@@ -1,5 +1,9 @@
 package it.crystalnest.nightworld;
 
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +18,11 @@ public final class Constants {
    */
   public static final String MOD_ID = "nightworld";
 
+  /**
+   * Nightworld dimension {@link ResourceKey}.
+   */
+  public static final ResourceKey<Level> NIGHTWORLD = ResourceKey.create(Registries.DIMENSION, ResourceLocation.fromNamespaceAndPath(MOD_ID, "nightworld"));
+
   /**
    * Mod logger.
    */

diff --git a/common/src/main/java/it/crystalnest/nightworld/mixin/NetherPortalBlockMixin.java b/common/src/main/java/it/crystalnest/nightworld/mixin/NetherPortalBlockMixin.java
@@ -42,7 +42,7 @@ private NetherPortalBlockMixin() {
   @SuppressWarnings({"JavadocReference", "StatementWithEmptyBody"})
   @Inject(method = "randomTick", at = @At(value = "HEAD"), cancellable = true)
   private void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random, CallbackInfo ci) {
-    if (level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(500) < level.getDifficulty().getId() && CustomPortalChecker.isPortalForDimension(level, pos.above(), Constants.MOD_ID)) {
+    if (level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(500) < level.getDifficulty().getId() && CustomPortalChecker.isPortalForDimension(level, pos.above(), Constants.NIGHTWORLD)) {
       BlockPos bottom;
       for (bottom = pos; level.getBlockState(bottom).is(this); bottom = bottom.below());
       if (random.nextInt(0, 10) < 5) {

diff --git a/...r_sided_portals/dimension/nightworld.json → ...data/nightworld/dimension/nightworld.json b/...r_sided_portals/dimension/nightworld.json → ...data/nightworld/dimension/nightworld.json
@@ -1,5 +1,5 @@
 {
-  "type": "server_sided_portals:nightworld",
+  "type": "nightworld:nightworld",
   "generator": {
     "type": "minecraft:noise",
     "settings": "minecraft:overworld",

diff --git a/...ed_portals/dimension_type/nightworld.json → ...nightworld/dimension_type/nightworld.json b/...ed_portals/dimension_type/nightworld.json → ...nightworld/dimension_type/nightworld.json
diff --git a/..._sided_portals/tags/block/nightworld.json → ...d/tags/block/nightworld_portal_frame.json b/..._sided_portals/tags/block/nightworld.json → ...d/tags/block/nightworld_portal_frame.json
diff --git a/gradle.properties b/gradle.properties
@@ -30,7 +30,7 @@ neoforge_loader_version_range = [21.4,)
 
 # Dependencies
 cobweb_version = 1.3.0
-server_sided_portals_version = 1.1.1
+server_sided_portals_version = 2.0.0
 
 # Gradle
 org.gradle.jvmargs = -Xmx4G