Update to 1.21.4

.gitignore

@@ -31,3 +31,6 @@ logs/
 neo/runs/
 
 common/src/generated/resources/.cache/
+
+fabric/runs/
+

CHANGELOG.md

@@ -1,3 +1,3 @@
-### 6.1.0
+### 21.4.0
 
-- 1.21.1 & Bee Compact
+- Update to Minecraft 1.21.4

build.gradle

@@ -1,16 +1,17 @@
 plugins {
-    id("dev.nanite.mlp") version("0.3.0")
+    id("dev.nanite.mlp") version("0.4.2")
     id("java-library")
     id("maven-publish")
-    id("me.modmuss50.mod-publish-plugin") version "0.3.0"
+    id("me.modmuss50.mod-publish-plugin") version "0.8.1"
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0'
 }
 
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 multiLoader.root() {
     minecraftVersion.set(project.property("minecraft_version"))
+    parchmentMinecraftVersion.set(project.property("minecraft_version"))
+    parchmentVersion.set(project.property("parchment_version"))
     modID.set(project.property("mod_id"))
     splitSources.set(true)
     convertAccessWidener.set(true)

buildSrc/src/main/groovy/multiloader.gradle

@@ -74,4 +74,8 @@ publishing {
             artifactId project.getArchivesBaseName()
         }
     }
+}
+
+jar {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }

common/src/generated/resources/assets/jamd/items/end_portal.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "jamd:block/end_portal"
+  }
+}

common/src/generated/resources/assets/jamd/items/nether_portal.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "jamd:block/nether_portal"
+  }
+}

common/src/generated/resources/assets/jamd/items/portal_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "jamd:block/portal_block"
+  }
+}

common/src/generated/resources/data/jamd/dimension_type/end.json

@@ -11,10 +11,10 @@
   "infiniburn": "#minecraft:infiniburn_end",
   "logical_height": 256,
   "min_y": 0,
-  "monster_spawn_block_light_limit": 0,
+  "monster_spawn_block_light_limit": 15,
   "monster_spawn_light_level": {
     "type": "minecraft:uniform",
-    "max_inclusive": 7,
+    "max_inclusive": 15,
     "min_inclusive": 0
   },
   "natural": false,

common/src/generated/resources/data/jamd/dimension_type/mining.json

@@ -11,10 +11,10 @@
   "infiniburn": "#minecraft:infiniburn_overworld",
   "logical_height": 384,
   "min_y": -64,
-  "monster_spawn_block_light_limit": 0,
+  "monster_spawn_block_light_limit": 15,
   "monster_spawn_light_level": {
     "type": "minecraft:uniform",
-    "max_inclusive": 7,
+    "max_inclusive": 15,
     "min_inclusive": 0
   },
   "natural": true,

common/src/generated/resources/data/jamd/dimension_type/nether.json

@@ -11,10 +11,10 @@
   "infiniburn": "#minecraft:infiniburn_nether",
   "logical_height": 128,
   "min_y": 0,
-  "monster_spawn_block_light_limit": 0,
+  "monster_spawn_block_light_limit": 15,
   "monster_spawn_light_level": {
     "type": "minecraft:uniform",
-    "max_inclusive": 7,
+    "max_inclusive": 15,
     "min_inclusive": 0
   },
   "natural": false,

common/src/generated/resources/data/jamd/recipe/end_portal_block.json

