Manual Cherry-pick needed: 5ad03909fb2b73b1ec4474929053347c040792d8

build.gradle

@@ -1,8 +1,9 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
-    id 'com.matthewprenger.cursegradle' version '1.+'
+    id "architectury-plugin" version "3.5-SNAPSHOT"
+    id "dev.architectury.loom-no-remap" version "1.14-SNAPSHOT" apply false
+    id 'com.matthewprenger.cursegradle' version '1.5.0-SNAPSHOT' // FORK: maven.pitan76.net
     id "com.modrinth.minotaur" version "2.+"
+    id "com.gradleup.shadow" version "9.4.0"
 }
 
 architectury {
@@ -26,18 +27,15 @@ allprojects {
 
 subprojects {
     apply plugin: "architectury-plugin"
-    apply plugin: "dev.architectury.loom"
+    apply plugin: "dev.architectury.loom-no-remap"
     apply plugin: "maven-publish"
     apply plugin: "com.modrinth.minotaur"
     apply plugin: "com.matthewprenger.cursegradle"
+    apply plugin: "com.gradleup.shadow"
 
     base {
         // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
-        archivesBaseName = info.archives_base_name
-    }
-
-    loom {
-        silentMojangMappingsLicense()
+        archivesName = info.archives_base_name
     }
 
     repositories {
@@ -48,14 +46,6 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        // mappings loom.officialMojangMappings()
-        // The following line declares the yarn mappings you may select this one as well.
-        //mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
-        mappings loom.layered() {
-            it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
-            it.mappings file("../mappings/121-1fix.tiny")
-        }
 
         // https://mvnrepository.com/artifact/org.yaml/snakeyaml
         implementation 'org.yaml:snakeyaml:2.0'
@@ -80,20 +70,21 @@ subprojects {
                     if (modLoader == "neoforge") {
                         addGameVersion "NeoForge"
                     }
-                    addGameVersion '1.21.11'
+                    addGameVersion "26.1"
+                    addGameVersion "26.1.1"
+                    addGameVersion "26.1.2"
 
                     relations {
                         if (modLoader == "fabric") {
                             requiredDependency "fabric-api"
                         }
 
-                        requiredDependency 'architectury-api'
                         embeddedLibrary 'cloth-config'
                         embeddedLibrary 'compatdatapacks'
                         embeddedLibrary 'legacyitemmodels'
                     }
 
-                    mainArtifact(tasks.remapJar)
+                    mainArtifact(shadowJar)
                 }
                 options {
                     forgeGradleIntegration = false
@@ -102,37 +93,38 @@ subprojects {
 
         }
 
-        if (System.getenv("MODRINTH_TOKEN") != null) {
-            modrinth {
-                token = System.getenv("MODRINTH_TOKEN")
-                projectId = 'mcpitanlibarch'
-                versionNumber = info.mod_version + "-" + modLoader
-                gameVersions = ['1.21.11']
-                versionType = 'beta'
-                uploadFile = tasks.remapJar
-                changelog = info.changelog
-                loaders = [modLoader]
-                dependencies {
-                    if (modLoader == "fabric") {
-                        required.project "fabric-api" // Fabric API
+        afterEvaluate {
+            if (System.getenv("MODRINTH_TOKEN") != null) {
+                modrinth {
+                    token = System.getenv("MODRINTH_TOKEN")
+                    projectId = 'mcpitanlibarch'
+                    versionNumber = info.mod_version + "-" + modLoader + "-" + project.minecraft_version
+                    gameVersions = ["26.1", "26.1.1", "26.1.2"]
+                    versionType = 'beta'
+                    uploadFile = tasks.named("shadowJar").get().archiveFile.get().asFile
+                    changelog = info.changelog
+                    loaders = [modLoader]
+                    dependencies {
+                        if (modLoader == "fabric") {
+                            required.project "fabric-api" // Fabric API
+                        }
+                        embedded.project "cloth-config"
+                        embedded.project "compatdatapacks"
+                        embedded.project "legacyitemmodels"
                     }
-                    required.project "architectury-api"
-                    embedded.project "cloth-config"
-                    embedded.project "compatdatapacks"
-                    embedded.project "legacyitemmodels"
                 }
             }
         }
     }
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release = 21
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        options.release = 25
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
     }
 
     java {
         withSourcesJar()
     }
-}
+}

common/build.gradle

@@ -1,9 +1,5 @@
 dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 }
 
 architectury {
@@ -14,6 +10,14 @@ loom {
     accessWidenerPath = file("src/main/resources/mcpitanlib.accesswidener")
 }
 
+tasks.shadowJar {
+    enabled = false
+}
+
+tasks.jar {
+    setArchiveClassifier(null)
+}
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {

common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java

@@ -7,7 +7,7 @@
 
 package net.pitan76.mcpitanlib;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 import net.pitan76.easyapi.config.Config;
 import net.pitan76.easyapi.config.JsonConfig;
 import net.pitan76.mcpitanlib.api.registry.CompatRegistry;

common/src/main/java/net/pitan76/mcpitanlib/api/CommonModInitializer.java

@@ -1,6 +1,6 @@
 package net.pitan76.mcpitanlib.api;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2;
 import net.pitan76.mcpitanlib.api.util.CompatIdentifier;
 import net.pitan76.mcpitanlib.api.util.IdentifierUtil;

common/src/main/java/net/pitan76/mcpitanlib/api/block/BlockItemByExtendBlock1215.java

@@ -1,11 +1,13 @@
 package net.pitan76.mcpitanlib.api.block;
 
-import net.minecraft.block.Block;
-import net.minecraft.component.type.TooltipDisplayComponent;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.tooltip.TooltipType;
-import net.minecraft.text.Text;
+import net.minecraft.world.item.Item.Properties;
+import net.minecraft.world.item.Item.TooltipContext;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.item.component.TooltipDisplay;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.network.chat.Component;
 import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent;
 
 import java.util.function.Consumer;
@@ -15,18 +17,18 @@ public class BlockItemByExtendBlock1215 extends BlockItem {
     private ExtendBlock block;
     private ExtendBlockProvider provider;
 
-    public BlockItemByExtendBlock1215(ExtendBlock block, Settings settings) {
+    public BlockItemByExtendBlock1215(ExtendBlock block, Properties settings) {
         super(block, settings);
         this.block = block;
     }
 
-    public BlockItemByExtendBlock1215(ExtendBlockProvider provider, Settings settings) {
+    public BlockItemByExtendBlock1215(ExtendBlockProvider provider, Properties settings) {
         super((Block) provider, settings);
         this.provider = provider;
     }
 
     @Override
-    public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer<Text> textConsumer, TooltipType type) {
+    public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay displayComponent, Consumer<Component> textConsumer, TooltipFlag type) {
         if (block != null)
             block.appendTooltip(new ItemAppendTooltipEvent(stack, context, displayComponent, textConsumer, type));
 

common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlockRenderType.java

@@ -1,25 +1,25 @@
 package net.pitan76.mcpitanlib.api.block;
 
-import net.minecraft.block.BlockRenderType;
+import net.minecraft.world.level.block.RenderShape;
 
 public class CompatBlockRenderType {
 
-    public static final CompatBlockRenderType MODEL = of(BlockRenderType.MODEL);
-    public static final CompatBlockRenderType ENTITYBLOCK_ANIMATED = of(BlockRenderType.MODEL);
-    public static final CompatBlockRenderType INVISIBLE = of(BlockRenderType.INVISIBLE);
+    public static final CompatBlockRenderType MODEL = of(RenderShape.MODEL);
+    public static final CompatBlockRenderType ENTITYBLOCK_ANIMATED = of(RenderShape.MODEL);
+    public static final CompatBlockRenderType INVISIBLE = of(RenderShape.INVISIBLE);
 
     @Deprecated
-    public final BlockRenderType renderType;
+    public final RenderShape renderType;
 
-    public CompatBlockRenderType(BlockRenderType renderType) {
+    public CompatBlockRenderType(RenderShape renderType) {
         this.renderType = renderType;
     }
 
-    public static CompatBlockRenderType of(BlockRenderType renderType) {
+    public static CompatBlockRenderType of(RenderShape renderType) {
         return new CompatBlockRenderType(renderType);
     }
 
-    public BlockRenderType toMinecraft() {
+    public RenderShape toMinecraft() {
         return renderType;
     }
 }

common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java

@@ -1,7 +1,7 @@
 package net.pitan76.mcpitanlib.api.block;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 
 public class CompatBlocks {
     public static final Block AIR = Blocks.AIR;

common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java

@@ -1,11 +1,12 @@
 package net.pitan76.mcpitanlib.api.block;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.block.ChestBlock;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.block.entity.ChestBlockEntity;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.ChestBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.entity.ChestBlockEntity;
+import net.minecraft.core.BlockPos;
 import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider;
 import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings;
 import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent;
@@ -14,7 +15,7 @@
 import java.util.function.Supplier;
 
 public class CompatChestBlock extends ChestBlock implements CompatBlockProvider {
-    public CompatChestBlock(Settings settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> supplier) {
+    public CompatChestBlock(Properties settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> supplier) {
         super(supplier, CompatSoundEvents.BLOCK_CHEST_OPEN.get(), CompatSoundEvents.BLOCK_CHEST_CLOSE.get(), settings);
     }
 
@@ -29,15 +30,15 @@ public CompatChestBlock(CompatibleBlockSettings settings, Supplier<BlockEntityTy
      */
     @Deprecated
     @Override
-    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+    public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
         return createBlockEntity(new TileCreateEvent(pos, state));
     }
 
     /**
      * @see ExtendBlockEntityProvider#createBlockEntity(TileCreateEvent)
      */
     public BlockEntity createBlockEntity(TileCreateEvent event) {
-        return super.createBlockEntity(event.getBlockPos(), event.getBlockState());
+        return super.newBlockEntity(event.getBlockPos(), event.getBlockState());
     }
 
     @Override

common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java

@@ -1,12 +1,13 @@
 package net.pitan76.mcpitanlib.api.block;
 
 import com.mojang.serialization.MapCodec;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.PillarBlock;
-import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.state.StateManager;
-import net.minecraft.util.math.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.core.Direction;
 import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider;
 import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings;
 import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs;
@@ -15,9 +16,9 @@
 import net.pitan76.mcpitanlib.api.state.property.EnumProperty;
 import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec;
 
-public class CompatPillarBlock extends PillarBlock implements CompatBlockProvider {
+public class CompatPillarBlock extends RotatedPillarBlock implements CompatBlockProvider {
 
-    public static final EnumProperty<Direction.Axis> AXIS = CompatProperties.of(PillarBlock.AXIS);
+    public static final EnumProperty<Direction.Axis> AXIS = CompatProperties.of(RotatedPillarBlock.AXIS);
 
     public CompatibleBlockSettings settings;
 
@@ -26,7 +27,7 @@ public CompatibleBlockSettings getCompatSettings() {
         return settings;
     }
 
-    public CompatPillarBlock(Settings settings) {
+    public CompatPillarBlock(Properties settings) {
         super(settings);
     }
 
@@ -36,22 +37,22 @@ public CompatPillarBlock(CompatibleBlockSettings settings) {
     }
 
     public void appendProperties(AppendPropertiesArgs args) {
-        super.appendProperties(args.builder);
+        super.createBlockStateDefinition(args.builder);
     }
 
     public BlockState getPlacementState(PlacementStateArgs args) {
-        return super.getPlacementState(args.ctx);
+        return super.getStateForPlacement(args.ctx);
     }
 
     @Deprecated
     @Override
-    public void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+    public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
         appendProperties(new AppendPropertiesArgs(builder));
     }
 
     @Deprecated
     @Override
-    public BlockState getPlacementState(ItemPlacementContext ctx) {
+    public BlockState getStateForPlacement(BlockPlaceContext ctx) {
         return getPlacementState(new PlacementStateArgs(ctx));
     }
 
@@ -70,11 +71,11 @@ public BlockState getPlacementState(PlacementStateArgs args, Options options) {
 
     @Deprecated
     @Override
-    public MapCodec<? extends PillarBlock> getCodec() {
+    public MapCodec<? extends RotatedPillarBlock> codec() {
         return getCompatCodec().getCodec();
     }
 
-    public CompatMapCodec<? extends PillarBlock> getCompatCodec() {
-        return CompatMapCodec.of(super.getCodec());
+    public CompatMapCodec<? extends RotatedPillarBlock> getCompatCodec() {
+        return CompatMapCodec.of(super.codec());
     }
 }