Merge pull request #69 from PimvanderLoos/feat/mc26.1

Add support for MC 26.1

Author: PimvanderLoos

.github/nms-groups.yml

@@ -41,3 +41,6 @@ java21:
   - "1.21.8"  # 1_21_R5
   - "1.21.10" # 1_21_R6
   - "1.21.11" # 1_21_R7
+
+java25:
+  - "26.1.1" # 26_1_R1

.github/workflows/build-nms.yml

@@ -47,7 +47,7 @@ jobs:
           GROUPS_FILE: ${{ inputs.groups-file }}
         run: |
           import json, yaml, os
-          versions = {"java8": 8, "java16": 16, "java17": 17, "java21": 21}
+          versions = {"java8": 8, "java16": 16, "java17": 17, "java21": 21, "java25": 25}
           with open(os.environ["GROUPS_FILE"], encoding="utf-8") as fh:
               groups = yaml.safe_load(fh) or {}
           include = []

.github/workflows/build.yml

@@ -32,11 +32,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
           cache: maven
 
       - name: Restore NMS Maven cache

.github/workflows/release.yml

@@ -87,11 +87,11 @@ jobs:
           chmod +x ~/bin/gpg-loopback
           git config --global gpg.program "$HOME/bin/gpg-loopback"
 
-      - name: Set up JDK 21 + GPG
+      - name: Set up JDK 25 + GPG
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
           cache: maven
           gpg-private-key: ${{ secrets.MAVEN_GPG_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE

NEXT_RELEASE_CHANGELOG.md

@@ -0,0 +1 @@
+- Add support for Minecraft 26.1

core/pom.xml

@@ -233,6 +233,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>nl.pim16aap2.BigDoors</groupId>
+            <artifactId>v26_R1</artifactId>
+            <version>0.1.8.66-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>${dependency.xseries.groupid}</groupId>
             <artifactId>XSeries</artifactId>

core/src/main/java/nl/pim16aap2/bigDoors/BigDoors.java

@@ -15,6 +15,7 @@
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactoryProvider_V1_21_R5;
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactoryProvider_V1_21_R6;
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactoryProvider_V1_21_R7;
+import nl.pim16aap2.bigDoors.NMS.FallingBlockFactoryProvider_V26_R1;
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactory_V1_11_R1;
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactory_V1_12_R1;
 import nl.pim16aap2.bigDoors.NMS.FallingBlockFactory_V1_13_R1;
@@ -781,6 +782,7 @@ public static boolean isOnFlattenedVersion()
     }
 
     // Check + initialize for the correct version of Minecraft.
+    @SuppressWarnings("SwitchStatementWithTooFewBranches")
     private @Nullable FallingBlockFactory createFallingBlockFactory()
         throws Exception
     {
@@ -913,13 +915,30 @@ public static boolean isOnFlattenedVersion()
                     case 11:
                         return FallingBlockFactoryProvider_V1_21_R7.getFactory();
                 }
+        }
 
-            default:
-                logger.severe("Unsupported version of Minecraft: " + SERVER_VERSION);
-                if (config.allowCodeGeneration())
-                    return FallbackGeneratorManager.getFallingBlockFactory();
-                return null;
+        switch (SERVER_VERSION.getMajor())
+        {
+            case 26:
+            {
+                switch (SERVER_VERSION.getMinor())
+                {
+                    case 1:
+                        switch (SERVER_VERSION.getPatch())
+                    {
+                        case 0:
+                        case 1:
+                            return FallingBlockFactoryProvider_V26_R1.getFactory();
+                    }
+                }
+            }
         }
+
+        logger.severe("Unsupported version of Minecraft: " + SERVER_VERSION);
+        if (config.allowCodeGeneration())
+            return FallbackGeneratorManager.getFallingBlockFactory();
+
+        return null;
     }
 
     private void overrideVersion()

core/src/main/java/nl/pim16aap2/bigDoors/codegeneration/NMSBlockClassGenerator.java

@@ -242,21 +242,27 @@ private DynamicType.Builder<?> addRotateBlockUpDownMethodNorthSouth(DynamicType.
     {
         final Object blockRotatableAxis = fieldBlockRotatableAxis.get(null);
 
-        final MethodCall getCurrentAxis = (MethodCall) invoke(methodEnumOrdinal)
-            .onMethodCall((MethodCall) invoke(methodGetIBlockDataHolderState).onField(FIELD_BLOCK_DATA)
-                                                                             .with(blockRotatableAxis)
-                                                                             .withAssigner(Assigner.DEFAULT,
-                                                                                           Assigner.Typing.DYNAMIC))
-            .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
-
-        final MethodCall getNewAxis = (MethodCall) invoke(named(METHOD_ROTATE_UP_DOWN_NS_IMPL))
-            .withArgument(0).withMethodCall(getCurrentAxis).withField(FIELD_AXES_VALUES)
-            .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
+        final MethodCall getCurrentAxis = (MethodCall)
+            invoke(methodEnumOrdinal)
+                .onMethodCall((MethodCall) invoke(methodGetIBlockDataHolderState)
+                    .onField(FIELD_BLOCK_DATA)
+                    .with(blockRotatableAxis)
+                    .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC))
+                .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
+
+        final MethodCall getNewAxis = (MethodCall)
+            invoke(named(METHOD_ROTATE_UP_DOWN_NS_IMPL))
+                .withArgument(0)
+                .withMethodCall(getCurrentAxis)
+                .withField(FIELD_AXES_VALUES)
+                .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
 
         final MethodCall setNewAxis = (MethodCall)
-            invoke(methodSetIBlockDataHolderState).onField(FIELD_BLOCK_DATA).with(blockRotatableAxis)
-                                                  .withMethodCall(getNewAxis)
-                                                  .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
+            invoke(methodSetIBlockDataHolderState)
+                .onField(FIELD_BLOCK_DATA)
+                .with(blockRotatableAxis)
+                .withMethodCall(getNewAxis)
+                .withAssigner(Assigner.DEFAULT, Assigner.Typing.DYNAMIC);
 
         builder = builder
             .define(METHOD_ROTATE_UP_DOWN_NS)