Update to 1.20.1

build.gradle

@@ -1,21 +1,28 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.1-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    withSourcesJar()
+}
 
-archivesBaseName = project.archives_base_name
-version = project.mod_version+"+"+project.minecraft_version
-group = project.maven_group
+version = project.mod_version + "+" + project.minecraft_version
+group = project.group
+description = project.displayname
+archivesBaseName = project.name
 
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
+  mavenLocal()
+  flatDir { dirs 'lib' }
 	mavenCentral()
 }
 
@@ -27,52 +34,42 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	// Uncomment the following line to enable the deprecated Fabric API modules. 
-	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
-	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
-	modImplementation fileTree(dir: 'lib', include: ['*.jar'])
+	modImplementation "com.matthewperiut:chisel:${project.chisel_version}"
+	// required by chisel (wouldn't need this if chisel had a maven...)
+	modImplementation "me.pepperbell:continuity:${project.continuity_version}"
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property "version", project.version.toString()
 
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version.toString(),
+                "minecraftVersion": ">=${project.minecraft_version}",
+                "loaderVersion": ">=${project.loader_version}",
+                "fabricVersion": ">=${project.fabric_version}",
+                "chiselVersion": ">=${project.chisel_version}"
+    }
 
-tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+    from 'LICENSE'
 }
 
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}" }
-	}
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
 }
 
 // configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-		}
-	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
-}
+// publishing {
+//	publications {
+//		mavenJava(MavenPublication) {
+//			from components.java
+//		}
+//	}
+//
+//	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+//	repositories {
+//		// Add repositories to publish to here.
+//		// Notice: This block does NOT have the same function as the block in the top level.
+//		// The repositories here will be used for publishing your artifact, not for
+//		// retrieving dependencies.
+//	}
+//}

gradle.properties

@@ -1,16 +1,19 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
 
 # Fabric Properties
-	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19.3
-	yarn_mappings=1.19.3+build.5
-	loader_version=0.14.12
+  # check these on https://fabricmc.net/develop
+  minecraft_version=1.20.1
+  yarn_mappings=1.20.1+build.9
+  loader_version=0.14.21
+  fabric_version=0.88.1+1.20.1
 
 # Mod Properties
-	mod_version = 1.0.1
-	maven_group = com.slaincow
-	archives_base_name = factory-blocks-mod
+  mod_version=1.1.0
+  group=com.slaincow
+  displayname=Factory Blocks
 
-#Fabric api
-	fabric_version=0.72.0+1.19.3
+# Depdendencies
+  chisel_version=1.6+1.20.1
+  continuity_version=3.0.0-beta.4+1.20.1

run/config/fabric_loader_dependencies.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "overrides": {
+    "factory_blocks": { "depends": { } }
+  }
+}

settings.gradle

@@ -1,10 +1,8 @@
 pluginManagement {
     repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
         mavenCentral()
+        maven { name 'Fabric'; url 'https://maven.fabricmc.net/' }
         gradlePluginPortal()
     }
 }
+rootProject.name = 'factory_blocks'

src/main/java/net/slaincow/factoryblocks/block/BaseFactoryBlock.java

@@ -1,10 +1,13 @@
 package net.slaincow.factoryblocks.block;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.MapColor;
+import net.minecraft.block.enums.Instrument;
+
 import static net.slaincow.factoryblocks.FactorySound.FACTORY_BLOCKS;
 
 public class BaseFactoryBlock extends Block {
     public BaseFactoryBlock(Settings settings) {
-        super(settings.strength(2).sounds(FACTORY_BLOCKS));
+        super(settings.mapColor(MapColor.IRON_GRAY).instrument(Instrument.IRON_XYLOPHONE).requiresTool().strength(2).sounds(FACTORY_BLOCKS));
     }
 }

src/main/java/net/slaincow/factoryblocks/block/RegisterBlocks.java

