Update to 1.20.5

nanite · Apr 24, 2024 · 17cb5ee · 17cb5ee
1 parent ec517b1
commit 17cb5ee
Show file tree

Hide file tree

Showing 27 changed files with 73 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-### 6.0.2
+### 7.0.0
 
 - Removed need for Diamond Tool
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id("dev.nanite.mlp") version("0.1.1")
+    id("dev.nanite.mlp") version("0.1.8")
     id("java-library")
     id("maven-publish")
     id("me.modmuss50.mod-publish-plugin") version "0.3.0"
 }
 
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 multiLoader.root() {
     minecraftVersion.set(project.property("minecraft_version"))
@@ -36,7 +36,7 @@ subprojects {
 
     sourceSets.main.resources.srcDir project.file('src/generated/resources')
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 
     base {
@@ -93,11 +93,11 @@ 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 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 }
@@ -122,9 +122,9 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-    }
+//    curseforge("curseforgeForge") {
+//        from(curseForgeOptions, forgeOptions)
+//    }
 
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoOptions)

diff --git a/common/src/generated/resources/.cache/3c912f34f43fe0ddbb6b4986f1ae52288214ab96 b/common/src/generated/resources/.cache/3c912f34f43fe0ddbb6b4986f1ae52288214ab96
@@ -1,4 +1,4 @@
-// 1.20.4	2023-12-31T22:58:20.1809899	Just Another Void Dimension/Model Definitions
+// 1.20.5	2024-04-24T10:59:38.8525869	Just Another Void Dimension/Model Definitions
 1c5d5494312364c75fde2cceb856d97636b4ebed assets\javd\blockstates\portal_block.json
 cd5439c706398c2fa6c04057a61e40649513b8b1 assets\javd\models\item\portal_block.json
 c48e15d749e8a8f82160ec5245cd256dd8cab5ee assets\javd\models\block\portal_block.json
diff --git a/common/src/generated/resources/.cache/8a3139192a02734f166e4eb3dbfa39ef7104c052 b/common/src/generated/resources/.cache/8a3139192a02734f166e4eb3dbfa39ef7104c052
@@ -1,4 +1,4 @@
-// 1.20.4	2023-12-31T22:58:20.1799874	Just Another Void Dimension/Tags for minecraft:block
-f8a9f463d508aea5a78c950850464f0f38648907 data\javd\tags\blocks\generator.json
-39ca10ba4aaafd3646130e23521b182525e2045f data\minecraft\tags\blocks\mineable\pickaxe.json
-39ca10ba4aaafd3646130e23521b182525e2045f data\minecraft\tags\blocks\needs_diamond_tool.json
+// 1.20.5	2024-04-24T10:59:38.8515886	Just Another Void Dimension/Tags for minecraft:block
+4e73ea13bcd159cbb7c409dd4b679a70fb14427f data\javd\tags\blocks\generator.json
+92f78b22136e536dd3ac3d7b92d041a6681c16a0 data\minecraft\tags\blocks\mineable\pickaxe.json
+92f78b22136e536dd3ac3d7b92d041a6681c16a0 data\minecraft\tags\blocks\needs_diamond_tool.json
diff --git a/common/src/generated/resources/.cache/a32b031f3c3bd6d1f02a3f41632495d3869d3d6b b/common/src/generated/resources/.cache/a32b031f3c3bd6d1f02a3f41632495d3869d3d6b
@@ -1,2 +1,2 @@
-// 1.20.4	2023-12-31T22:58:20.1804874	Just Another Void Dimension/Language (en_us)
+// 1.20.5	2024-04-24T10:59:38.8520875	Just Another Void Dimension/Language (en_us)
 c7b12ee0f8b6aada8e8c71f0e7b7293142c62abb assets\javd\lang\en_us.json
diff --git a/common/src/generated/resources/.cache/b47703b6c7b0f86429d65095d66ccade68e74c49 b/common/src/generated/resources/.cache/b47703b6c7b0f86429d65095d66ccade68e74c49
@@ -1,2 +1,2 @@
-// 1.20.4	2023-12-31T22:58:20.1784824	Just Another Void Dimension/Block Loot Tables
+// 1.20.5	2024-04-24T10:59:38.8510795	Just Another Void Dimension/Block Loot Tables
 764a941e167ee286b9d1a578d07e38c156a3ffed data\javd\loot_tables\blocks\portal_block.json