@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "O": {
-      "item": "minecraft:end_stone"
-    },
-    "P": {
-      "item": "minecraft:diamond_pickaxe"
-    }
+    "O": "minecraft:end_stone",
+    "P": "minecraft:diamond_pickaxe"
   },
   "pattern": [
     "OOO",

common/src/generated/resources/data/jamd/recipe/nether_portal_block.json

@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "O": {
-      "item": "minecraft:nether_bricks"
-    },
-    "P": {
-      "item": "minecraft:netherite_pickaxe"
-    }
+    "O": "minecraft:nether_bricks",
+    "P": "minecraft:netherite_pickaxe"
   },
   "pattern": [
     "OOO",

common/src/generated/resources/data/jamd/recipe/portal_block.json

@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "O": {
-      "item": "minecraft:obsidian"
-    },
-    "P": {
-      "item": "minecraft:diamond_pickaxe"
-    }
+    "O": "minecraft:obsidian",
+    "P": "minecraft:diamond_pickaxe"
   },
   "pattern": [
     "OOO",

common/src/generated/resources/data/jamd/worldgen/biome/end.json

@@ -1,8 +1,9 @@
 {
-  "carvers": {},
+  "carvers": [],
   "downfall": 0.5,
   "effects": {
     "fog_color": 10518688,
+    "music_volume": 1.0,
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011

common/src/generated/resources/data/jamd/worldgen/biome/mining.json

@@ -1,8 +1,9 @@
 {
-  "carvers": {},
+  "carvers": [],
   "downfall": 0.4,
   "effects": {
     "fog_color": 12638463,
+    "music_volume": 1.0,
     "sky_color": 8103167,
     "water_color": 4445678,
     "water_fog_color": 270131

common/src/generated/resources/data/jamd/worldgen/biome/nether.json

@@ -1,5 +1,5 @@
 {
-  "carvers": {},
+  "carvers": [],
   "downfall": 0.0,
   "effects": {
     "additions_sound": {
@@ -14,12 +14,18 @@
       "sound": "minecraft:ambient.nether_wastes.mood",
       "tick_delay": 6000
     },
-    "music": {
-      "max_delay": 24000,
-      "min_delay": 12000,
-      "replace_current_music": false,
-      "sound": "minecraft:music.nether.nether_wastes"
-    },
+    "music": [
+      {
+        "data": {
+          "max_delay": 24000,
+          "min_delay": 12000,
+          "replace_current_music": false,
+          "sound": "minecraft:music.nether.nether_wastes"
+        },
+        "weight": 1
+      }
+    ],
+    "music_volume": 1.0,
     "sky_color": 7254527,
     "water_color": 4159204,
     "water_fog_color": 329011
@@ -32,7 +38,14 @@
     [],
     [],
     [],
-    []
+    [
+      "minecraft:ore_gravel_nether",
+      "minecraft:ore_blackstone",
+      "minecraft:ore_gold_nether",
+      "minecraft:ore_quartz_nether",
+      "minecraft:ore_ancient_debris_large",
+      "minecraft:ore_debris_small"
+    ]
   ],
   "has_precipitation": false,
   "spawn_costs": {},

common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java

@@ -8,6 +8,10 @@
 import com.unrealdinnerbone.trenzalore.lib.RLUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.Display;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.timers.TimerCallback;
+import net.minecraft.world.level.timers.TimerQueue;
 import org.slf4j.Logger;
 
 import java.io.IOException;

common/src/main/java/com/unrealdinnerbone/jamd/JAMDRegistry.java

@@ -6,7 +6,10 @@
 import com.unrealdinnerbone.jamd.block.*;
 import com.unrealdinnerbone.jamd.block.base.PortalTileEntity;
 import com.unrealdinnerbone.jamd.world.CustomFlatLevelSource;
+import com.unrealdinnerbone.trenzalore.api.platform.services.ICreativeTabRegister;
 import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry;
+import com.unrealdinnerbone.trenzalore.api.registry.BlockRegistryObjects;
+import com.unrealdinnerbone.trenzalore.api.registry.ItemRegistryObjects;
 import com.unrealdinnerbone.trenzalore.api.registry.Regeneration;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry;
 import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects;
@@ -16,26 +19,30 @@
 import net.minecraft.commands.synchronization.SingletonArgumentInfo;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.BiomeTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.biome.Biome;
 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.chunk.ChunkGenerator;
 
 import java.util.List;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 public class JAMDRegistry implements IRegistry {
 
-    private static final RegistryObjects<Block> BLOCKS = Regeneration.create(Registries.BLOCK);
-    private static final RegistryObjects<Item> ITEMS = Regeneration.create(Registries.ITEM);
-    private static final RegistryObjects<BlockEntityType<?>> TILES = Regeneration.create(Registries.BLOCK_ENTITY_TYPE);
-    private static final RegistryObjects<MapCodec<? extends ChunkGenerator>> CHUNK_GENERATORS = Regeneration.create(Registries.CHUNK_GENERATOR);
+    private static final BlockRegistryObjects BLOCKS = Regeneration.createBlockRegistry(JAMD.MOD_ID);
+    private static final ItemRegistryObjects ITEMS = Regeneration.createItemRegistry(JAMD.MOD_ID);
+    private static final RegistryObjects<BlockEntityType<?>> TILES = Regeneration.create(JAMD.MOD_ID, Registries.BLOCK_ENTITY_TYPE);
+    private static final RegistryObjects<MapCodec<? extends ChunkGenerator>> CHUNK_GENERATORS = Regeneration.create(JAMD.MOD_ID, Registries.CHUNK_GENERATOR);
 
     public static final RegistryEntry<MapCodec<? extends ChunkGenerator>> CUSTOM_FLAT_LEVEL_SOURCE = CHUNK_GENERATORS.register("mining", () -> CustomFlatLevelSource.CODEC);
 
@@ -46,14 +53,14 @@ public class JAMDRegistry implements IRegistry {
     public static final WorldType END = of("end", "end_portal", "end_portal", EndPortalBlock::new, EndBlockEntity::new, BiomeTags.IS_END);
 
 
-    private static WorldType of(String name, String blockName, String tileName, Supplier<Block> blockSupplier, BiFunction<BlockPos, BlockState, PortalTileEntity> tileSupplier, TagKey<Biome> biomeTagKey) {
-        RegistryEntry<Block> block = BLOCKS.register(blockName, blockSupplier);
-        return new WorldType(name, block, ITEMS.register(blockName, () -> new BlockItem(block.get(), new Item.Properties())), TILES.register(tileName, () -> Regeneration.createBlockEntityType(tileSupplier, block.get())), biomeTagKey);
+    private static WorldType of(String name, String blockName, String tileName, Function<Block.Properties, Block> blockSupplier, Regeneration.BESuppler<PortalTileEntity> tileSupplier, TagKey<Biome> biomeTagKey) {
+        RegistryEntry<Block> block = BLOCKS.register(blockName, blockSupplier, UnaryOperator.identity());
+        return new WorldType(name, block, ITEMS.registerBlockItem(blockName, block, UnaryOperator.identity()), TILES.register(tileName, () -> Regeneration.createBEType(tileSupplier, block.getHolder().value())), biomeTagKey);
     }
 
     @Override
-    public void afterRegistered() {
-        Regeneration.addItemsToCreateTab(CreativeTabs.FUNCTIONAL_BLOCKS, List.of(OVERWORLD.getItem(), NETHER.getItem(), END.getItem()));
+    public void afterRegistered(ICreativeTabRegister register) {
+        register.addItemToCreativeTab(CreativeTabs.FUNCTIONAL_BLOCKS, List.of(OVERWORLD.getItem(), NETHER.getItem(), END.getItem()));
     }
 
     @Override

common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java

@@ -121,13 +121,13 @@ public void export(MinecraftServer server) throws IllegalStateException, IOExcep
         List<PlacedFeature> placedFeatures = getFeatures(server);
         for (PlacedFeature placedFeature : placedFeatures) {
 
-            boolean b = server.registryAccess().registryOrThrow(Registries.PLACED_FEATURE).wrapAsHolder(placedFeature).is(ingoredPlaceFeatures);
+            boolean b = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE).wrapAsHolder(placedFeature).is(ingoredPlaceFeatures);
 
             if (!b && !placedFeature.feature().is(ingoredConfigFeatures)) {
                 RegistryAccess.Frozen frozen = server.registryAccess();
                 ConfiguredFeature<?, ?> configuredFeatureReference = placedFeature.feature().value();
                 Feature<?> feature1 = configuredFeatureReference.feature();
-                ResourceLocation key1 = frozen.registryOrThrow(Registries.FEATURE).getKey(feature1);
+                ResourceLocation key1 = frozen.lookupOrThrow(Registries.FEATURE).getKey(feature1);
                 FeatureTypeRegistry.getFeatureType(key1).ifPresentOrElse(iFeatureTypeCompact -> {
                     try {
                         oresCodecs.add(iFeatureTypeCompact.getOreCodec(configuredFeatureReference.config(), placedFeature.placement()));

common/src/main/java/com/unrealdinnerbone/jamd/block/EndPortalBlock.java

@@ -2,11 +2,14 @@
 
 import com.unrealdinnerbone.jamd.JAMDRegistry;
 import com.unrealdinnerbone.jamd.block.base.PortalBlock;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 
 public class EndPortalBlock extends PortalBlock {
 
-    public EndPortalBlock() {
-        super(JAMDRegistry.END);
+    public EndPortalBlock(Block.Properties properties) {
+        super(properties, JAMDRegistry.END);
     }
 
 

common/src/main/java/com/unrealdinnerbone/jamd/block/NetherPortalBlock.java

@@ -2,11 +2,13 @@
 
 import com.unrealdinnerbone.jamd.JAMDRegistry;
 import com.unrealdinnerbone.jamd.block.base.PortalBlock;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 
 public class NetherPortalBlock extends PortalBlock {
 
-    public NetherPortalBlock() {
-        super(JAMDRegistry.NETHER);
+    public NetherPortalBlock(Block.Properties properties) {
+        super(properties, JAMDRegistry.NETHER);
     }
 
 }

common/src/main/java/com/unrealdinnerbone/jamd/block/OverworldPortalBlock.java

@@ -2,11 +2,13 @@
 
 import com.unrealdinnerbone.jamd.JAMDRegistry;
 import com.unrealdinnerbone.jamd.block.base.PortalBlock;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 
 public class OverworldPortalBlock extends PortalBlock {
 
-    public OverworldPortalBlock() {
-        super(JAMDRegistry.OVERWORLD);
+    public OverworldPortalBlock(Block.Properties properties) {
+        super(properties, JAMDRegistry.OVERWORLD);
     }
 
 }