Merge branch '1.19' into main

CHANGELOG.md

@@ -1,5 +1,3 @@
-## [1903.1.4]
-
-### Changed
-
-- Updated to 1.19.3
+## Update to 1.20
+### Limit currently changed to 200 and requires 8GB of ram to save a structure of 200x200x200
+### Hopefully will find out why and fix it in the future

gradle.properties

@@ -1,11 +1,11 @@
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx8G
 loom.platform=forge
 mod_id=structure-expansion
 archives_base_name=structure-expansion
 maven_group=com.sunekaer.mods
-minecraft_version=1.19.3
-mod_version=1903.1.4
+minecraft_version=1.20
+mod_version=2.0.0
 mod_author=Sunekaer
-forge_version=44.1.20
+forge_version=46.0.12
 curseforge_id=398430
-curseforge_type=release
+curseforge_type=beta

src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java

@@ -9,7 +9,7 @@
 @Mod("structureexpansion")
 @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
 public class StructureExpansion {
-	public static final int NEW_LIMIT = 512;
+	public static final int NEW_LIMIT = 200;
 	public static final int NEW_LIMIT_POS = NEW_LIMIT - 1;
 	public static final int NEW_LIMIT_NEG = -NEW_LIMIT_POS;
 

src/main/java/com/sunekaer/mods/structureexpansion/commands/CommandClean.java

@@ -28,9 +28,9 @@ private static int cleanStruc(CommandSourceStack source, String file) {
 
 		template.palettes.forEach(e ->{
 			int preSize = e.blocks().size();
-			e.blocks().removeIf(a -> a.state.getBlock() == Blocks.AIR);
+			e.blocks().removeIf(a -> a.state().getBlock() == Blocks.AIR);
 			int removed = preSize - e.blocks().size();
-			source.sendSuccess(Component.literal("Removed " + removed + " air blocks"), true);
+			source.sendSuccess(() -> Component.literal("Removed " + removed + " air blocks"), true);
 		});
 
 		templateManager.save(name);

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

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[44,)"
+loaderVersion = "[46,)"
 issueTrackerURL = "https://github.com/nanite/Structure-Expansion/issues"
 license = "MIT License"
 [[mods]]
@@ -17,13 +17,13 @@ Increases the size limit of the structure block from 48x48x48 to 127x127x127
 [[dependencies.structureexpansion]]
 modId = "forge"
 mandatory = true
-versionRange = "[44,)"
+versionRange = "[46,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.structureexpansion]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.3,1.20)"
+versionRange = "[1.20,1.21)"
 ordering = "NONE"
 side = "BOTH"

src/main/resources/structureexpansion.mixins.json

@@ -4,8 +4,7 @@
 	"compatibilityLevel": "JAVA_17",
 	"mixins": [
 		"ServerboundSetStructureBlockPacketMixin",
-		"StructureBlockEntityMixin",
-		"FillCommandMixin"
+		"StructureBlockEntityMixin"
 	],
 	"client": [
 		"StructureBlockRendererMixin"