Forge 1.20.1 port

.gitignore

@@ -1,4 +1,6 @@
 # Project exclude paths
+/.idea/
 /.gradle/
 /build/
-/build/classes/java/main/
+/build/classes/java/main/
+/run/

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0, 6.2)', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -18,7 +18,7 @@ archivesBaseName = 'morepaths'
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'official', version: '1.19.2'
+    mappings channel: 'official', version: '1.20.1'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -54,9 +54,9 @@ minecraft {
 jar.finalizedBy('reobfJar')
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.2-43.1.15'
+    minecraft 'net.minecraftforge:forge:1.20.1-47.2.0'
 }
 
 jar {
-    archiveName = "More_Paths_Repathed-1.19-${version}.${extension}"
+    archiveFileName = "More_Paths_Repathed-1.20.1-${version}.jar"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/kuraion/morepaths/MorepathsMod.java

@@ -37,7 +37,6 @@ public MorepathsMod() {
         ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ServerConfig.SERVER_CONFIG);
 
         MinecraftForge.EVENT_BUS.addListener(OtherPathBlock::doPlayerHarvestCheck);
-        MinecraftForge.EVENT_BUS.addListener(ShovelInteraction::onRightClick);
     }
 
     public static <T> void addNetworkMessage(Class<T> messageType, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder,

src/main/java/com/kuraion/morepaths/blocks/OtherPathBlock.java

@@ -32,7 +32,7 @@ public OtherPathBlock(Block pathedFrom) {
     private static Properties getProperties(Block pathedFrom) {
         BlockState state = pathedFrom.defaultBlockState();
 
-        return Block.Properties.of(state.getMaterial(), state.getMaterial().getColor()).strength(state.getDestroySpeed(null, null)).sound(state.getSoundType());
+        return Block.Properties.of().mapColor(pathedFrom.defaultMapColor()).strength(pathedFrom.defaultDestroyTime()).sound(pathedFrom.getSoundType(state));
     }
 
     @Override

src/main/java/com/kuraion/morepaths/init/MorepathsModBlocks.java

@@ -3,6 +3,7 @@
 import com.kuraion.morepaths.MorepathsMod;
 import com.kuraion.morepaths.blocks.OtherPathBlock;
 import com.kuraion.morepaths.config.ServerConfig;
+import net.minecraft.world.item.ShovelItem;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.DirtPathBlock;
@@ -31,6 +32,7 @@ public class MorepathsModBlocks {
 
     private static OtherPathBlock createBlock(Block fromBlock) {
         OtherPathBlock regBlock = new OtherPathBlock(fromBlock);
+        ShovelItem.FLATTENABLES.put(fromBlock, regBlock.defaultBlockState());
         ALL_PATHS.put(fromBlock, regBlock);
         return regBlock;
     }

src/main/java/com/kuraion/morepaths/init/MorepathsModItems.java

@@ -1,9 +1,10 @@
 package com.kuraion.morepaths.init;
 
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -19,11 +20,16 @@ public static void onRegisterItems(RegisterEvent event) {
         if (event.getRegistryKey().equals(ForgeRegistries.Keys.ITEMS)){
             MorepathsModBlocks.BLOCKS.getEntries().forEach( (blockRegistryObject) -> {
                 Block block = blockRegistryObject.get();
-                Item.Properties properties = new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS);
-                Supplier<Item> blockItemFactory = () -> new BlockItem(block, properties);
+                Supplier<Item> blockItemFactory = () -> new BlockItem(block, new Item.Properties());
                 event.register(ForgeRegistries.Keys.ITEMS, blockRegistryObject.getId(), blockItemFactory);
             });
         }
     }
 
+    @SubscribeEvent
+    public static void registerCreativeTabs(BuildCreativeModeTabContentsEvent event) {
+        if (event.getTabKey().equals(CreativeModeTabs.NATURAL_BLOCKS)) {
+            MorepathsModBlocks.BLOCKS.getEntries().forEach(event::accept);
+        }
+    }
 }

src/main/resources/META-INF/accesstransformer.cfg

@@ -0,0 +1 @@
+public net.minecraft.world.item.ShovelItem f_43110_

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[41,)"
+loaderVersion="[47,)"
 license="MIT License"
 
 [[mods]]
@@ -15,6 +15,6 @@ description='''Adds more paths to Minecraft!'''
 [[dependencies.morepaths]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19,]"
+    versionRange="[1.20.1,]"
     ordering="NONE"
     side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "MorePaths resources",
-        "pack_format": 7
+        "pack_format": 15
     }
 }