Update to 1.21

CHANGELOG.md

@@ -1,3 +1,3 @@
-### 5.0.1
+### 6.0.0
 
-- Fix NeoForge
+- Update to 1.21

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id("dev.nanite.mlp") version("0.1.8")
+    id("dev.nanite.mlp") version("0.1.10")
     id("java-library")
     id("maven-publish")
     id("me.modmuss50.mod-publish-plugin") version "0.3.0"
@@ -54,8 +54,12 @@ subprojects {
     }
     repositories {
         maven {
-            name = "Creeperhost"
-            url = uri("https://maven.creeperhost.net/")
+            name = "NeoForge"
+            url = "https://maven.neoforged.net/"
+        }
+        maven {
+            name = "Fabric"
+            url = "https://maven.fabricmc.net/"
         }
     }
     tasks.withType(ProcessResources).configureEach {
@@ -99,11 +103,6 @@ publishMods {
         modLoaders.add("fabric")
     }
 
-//    def forgeOptions = publishOptions {
-//        file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile }
-//        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
-//        modLoaders.add("forge")
-//    }
 
     def neoOptions = publishOptions {
         file = project.provider { project(":neo").tasks.jar }.flatMap { it.archiveFile }
@@ -125,10 +124,6 @@ publishMods {
         }
     }
 
-//    curseforge("curseforgeForge") {
-//        from(curseForgeOptions, forgeOptions)
-//    }
-
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoOptions)
     }

common/src/main/java/com/unrealdinnerbone/trenzalore/Trenzalore.java

@@ -3,6 +3,8 @@
 import com.unrealdinnerbone.trenzalore.api.platform.Services;
 import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects;
+import com.unrealdinnerbone.trenzalore.lib.RLUtils;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.List;
 import java.util.ServiceLoader;
@@ -18,4 +20,8 @@ public static void init() {
         });
     }
 
+    public static ResourceLocation rl(String value) {
+        return RLUtils.rl(MOD_ID, value);
+    }
+
 }

common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java

@@ -1,24 +1,13 @@
 package com.unrealdinnerbone.trenzalore.api.platform.services;
 
-import com.unrealdinnerbone.trenzalore.api.registry.Regeneration;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.portal.PortalInfo;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 public interface IPlatformHelper {
@@ -29,20 +18,10 @@ public interface IPlatformHelper {
 
     boolean isModLoaded(String modId);
 
-    @Nullable
-    @ApiStatus.Internal
-    <T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo);
-
     @ApiStatus.Internal
     void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, List<Supplier<? extends Item>> item);
 
     @ApiStatus.Internal
     <T> void registryRegistryObjects(String modId, RegistryObjects<T> registryObjects);
 
-    @Deprecated(forRemoval = true)
-    @ApiStatus.ScheduledForRemoval(inVersion = "4.0.0")
-    default <T extends BlockEntity> BlockEntityType<T> createBlockEntityType(BiFunction<BlockPos, BlockState, T> creator, Block... validBlocks) {
-        return Regeneration.createBlockEntityType(creator, validBlocks);
-    }
-
 }

common/src/main/java/com/unrealdinnerbone/trenzalore/lib/RLUtils.java

@@ -0,0 +1,14 @@
+package com.unrealdinnerbone.trenzalore.lib;
+
+import net.minecraft.resources.ResourceLocation;
+
+public class RLUtils
+{
+    public static ResourceLocation rl(String modId, String path) {
+        return ResourceLocation.fromNamespaceAndPath(modId, path);
+    }
+
+    public static ResourceLocation rlFull(String namespaceAndPath) {
+        return ResourceLocation.tryParse(namespaceAndPath);
+    }
+}

fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java

@@ -3,35 +3,22 @@
 import com.unrealdinnerbone.trenzalore.api.platform.services.IPlatformHelper;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects;
-import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
+import com.unrealdinnerbone.trenzalore.lib.RLUtils;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.CriterionTrigger;
-import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.portal.PortalInfo;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 public class FabricPlatformHelper implements IPlatformHelper {
@@ -67,15 +54,9 @@ public <T> void registryRegistryObjects(String modId, RegistryObjects<T> registr
         ResourceKey<Registry<T>> registryKey = registryObjects.registryKey();
         Registry<T> registry = (Registry<T>) BuiltInRegistries.REGISTRY.get(registryKey.location());
         for (RegistryEntry<? extends T> object : registryObjects.objects()) {
-            ResourceLocation id = new ResourceLocation(modId, object.name());
+            ResourceLocation id = RLUtils.rl(modId, object.name());
             Registry.register(registry, id, object.get());
         }
     }
 
-    @Override
-    @Nullable
-    public <T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) {
-        return FabricDimensions.teleport(entity, level, portalInfo);
-    }
-
 }