From 2447a95a12dd1f422042cc0d3c5c4edbd939dcd9 Mon Sep 17 00:00:00 2001 From: "Killar.exe" Date: Sun, 25 Feb 2024 08:35:09 +0100 Subject: [PATCH] Backport crystals --- build.gradle | 2 +- .../fabric/registry/CrystalsModFabricBlocks.java | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- .../forge/registry/CrystalsModForgeBlocks.java | 10 +++++----- forge/src/main/resources/META-INF/mods.toml | 6 +++--- forge/update.json | 5 +++++ gradle.properties | 6 +++--- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index acbe4ac..24a71ad 100644 --- 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 index ea5bc95..8cd04ee 100644 --- 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 index 876a55f..eab7573 100644 --- 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 index 00d5694..acc881c 100644 --- 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 BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, CrystalsMod.MOD_ID); - public static final RegistryObject DIAMOND_CRYSTAL = BLOCKS.register("diamond_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD))); - public static final RegistryObject EMERALD_CRYSTAL = BLOCKS.register("emerald_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD))); - public static final RegistryObject LAPIS_CRYSTAL = BLOCKS.register("lapis_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD))); - public static final RegistryObject REDSTONE_CRYSTAL = BLOCKS.register("redstone_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD))); - public static final RegistryObject GLOWSTONE_CRYSTAL = BLOCKS.register("glowstone_crystal", () -> new AmethystClusterBlock(5.0F, 3.0F, BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD))); + public static final RegistryObject DIAMOND_CRYSTAL = BLOCKS.register("diamond_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD))); + public static final RegistryObject EMERALD_CRYSTAL = BLOCKS.register("emerald_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD))); + public static final RegistryObject LAPIS_CRYSTAL = BLOCKS.register("lapis_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD))); + public static final RegistryObject REDSTONE_CRYSTAL = BLOCKS.register("redstone_crystal", () -> new AmethystClusterBlock(5, 3, BlockBehaviour.Properties.copy(Blocks.LARGE_AMETHYST_BUD))); + public static final RegistryObject 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 index 8f2de4e..352fd0c 100644 --- 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 index f2944b4..f741dd1 100644 --- 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 index fac43f1..d42a749 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.20.4 +minecraft_version=1.20.1 enabled_platforms=fabric,forge archives_base_name=crystals @@ -8,9 +8,9 @@ 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