diff --git a/common/src/generated/resources/.cache/b71c17fb81e74db59aa8f13e34c7bb4a3740cdf7 b/common/src/generated/resources/.cache/b71c17fb81e74db59aa8f13e34c7bb4a3740cdf7
@@ -1,2 +1,2 @@
-// 1.20.4	2023-12-31T22:58:20.181487	Just Another Void Dimension/Advancements
-0902c41c4d8b8cb089244ab03a06b16e8cb05f32 data\javd\advancements\enter_mining_dimension.json
+// 1.20.5	2024-04-24T10:59:38.8525869	Just Another Void Dimension/Advancements
+cfc509dcc43241b3982607e6a31951fa2ce4e8dd data\javd\advancements\enter_mining_dimension.json
diff --git a/common/src/generated/resources/.cache/ceae270e87f9d1b3fc6ab5544e0a2d312d9f8aef b/common/src/generated/resources/.cache/ceae270e87f9d1b3fc6ab5544e0a2d312d9f8aef
@@ -1,3 +1,3 @@
-// 1.20.4	2023-12-31T22:58:20.1799874	Just Another Void Dimension/JAVD World Data
-e022cecafe8e7e93c9e3e503c46197cf1fb33450 data\javd\dimension_type\void.json
+// 1.20.5	2024-04-24T10:59:38.8515886	Just Another Void Dimension/JAVD World Data
+f6672443f0df9cbae3a13c9fd01719ee6c6a8bf3 data\javd\dimension_type\void.json
 b7b05aca3064fd5c2f4acc6e4c4900a26d898a3b data\javd\worldgen\biome\void.json
diff --git a/common/src/generated/resources/.cache/f093677d1300376a3f7bbb45a8a000c0c5d4005b b/common/src/generated/resources/.cache/f093677d1300376a3f7bbb45a8a000c0c5d4005b
@@ -1,3 +1,3 @@
-// 1.20.4	2023-12-31T22:58:20.1809899	Just Another Void Dimension/Recipes
-b4362344f9bb6789f896890f24325bca61de0833 data\javd\advancements\recipes\transportation\portal_block.json
-146181b1ebd2dbb293c1f0b5f18f03a9a7fad3dd data\javd\recipes\portal_block.json
+// 1.20.5	2024-04-24T10:59:38.8521689	Just Another Void Dimension/Recipes
+a9a8a602495b3c9d4f26a07ba31d0178631b5c9c data\javd\advancements\recipes\transportation\portal_block.json
+7597bb585037b28e3e1cb259ff1bdf5646289a0f data\javd\recipes\portal_block.json
diff --git a/common/src/generated/resources/data/javd/advancements/enter_mining_dimension.json b/common/src/generated/resources/data/javd/advancements/enter_mining_dimension.json
@@ -1,4 +1,5 @@
 {
+  "parent": "minecraft:story/mine_diamond",
   "criteria": {
     "enter_dimension": {
       "conditions": {
@@ -11,8 +12,10 @@
     "description": {
       "translate": "advancement.javd.enter_void_dimension.description"
     },
+    "hidden": true,
     "icon": {
-      "item": "javd:portal_block"
+      "count": 1,
+      "id": "javd:portal_block"
     },
     "title": {
       "translate": "advancement.javd.enter_void_dimension"

diff --git a/...n/src/generated/resources/data/javd/advancements/recipes/transportation/portal_block.json b/...n/src/generated/resources/data/javd/advancements/recipes/transportation/portal_block.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:ender_pearl"
-            ]
+            "items": "minecraft:ender_pearl"
           }
         ]
       },

diff --git a/common/src/generated/resources/data/javd/dimension_type/void.json b/common/src/generated/resources/data/javd/dimension_type/void.json
@@ -14,10 +14,8 @@
   "monster_spawn_block_light_limit": 0,
   "monster_spawn_light_level": {
     "type": "minecraft:uniform",
-    "value": {
-      "max_inclusive": 7,
-      "min_inclusive": 0
-    }
+    "max_inclusive": 7,
+    "min_inclusive": 0
   },
   "natural": true,
   "piglin_safe": false,

diff --git a/common/src/generated/resources/data/javd/recipes/portal_block.json b/common/src/generated/resources/data/javd/recipes/portal_block.json
@@ -15,6 +15,7 @@
     "OOO"
   ],
   "result": {
-    "item": "javd:portal_block"
+    "count": 1,
+    "id": "javd:portal_block"
   }
 }
