Backport crystals

Killarexe · Feb 25, 2024 · 2447a95 · 2447a95
1 parent d53bcb3
commit 2447a95
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
 }
 
 architectury {

diff --git a/fabric/src/main/java/github/killarexe/crystals/fabric/registry/CrystalsModFabricBlocks.java b/fabric/src/main/java/github/killarexe/crystals/fabric/registry/CrystalsModFabricBlocks.java
@@ -20,7 +20,7 @@ public class CrystalsModFabricBlocks {
 	public static final Block GLOWSTONE_CRYSTAL = createBlock("glowstone_crystal");
 
 	private static Block createBlock(String id) {
-		Block block = new AmethystClusterBlock(5.0F, 3.0F, FabricBlockSettings.copyOf(Blocks.LARGE_AMETHYST_BUD));
+		Block block = new AmethystClusterBlock(5, 3, FabricBlockSettings.copyOf(Blocks.LARGE_AMETHYST_BUD));
 		BLOCKS.put(id, block);
 		return block;
 	}

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -24,6 +24,6 @@
   },
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "minecraft": ">=1.20.1"
   }
 }
diff --git a/forge/src/main/java/github/killarexe/crystals/forge/registry/CrystalsModForgeBlocks.java b/forge/src/main/java/github/killarexe/crystals/forge/registry/CrystalsModForgeBlocks.java
@@ -12,9 +12,9 @@
 public class CrystalsModForgeBlocks {
 	public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, CrystalsMod.MOD_ID);
 
-	public static final RegistryObject<Block> DIAMOND_CRYSTAL = BLOCKS.register("diamond_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD)));
-	public static final RegistryObject<Block> EMERALD_CRYSTAL = BLOCKS.register("emerald_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD)));
-	public static final RegistryObject<Block> LAPIS_CRYSTAL = BLOCKS.register("lapis_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD)));
-	public static final RegistryObject<Block> REDSTONE_CRYSTAL = BLOCKS.register("redstone_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD)));
-	public static final RegistryObject<Block> GLOWSTONE_CRYSTAL = BLOCKS.register("glowstone_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD)));
+	public static final RegistryObject<Block> DIAMOND_CRYSTAL = BLOCKS.register("diamond_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD)));
+	public static final RegistryObject<Block> EMERALD_CRYSTAL = BLOCKS.register("emerald_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD)));
+	public static final RegistryObject<Block> LAPIS_CRYSTAL = BLOCKS.register("lapis_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD)));
+	public static final RegistryObject<Block> REDSTONE_CRYSTAL = BLOCKS.register("redstone_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD)));
+	public static final RegistryObject<Block> GLOWSTONE_CRYSTAL = BLOCKS.register("glowstone_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD)));
 }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[49,)"
+loaderVersion = "[47,)"
 issueTrackerURL = "https://raw.githubusercontent.com/Killarexe/Crystals/master/forge/update.json"
 license = "CC0-1.0"
 
@@ -16,13 +16,13 @@ logoFile = "assets/crystals/title.png"
 [[dependencies.crystals]]
 modId = "forge"
 mandatory = true
-versionRange = "[49,)"
+versionRange = "[47,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.crystals]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.4,)"
+versionRange = "[1.20.1,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/forge/update.json b/forge/update.json
@@ -1,10 +1,15 @@
 {
 	"homepage": "https://modrinth.com/mod/crystals",
+	"1.20.1": {
+		"1.1.0": "1.20.1 backport of 1.1.0."
+	},
 	"1.20.4": {
 		"1.0.0": "Add basic crystals and crystal generation.",
 		"1.1.0": "Increase chances of generating crystals and patch glowstone crystals not generating."
 	},
 	"promos": {
+		"1.20.1-latest": "1.1.0",
+		"1.20.1-recommended": "1.1.0",
 		"1.20.4-latest": "1.1.0",
 		"1.20.4-recommended": "1.1.0"
 	}

diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.20.4
+minecraft_version=1.20.1
 enabled_platforms=fabric,forge
 
 archives_base_name=crystals
 mod_version=1.1.0
 maven_group=github.killarexe.crystals
 
 fabric_loader_version=0.15.3
-fabric_api_version=0.91.3+1.20.4
+fabric_api_version=0.91.0+1.20.1
 
-forge_version=1.20.4-49.0.14
+forge_version=1.20.1-47.2.0