Update to MC 1.20.1

Author: rubensworks

build.gradle

@@ -1,15 +1,5 @@
-// For those who want the bleeding edge
-buildscript {
-    repositories {
-        mavenCentral()
-		maven { url = 'https://maven.minecraftforge.net' }
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
-}
-
 plugins {
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id 'com.diffplug.spotless' version '5.14.3'
 	id 'com.modrinth.minotaur' version '2.+'
@@ -180,7 +170,7 @@ build.dependsOn signJar
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
-    classifier = 'deobf'
+    archiveClassifier.set('deobf')
     manifest {
         attributes([
                 "FMLAT": "accesstransformer.cfg",
@@ -198,7 +188,7 @@ task deobfJar(type: Jar) {
 task apiJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.main.java
-    classifier = 'api'
+    archiveClassifier.set('api')
     include 'structuredcrafting/api/**'
 }
 

gradle.properties

@@ -1,7 +1,7 @@
 mod_version=0.2.5
-minecraft_version=1.19.4
-forge_version=45.0.50
-cyclopscore_version=1.18.2-309
+minecraft_version=1.20.1
+forge_version=47.0.1
+cyclopscore_version=1.18.4-340
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -0,0 +1,13 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}

src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafterConfig.java

@@ -1,7 +1,7 @@
 package org.cyclops.structuredcrafting.block;
 
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraftforge.fml.config.ModConfig;
 import org.cyclops.cyclopscore.config.ConfigurableProperty;
 import org.cyclops.cyclopscore.config.extendedconfig.BlockConfig;
@@ -49,7 +49,8 @@ public BlockStructuredCrafterConfig() {
         super(
                 StructuredCrafting._instance,
                 "structured_crafter",
-                (eConfig) -> new BlockStructuredCrafter(Block.Properties.of(Material.STONE)
+                (eConfig) -> new BlockStructuredCrafter(Block.Properties.of()
+                        .sound(SoundType.WOOD)
                         .strength(2.0f)),
                 getDefaultItemConstructor(StructuredCrafting._instance)
         );

src/main/java/org/cyclops/structuredcrafting/craft/WorldInventoryCrafting.java

@@ -2,17 +2,17 @@
 
 import com.google.common.base.Objects;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.TransientCraftingContainer;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
 /**
  * A world-based implementation of the crafting container.
  * @author rubensworks
  */
-public class WorldInventoryCrafting extends CraftingContainer {
+public class WorldInventoryCrafting extends TransientCraftingContainer {
 
     public WorldInventoryCrafting() {
         super(new AbstractContainerMenu(MenuType.CRAFTING, 0) {

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

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[45,)"
+loaderVersion="[47,)"
 issueTrackerURL="https://github.com/CyclopsMC/StructuredCrafting/issues"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/structured-crafting"
 license="MIT"
@@ -16,18 +16,18 @@ Craft stuff in your world, automatically.
 [[dependencies.structuredcrafting]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.18.2,)"
+    versionRange="[1.18.4,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="forge"
     mandatory=true
-    versionRange="[45.0.50,)"
+    versionRange="[47.0.1,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.4,]"
+    versionRange="[1.20.1,]"
     ordering="NONE"
     side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,8 +1,8 @@
 {
     "pack": {
         "description": "structuredcrafting resources",
-        "pack_format": 12,
-        "forge:resource_pack_format": 12,
-        "forge:data_pack_format": 10
+        "pack_format": 15,
+        "forge:resource_pack_format": 15,
+        "forge:data_pack_format": 15
     }
 }