@@ -5,7 +5,6 @@
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
-import net.minecraft.block.Material;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
@@ -18,56 +17,56 @@
 import static net.slaincow.factoryblocks.FactoryBlocksMod.MODID;
 
 public interface RegisterBlocks {
-    BaseFactoryBlock FACTORY_BASE = addFactoryBlock("factory", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock RUST = addFactoryBlock("rust", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock VRUST = addFactoryBlock("vrust", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock SRUST = addFactoryBlock("srust", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock WIREFRAME = addFactoryBlock("wireframe", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock PURPLE_WIREFRAME = addFactoryBlock("pwireframe", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock HAZARD = addFactoryBlock("hazard", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock HAZARD_ORANGE = addFactoryBlock("hazardo", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock CIRCUIT = addFactoryBlock("circuit", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock METAL_BOX = addFactoryBlock("metalbox", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock GOLD_CIRCUIT = addFactoryBlock("gcircuit", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock PURPLE_GOLD_CIRCUIT = addFactoryBlock("pgcircuit", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock GRINDER = addFactoryBlock("grinder", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock OLD_VENTS = addFactoryBlock("old_vents", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock RUST_PLATES = addFactoryBlock("rust_plates", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock BLUE_CIRCUIT = addFactoryBlock("bcircuit", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock FACTORY_ICE = addFactoryBlock("ice", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock MOSAIC = addFactoryBlock("mosaic", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock BLUE_WIREFRAME = addFactoryBlock("bwireframe", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock RUSTY_SCAFFOLD = addFactoryBlock("rusty_scaffold", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock CAUTION = addFactoryBlock("caution", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock LARGE_PIPES = addFactoryBlock("large_pipes", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock SMALL_PIPES = addFactoryBlock("small_pipes", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock VENT = addFactoryBlock("vent", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock GVENT = addFactoryBlock("gvent", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock INSULATION = addFactoryBlock("insulation", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock GEARS = addFactoryBlock("gears", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock CABLES = addFactoryBlock("cables", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock RUST_BPLATES = addFactoryBlock("rust_bplates", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock GRATE = addFactoryBlock("grate", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock RUSTY_GRATE = addFactoryBlock("rgrate", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock HEX = addFactoryBlock("hex", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock WEATHERED_GREEN_PANEL = addFactoryBlock("wgpanel", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock WEATHERED_ORANGE_PANEL = addFactoryBlock("wopanel", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock STURDY = addFactoryBlock("sturdy", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock MEGACELL = addFactoryBlock("megacell", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock EXHAUST = addFactoryBlock("exhaust", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock ENGINEER = addFactoryBlock("engineer", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock SCAFFOLD = addFactoryBlock("scaffold", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock PIPING = addFactoryBlock("piping", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFactoryBlock LARGE_PLATING = addFactoryBlock("large_plating", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
+    BaseFactoryBlock FACTORY_BASE = addFactoryBlock("factory", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock RUST = addFactoryBlock("rust", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock VRUST = addFactoryBlock("vrust", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock SRUST = addFactoryBlock("srust", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock WIREFRAME = addFactoryBlock("wireframe", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock PURPLE_WIREFRAME = addFactoryBlock("pwireframe", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock HAZARD = addFactoryBlock("hazard", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock HAZARD_ORANGE = addFactoryBlock("hazardo", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock CIRCUIT = addFactoryBlock("circuit", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock METAL_BOX = addFactoryBlock("metalbox", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock GOLD_CIRCUIT = addFactoryBlock("gcircuit", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock PURPLE_GOLD_CIRCUIT = addFactoryBlock("pgcircuit", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock GRINDER = addFactoryBlock("grinder", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock OLD_VENTS = addFactoryBlock("old_vents", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock RUST_PLATES = addFactoryBlock("rust_plates", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock BLUE_CIRCUIT = addFactoryBlock("bcircuit", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock FACTORY_ICE = addFactoryBlock("ice", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock MOSAIC = addFactoryBlock("mosaic", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock BLUE_WIREFRAME = addFactoryBlock("bwireframe", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock RUSTY_SCAFFOLD = addFactoryBlock("rusty_scaffold", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock CAUTION = addFactoryBlock("caution", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock LARGE_PIPES = addFactoryBlock("large_pipes", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock SMALL_PIPES = addFactoryBlock("small_pipes", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock VENT = addFactoryBlock("vent", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock GVENT = addFactoryBlock("gvent", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock INSULATION = addFactoryBlock("insulation", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock GEARS = addFactoryBlock("gears", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock CABLES = addFactoryBlock("cables", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock RUST_BPLATES = addFactoryBlock("rust_bplates", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock GRATE = addFactoryBlock("grate", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock RUSTY_GRATE = addFactoryBlock("rgrate", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock HEX = addFactoryBlock("hex", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock WEATHERED_GREEN_PANEL = addFactoryBlock("wgpanel", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock WEATHERED_ORANGE_PANEL = addFactoryBlock("wopanel", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock STURDY = addFactoryBlock("sturdy", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock MEGACELL = addFactoryBlock("megacell", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock EXHAUST = addFactoryBlock("exhaust", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock ENGINEER = addFactoryBlock("engineer", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock SCAFFOLD = addFactoryBlock("scaffold", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock PIPING = addFactoryBlock("piping", new BaseFactoryBlock(Block.Settings.create()));
+    BaseFactoryBlock LARGE_PLATING = addFactoryBlock("large_plating", new BaseFactoryBlock(Block.Settings.create()));
 
-    BaseFactoryBlock SMOOTH_METAL = addFactoryBlock("fan_side", new BaseFactoryBlock(FabricBlockSettings.of(Material.METAL)));
-    RedstoneFanBlock FAN_STILL = addFactoryBlock("fan", new RedstoneFanBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFanBlock FAN_ON = addFactoryBlock("fan_on", new BaseFanBlock(FabricBlockSettings.of(Material.METAL)));
-    RedstoneFanBlock FAN_FOUR = addFactoryBlock("fan_four", new RedstoneFanBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFanBlock FAN_FOUR_ON = addFactoryBlock("fan_four_on", new RedstoneFanBlock(FabricBlockSettings.of(Material.METAL)));
-    RedstoneFanBlock FAN_MALFUNCTION = addFactoryBlock("fan_malfunction", new RedstoneFanBlock(FabricBlockSettings.of(Material.METAL)));
-    BaseFanBlock FAN_MALFUNCTION_ON = addFactoryBlock("fan_mulfunction_on", new RedstoneFanBlock(FabricBlockSettings.of(Material.METAL)));
-    MediumFanBlock MEDIUM_FAN = addFactoryBlock("fan_medium", new MediumFanBlock(FabricBlockSettings.of(Material.METAL).dynamicBounds().collidable(true)), false);
+    BaseFactoryBlock SMOOTH_METAL = addFactoryBlock("fan_side", new BaseFactoryBlock(Block.Settings.create()));
+    RedstoneFanBlock FAN_STILL = addFactoryBlock("fan", new RedstoneFanBlock(Block.Settings.create()));
+    BaseFanBlock FAN_ON = addFactoryBlock("fan_on", new BaseFanBlock(Block.Settings.create()));
+    RedstoneFanBlock FAN_FOUR = addFactoryBlock("fan_four", new RedstoneFanBlock(Block.Settings.create()));
+    BaseFanBlock FAN_FOUR_ON = addFactoryBlock("fan_four_on", new RedstoneFanBlock(Block.Settings.create()));
+    RedstoneFanBlock FAN_MALFUNCTION = addFactoryBlock("fan_malfunction", new RedstoneFanBlock(Block.Settings.create()));
+    BaseFanBlock FAN_MALFUNCTION_ON = addFactoryBlock("fan_malfunction_on", new RedstoneFanBlock(Block.Settings.create()));
+    MediumFanBlock MEDIUM_FAN = addFactoryBlock("medium_fan", new MediumFanBlock(FabricBlockSettings.create().dynamicBounds().collidable(true)), false);
 
     private static <T extends Block> T addFactoryBlock(String name, T block) {
         return addFactoryBlock(name, block, true);

src/main/java/net/slaincow/factoryblocks/block/fan/BaseFanBlock.java

@@ -21,6 +21,6 @@ protected void appendProperties(StateManager.Builder<Block, BlockState> builder)
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
-        return getDefaultState().with(Properties.HORIZONTAL_FACING, ctx.getPlayerFacing().getOpposite());
+        return getDefaultState().with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
     }
 }

src/main/resources/fabric.mod.json

@@ -2,7 +2,6 @@
   "schemaVersion": 1,
   "id": "factory_blocks",
   "version": "${version}",
-
   "name": "Factory Blocks Mod",
   "description": "Adds Factory Blocks to Chisel Refabricated",
   "authors": [
@@ -13,23 +12,20 @@
     "sources": "https://github.com/matthewperiut/factory-blocks",
     "issues": "https://github.com/matthewperiut/factory-blocks/issues"
   },
-
   "license": "CC0-1.0",
   "icon": "assets/factory_blocks/icon.png",
-
   "environment": "*",
   "entrypoints": {
     "main": [
       "net.slaincow.factoryblocks.FactoryBlocksMod"
     ]
   },
-
   "depends": {
-    "fabricloader": ">=0.14.6",
-    "fabric": "*",
-    "minecraft": "1.19.3",
+    "fabricloader": "${loaderVersion}",
+    "fabric": "${fabricVersion}",
+    "minecraft": "${minecraftVersion}",
     "java": ">=17",
-    "chisel": ">=1.4.0"
+    "chisel": "${chiselVersion}"
   },
   "suggests": {
     "continuity": "*"