diff --git a/common/src/generated/resources/data/javd/tags/blocks/generator.json b/common/src/generated/resources/data/javd/tags/blocks/generator.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:black_concrete",
     "minecraft:blue_concrete",

diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "javd:portal_block"
   ]

diff --git a/common/src/main/java/com/unrealdinnerbone/javd/block/PortalBlock.java b/common/src/main/java/com/unrealdinnerbone/javd/block/PortalBlock.java
@@ -26,9 +26,9 @@ public PortalBlock() {
 
 
     @Override
-    public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+    protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hand) {
         if (!level.isClientSide()) {
-            boolean isInVoid = level.dimensionTypeId().equals(JAVDRegistry.Keys.DIMENSION_TYPE);
+            boolean isInVoid = level.dimensionTypeRegistration().is(JAVDRegistry.Keys.DIMENSION_TYPE);
             TelerportUtils.teleport(player, isInVoid ? Level.OVERWORLD : JAVDRegistry.Keys.LEVEL, pos, !isInVoid);
             return InteractionResult.sidedSuccess(level.isClientSide);
         }else {

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/JAVDFabric.java b/fabric/src/main/java/com/unrealdinnerbone/javd/JAVDFabric.java
@@ -1,8 +1,6 @@
 package com.unrealdinnerbone.javd;
 
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-import net.fabricmc.fabric.impl.object.builder.FabricEntityType;
 
 public class JAVDFabric implements ModInitializer {
     @Override

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/AdvancementProvider.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/AdvancementProvider.java
@@ -8,23 +8,27 @@
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.AdvancementType;
 import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public class AdvancementProvider extends FabricAdvancementProvider {
 
     public static final String ADVANCEMENT_ID = "advancement." + JAVD.MOD_ID + ".enter_void_dimension";
     public static final String ADVANCEMENT_DESCRIPTION_KEY = ADVANCEMENT_ID + ".description";
-    protected AdvancementProvider(FabricDataOutput output) {
-        super(output);
+
+    protected AdvancementProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(output, registryLookup);
     }
 
     @Override
-    public void generateAdvancement(Consumer<AdvancementHolder> consumer) {
+    public void generateAdvancement(HolderLookup.Provider lookup, Consumer<AdvancementHolder> consumer) {
         consumer.accept(Advancement.Builder.advancement()
-                        .display(
+                .parent(new ResourceLocation("minecraft", "story/mine_diamond"))
+                .display(
                                 JAVDRegistry.PORTAL_BLOCK_ITEM.get(),
                                 Component.translatable(ADVANCEMENT_ID),
                                 Component.translatable(ADVANCEMENT_DESCRIPTION_KEY),

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/BlockTagProvider.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/BlockTagProvider.java
@@ -37,7 +37,5 @@ protected void addTags(HolderLookup.Provider arg) {
                 .add(Blocks.YELLOW_CONCRETE);
         getOrCreateTagBuilder(BlockTags.MINEABLE_WITH_PICKAXE)
                 .add(JAVDRegistry.PORTAL_BLOCK.get());
-        getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
-                .add(JAVDRegistry.PORTAL_BLOCK.get());
     }
 }
diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/JAVDData.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/JAVDData.java
@@ -6,7 +6,7 @@
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.data.worldgen.BootstrapContext;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.valueproviders.UniformInt;
 import net.minecraft.world.level.biome.Biome;
@@ -41,7 +41,7 @@ public void buildRegistry(RegistrySetBuilder registryBuilder) {
         registryBuilder.add(Registries.BIOME, this::bootstrapBiome);
     }
 
-    private void bootstrapBiome(BootstapContext<Biome> context) {
+    private void bootstrapBiome(BootstrapContext<Biome> context) {
         HolderGetter<PlacedFeature> placedFeatures = context.lookup(Registries.PLACED_FEATURE);
         HolderGetter<ConfiguredWorldCarver<?>> configuredWorldCarvers = context.lookup(Registries.CONFIGURED_CARVER);
         context.register(JAVDRegistry.Keys.BIOME, new Biome.BiomeBuilder()
@@ -60,7 +60,7 @@ private void bootstrapBiome(BootstapContext<Biome> context) {
                 .build());
     }
 
-    private void bootstrapDimensionType(BootstapContext<DimensionType> context) {
+    private void bootstrapDimensionType(BootstrapContext<DimensionType> context) {
         context.register(JAVDRegistry.Keys.DIMENSION_TYPE, new DimensionType(OptionalLong.of(6000),
                 true,
                 false,

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/LangProvider.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/LangProvider.java
@@ -3,15 +3,18 @@
 import com.unrealdinnerbone.javd.JAVDRegistry;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
+import net.minecraft.core.HolderLookup;
+
+import java.util.concurrent.CompletableFuture;
 
 public class LangProvider extends FabricLanguageProvider {
 
-    protected LangProvider(FabricDataOutput dataOutput) {
-        super(dataOutput);
+    protected LangProvider(FabricDataOutput dataOutput, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(dataOutput, registryLookup);
     }
 
     @Override
-    public void generateTranslations(TranslationBuilder translationBuilder) {
+    public void generateTranslations(HolderLookup.Provider provider, TranslationBuilder translationBuilder) {
         translationBuilder.add(JAVDRegistry.PORTAL_BLOCK.get(), "Void Portal");
         translationBuilder.add("javd.invalid.world", "Unable to find world '%s'");
         translationBuilder.add("javd.invalid.pos", "Unable to find valid portal location");

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/LootTableProvider.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/LootTableProvider.java
@@ -3,11 +3,14 @@
 import com.unrealdinnerbone.javd.JAVDRegistry;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
+import net.minecraft.core.HolderLookup;
+
+import java.util.concurrent.CompletableFuture;
 
 public class LootTableProvider extends FabricBlockLootTableProvider {
 
-    protected LootTableProvider(FabricDataOutput dataOutput) {
-        super(dataOutput);
+    protected LootTableProvider(FabricDataOutput dataOutput, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(dataOutput, registryLookup);
     }
 
     @Override

diff --git a/fabric/src/main/java/com/unrealdinnerbone/javd/data/RecipeProvider.java b/fabric/src/main/java/com/unrealdinnerbone/javd/data/RecipeProvider.java
@@ -3,18 +3,21 @@
 import com.unrealdinnerbone.javd.JAVDRegistry;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 public class RecipeProvider extends FabricRecipeProvider {
-    public RecipeProvider(FabricDataOutput output) {
-        super(output);
+
+    public RecipeProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(output, registryLookup);
     }
 
     @Override

diff --git a/gradle.properties b/gradle.properties
@@ -1,24 +1,24 @@
 # Project
-mod_version=6.0.2
+mod_version=7.0.0
 maven_group=com.unrealdinnerbone
 curse_id=370890
 mod_name=JAVD
 mod_author=UnRealDinnerbone
 mod_id=javd
 
 
-minecraft_version=1.20.4
+minecraft_version=1.20.5
 
 # Forge
-forge_version=49.0.13
+#forge_version=49.0.13
 
-neo_version=20.4.70-beta
+neo_version=20.5.0-beta
 
-fabric_version=0.91.2+1.20.4
-fabric_loader_version=0.15.1
+fabric_version=0.97.6+1.20.5
+fabric_loader_version=0.15.10
 
 # Other
-trenzalore_version=4.0.1
+trenzalore_version=5.0.1
 
 
 # Gradle

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neo/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/neo/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/settings.gradle b/settings.gradle
@@ -23,4 +23,4 @@ pluginManagement {
 
 
 
-include("common", "neo", "fabric", "forge")
+include("common", "neo", "fabric")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@ pluginManagement {



		include("common", "neo", "fabric", "forge")
		include("common", "neo", "fabric")