From 4c26d303aec5fc7c80094c5f5de2798031d380b5 Mon Sep 17 00:00:00 2001 From: manmaed Date: Thu, 13 Jun 2024 17:13:59 +0100 Subject: [PATCH] Port to 1.21 Fabric --- ...abric.1.20.6.build.yml => fabric.1.21.build.yml} | 2 +- build.gradle | 13 +++++++++---- gradle.properties | 6 +++--- .../antiblocksrechiseled/AntiBlocksReChiseled.java | 2 +- .../blocks/ABRCBrightColors.java | 2 +- .../antiblocksrechiseled/blocks/ABRCButtons.java | 2 +- .../blocks/ABRCPressurePlates.java | 2 +- .../antiblocksrechiseled/blocks/ABRCSlabs.java | 2 +- .../antiblocksrechiseled/blocks/ABRCStairs.java | 2 +- .../antiblocksrechiseled/blocks/ABRCTemplate.java | 2 +- .../antiblocksrechiseled/blocks/ABRCWoolColors.java | 2 +- .../blocks/base/AntiPressurePlate.java | 6 +++--- .../blocks/base/AntiSlabBlock.java | 4 ++-- src/main/resources/fabric.mod.json | 6 +++--- 14 files changed, 29 insertions(+), 24 deletions(-) rename .github/workflows/{fabric.1.20.6.build.yml => fabric.1.21.build.yml} (95%) diff --git a/.github/workflows/fabric.1.20.6.build.yml b/.github/workflows/fabric.1.21.build.yml similarity index 95% rename from .github/workflows/fabric.1.20.6.build.yml rename to .github/workflows/fabric.1.21.build.yml index c177f4b..1d890b3 100644 --- a/.github/workflows/fabric.1.20.6.build.yml +++ b/.github/workflows/fabric.1.21.build.yml @@ -1,4 +1,4 @@ -name: Build & Release For Minecraft 1.20.6 - Fabric +name: Build & Release For Minecraft 1.21 - Fabric on: push: diff --git a/build.gradle b/build.gradle index fdba512..fef913a 100644 --- a/build.gradle +++ b/build.gradle @@ -84,8 +84,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { @@ -93,8 +92,8 @@ java { // if it is present. // If you remove this line, sources will not be generated. //withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } @@ -136,6 +135,9 @@ publishMods { requires { slug = 'fabric-api' } + optional { + slug = 'fusion-connected-textures' + } } modrinth { accessToken = providers.environmentVariable("MODRINTH_DEPLOY") @@ -144,5 +146,8 @@ publishMods { requires { slug = 'fabric-api' } + optional { + slug = 'fusion-connected-textures' + } } } diff --git a/gradle.properties b/gradle.properties index 743f6f9..e27cd04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.6 +minecraft_version=1.21 yarn_mappings=build.1 loader_version=0.15.11 -fabric_version=0.97.8 +fabric_version=0.100.1 # Mod Properties maven_group = net.manmaed @@ -15,7 +15,7 @@ archives_base_name = antiblocksrechiseled #Mod Stuff mod_name=AntiBlocksReChiseled -mod_version=0.9 +mod_version=0.10 #CurseForge Stuff curseforge_id=715567 diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/AntiBlocksReChiseled.java b/src/main/java/net/manmaed/antiblocksrechiseled/AntiBlocksReChiseled.java index 66d35b5..90065a5 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/AntiBlocksReChiseled.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/AntiBlocksReChiseled.java @@ -17,7 +17,7 @@ public class AntiBlocksReChiseled implements ModInitializer { public static final String MOD_ID = "antiblocksrechiseled"; - public static final RegistryKey itemGroup = RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier(MOD_ID, "item_group")); + public static final RegistryKey itemGroup = RegistryKey.of(RegistryKeys.ITEM_GROUP, Identifier.of(MOD_ID, "item_group")); @Override diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCBrightColors.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCBrightColors.java index dae6d31..d471df2 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCBrightColors.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCBrightColors.java @@ -113,6 +113,6 @@ private static void registerItem(String name, Item item) { ItemGroupEvents.modifyEntriesEvent(AntiBlocksReChiseled.itemGroup).register(entries -> entries.add(item)); } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCButtons.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCButtons.java index 78ee07c..59824d3 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCButtons.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCButtons.java @@ -128,6 +128,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCPressurePlates.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCPressurePlates.java index 9784fc7..af8e268 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCPressurePlates.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCPressurePlates.java @@ -129,6 +129,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCSlabs.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCSlabs.java index 719dff0..90b890f 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCSlabs.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCSlabs.java @@ -128,6 +128,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCStairs.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCStairs.java index 0c0541d..9c8b6de 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCStairs.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCStairs.java @@ -126,6 +126,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCTemplate.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCTemplate.java index 09cc93f..efced83 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCTemplate.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCTemplate.java @@ -26,6 +26,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCWoolColors.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCWoolColors.java index f37f059..3bcc93a 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCWoolColors.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/ABRCWoolColors.java @@ -156,6 +156,6 @@ private static void registerItem(String name, Item item) { } private static Identifier getId(String name) { - return new Identifier(AntiBlocksReChiseled.MOD_ID, name); + return Identifier.of(AntiBlocksReChiseled.MOD_ID, name); } } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiPressurePlate.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiPressurePlate.java index a51f860..0027a4c 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiPressurePlate.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiPressurePlate.java @@ -1,7 +1,7 @@ package net.manmaed.antiblocksrechiseled.blocks.base; import net.minecraft.block.*; -import net.minecraft.block.enums.Instrument; +import net.minecraft.block.enums.NoteBlockInstrument; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -21,13 +21,13 @@ public AntiPressurePlate() { super(BlockSetType.STONE ,Settings.create() .mapColor(MapColor.STONE_GRAY) .solid() - .instrument(Instrument.BASEDRUM) + .instrument(NoteBlockInstrument.BASEDRUM) .requiresTool() .noCollision() .strength(0.5F) .pistonBehavior(PistonBehavior.DESTROY) .luminance(light -> 15)); - this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(POWERED, false)); + this.setDefaultState((BlockState) ((BlockState) this.stateManager.getDefaultState()).with(POWERED, false)); this.activationRule = ActivationRule.PLAYERS; ; } diff --git a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiSlabBlock.java b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiSlabBlock.java index a2bd04c..36113f6 100644 --- a/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiSlabBlock.java +++ b/src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiSlabBlock.java @@ -2,13 +2,13 @@ import net.minecraft.block.MapColor; import net.minecraft.block.SlabBlock; -import net.minecraft.block.enums.Instrument; +import net.minecraft.block.enums.NoteBlockInstrument; public class AntiSlabBlock extends SlabBlock { public AntiSlabBlock() { super(Settings.create() .mapColor(MapColor.STONE_GRAY) - .instrument(Instrument.BASEDRUM) + .instrument(NoteBlockInstrument.BASEDRUM) .requiresTool() .strength(2.0F, 6.0F) .luminance(light -> 15)); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c2ad797..124b9d0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,9 +24,9 @@ }, "depends": { - "fabricloader": ">=0.15.0", + "fabricloader": ">=0.15.11", "fabric-api": "*", - "minecraft": "~1.20.3", - "java": ">=17" + "minecraft": "~1.21", + "java": ">=21" } }