更新依賴並新增多個區塊數據類別

.github/workflows/maven.yml

@@ -28,4 +28,9 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
-        run: mvn -B package --file pom.xml
+        run: mvn -B package --file pom.xml
+               - name: Upload JAR
+               uses: actions/upload-artifact@v4
+               with:
+                 name: DebugStickPro
+                 path: target/*.jar

pom.xml

@@ -83,23 +83,23 @@
             <id>codemc-snapshots</id>
             <url>https://repo.codemc.io/repository/maven-snapshots/</url>
         </repository>
-        <repository>
-            <id>evoke-snapshots</id>
-            <name>EvokeGames Maven</name>
-            <url>https://maven.evokegames.gg/snapshots</url>
-        </repository>
         <repository>
             <id>twme-repo-releases</id>
             <name>TWME Repository</name>
             <url>https://repo.twme.dev/releases</url>
         </repository>
+        <repository>
+            <id>twme-repo-snapshots</id>
+            <name>TWME Repository</name>
+            <url>https://repo.twme.dev/snapshots</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21.8-R0.1-SNAPSHOT</version>
+            <version>1.21.10-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -121,9 +121,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>me.tofaa.entitylib</groupId>
+            <groupId>io.github.tofaa2</groupId>
             <artifactId>spigot</artifactId>
-            <version>+598d71f-SNAPSHOT</version>
+            <version>+eba7ada-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>dev.twme</groupId>

src/main/java/dev/twme/debugstickpro/blockdatautil/BlockDataSeparater.java

@@ -771,6 +771,37 @@ public static ArrayList<SubBlockData> separate(BlockData blockData) {
             blockDataList.add(waterlogged);
         }
 
+        // 1.21.9
+        if (isValidMaterial("copper_chain")) {
+            if (blockData instanceof CopperGolemStatue) {
+                SubBlockData copperGolemStatuePose = new CopperGolemStatuePoseData(blockData);
+                blockDataList.add(copperGolemStatuePose);
+            }
+            if (blockData instanceof SideChaining) {
+                SubBlockData sideChaining = new SideChainingData(blockData);
+                blockDataList.add(sideChaining);
+            }
+        }
+
+        if (isValidMaterial("leaf_litter")) {
+            if (blockData instanceof Segmentable) {
+                SubBlockData segmentable = new SegmentableData(blockData);
+                blockDataList.add(segmentable);
+            }
+
+            if (blockData instanceof TestBlock) {
+                SubBlockData testBlock = new TestBlockData(blockData);
+                blockDataList.add(testBlock);
+            }
+        }
+
+        if (isValidMaterial("dried_ghast")) {
+            if (blockData instanceof DriedGhast) {
+                SubBlockData driedGhastState = new DriedGhastHydrationData(blockData);
+                blockDataList.add(driedGhastState);
+            }
+        }
+
         blockDataList = filterSubBlockData(blockDataList);
         cache.put(blockData.getMaterial(), blockDataList);
 

src/main/java/dev/twme/debugstickpro/blockdatautil/subdata/CopperGolemStatuePoseData.java

@@ -0,0 +1,66 @@
+package dev.twme.debugstickpro.blockdatautil.subdata;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.CopperGolemStatue;
+
+import dev.twme.debugstickpro.blockdatautil.SubBlockData;
+import dev.twme.debugstickpro.localization.Lang;
+
+public class CopperGolemStatuePoseData extends SubBlockData {
+    private CopperGolemStatue.Pose pose;
+
+    public CopperGolemStatuePoseData(BlockData blockData) {
+        this.blockData = blockData;
+        this.pose = ((CopperGolemStatue) blockData).getCopperGolemPose();
+    }
+
+    @Override
+    public String dataName() {
+        return Lang.DataKeyName.CopperGolemStatuePoseDataName;
+    }
+
+    @Override
+    public String getDataAsString() {
+        return pose.name();
+    }
+
+    @Override
+    public SubBlockData nextData() {
+        CopperGolemStatue copperGolemStatue = ((CopperGolemStatue) blockData);
+        List<CopperGolemStatue.Pose> poses = Arrays.stream(CopperGolemStatue.Pose.values()).toList();
+        if (poses.indexOf(pose) == poses.size() - 1) {
+            pose = poses.getFirst();
+        } else {
+            pose = poses.get(poses.indexOf(pose) + 1);
+        }
+        copperGolemStatue.setCopperGolemPose(pose);
+        return this;
+    }
+
+    @Override
+    public SubBlockData previousData() {
+        CopperGolemStatue copperGolemStatue = ((CopperGolemStatue) blockData);
+        List<CopperGolemStatue.Pose> poses = Arrays.stream(CopperGolemStatue.Pose.values()).toList();
+        if (poses.indexOf(pose) == 0) {
+            pose = poses.getLast();
+        } else {
+            pose = poses.get(poses.indexOf(pose) - 1);
+        }
+        copperGolemStatue.setCopperGolemPose(pose);
+        return this;
+    }
+
+    @Override
+    public BlockData copyTo(BlockData blockData) {
+        ((CopperGolemStatue) blockData).setCopperGolemPose(pose);
+        return blockData;
+    }
+
+    @Override
+    public SubBlockData fromBlockData(BlockData blockData) {
+        return new CopperGolemStatuePoseData(blockData);
+    }
+}

src/main/java/dev/twme/debugstickpro/blockdatautil/subdata/DriedGhastHydrationData.java

@@ -0,0 +1,61 @@
+package dev.twme.debugstickpro.blockdatautil.subdata;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.DriedGhast;
+
+import dev.twme.debugstickpro.blockdatautil.SubBlockData;
+import dev.twme.debugstickpro.localization.Lang;
+
+public class DriedGhastHydrationData extends SubBlockData {
+    private int hydration;
+
+    public DriedGhastHydrationData(BlockData blockData) {
+        this.blockData = blockData;
+        this.hydration = ((DriedGhast) blockData).getHydration();
+    }
+
+    @Override
+    public String dataName() {
+        return Lang.DataKeyName.DriedGhastHydrationDataName;
+    }
+
+    @Override
+    public String getDataAsString() {
+        return String.valueOf(hydration);
+    }
+
+    @Override
+    public SubBlockData nextData() {
+        DriedGhast driedGhast = ((DriedGhast) blockData);
+        if (hydration >= driedGhast.getMaximumHydration()) {
+            hydration = 0;
+        } else {
+            hydration++;
+        }
+        driedGhast.setHydration(hydration);
+        return this;
+    }
+
+    @Override
+    public SubBlockData previousData() {
+        DriedGhast driedGhast = ((DriedGhast) blockData);
+        if (hydration <= 0) {
+            hydration = driedGhast.getMaximumHydration();
+        } else {
+            hydration--;
+        }
+        driedGhast.setHydration(hydration);
+        return this;
+    }
+
+    @Override
+    public BlockData copyTo(BlockData blockData) {
+        ((DriedGhast) blockData).setHydration(hydration);
+        return blockData;
+    }
+
+    @Override
+    public SubBlockData fromBlockData(BlockData blockData) {
+        return new DriedGhastHydrationData(blockData);
+    }
+}

src/main/java/dev/twme/debugstickpro/blockdatautil/subdata/SegmentableData.java

@@ -0,0 +1,61 @@
+package dev.twme.debugstickpro.blockdatautil.subdata;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Segmentable;
+
+import dev.twme.debugstickpro.blockdatautil.SubBlockData;
+import dev.twme.debugstickpro.localization.Lang;
+
+public class SegmentableData extends SubBlockData {
+    private int segmentAmount;
+
+    public SegmentableData(BlockData blockData) {
+        this.blockData = blockData;
+        this.segmentAmount = ((Segmentable) blockData).getSegmentAmount();
+    }
+
+    @Override
+    public String dataName() {
+        return Lang.DataKeyName.SegmentableDataName;
+    }
+
+    @Override
+    public String getDataAsString() {
+        return String.valueOf(segmentAmount);
+    }
+
+    @Override
+    public SubBlockData nextData() {
+        Segmentable segmentable = ((Segmentable) blockData);
+        if (segmentAmount >= segmentable.getMaximumSegmentAmount()) {
+            segmentAmount = segmentable.getMinimumSegmentAmount();
+        } else {
+            segmentAmount++;
+        }
+        segmentable.setSegmentAmount(segmentAmount);
+        return this;
+    }
+
+    @Override
+    public SubBlockData previousData() {
+        Segmentable segmentable = ((Segmentable) blockData);
+        if (segmentAmount <= segmentable.getMinimumSegmentAmount()) {
+            segmentAmount = segmentable.getMaximumSegmentAmount();
+        } else {
+            segmentAmount--;
+        }
+        segmentable.setSegmentAmount(segmentAmount);
+        return this;
+    }
+
+    @Override
+    public BlockData copyTo(BlockData blockData) {
+        ((Segmentable) blockData).setSegmentAmount(segmentAmount);
+        return blockData;
+    }
+
+    @Override
+    public SubBlockData fromBlockData(BlockData blockData) {
+        return new SegmentableData(blockData);
+    }
+}

src/main/java/dev/twme/debugstickpro/blockdatautil/subdata/SideChainingData.java

@@ -0,0 +1,66 @@
+package dev.twme.debugstickpro.blockdatautil.subdata;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.SideChaining;
+
+import dev.twme.debugstickpro.blockdatautil.SubBlockData;
+import dev.twme.debugstickpro.localization.Lang;
+
+public class SideChainingData extends SubBlockData {
+    private SideChaining.ChainPart chainPart;
+
+    public SideChainingData(BlockData blockData) {
+        this.blockData = blockData;
+        this.chainPart = ((SideChaining) blockData).getSideChain();
+    }
+
+    @Override
+    public String dataName() {
+        return Lang.DataKeyName.SideChainingDataName;
+    }
+
+    @Override
+    public String getDataAsString() {
+        return chainPart.name();
+    }
+
+    @Override
+    public SubBlockData nextData() {
+        List<SideChaining.ChainPart> chainParts = Arrays.asList(SideChaining.ChainPart.values());
+        int index = chainParts.indexOf(chainPart);
+        if (index >= chainParts.size() - 1) {
+            ((SideChaining) blockData).setSideChain(chainParts.getFirst());
+        } else {
+            ((SideChaining) blockData).setSideChain(chainParts.get(index + 1));
+        }
+        this.chainPart = ((SideChaining) blockData).getSideChain();
+        return this;
+    }
+
+    @Override
+    public SubBlockData previousData() {
+        List<SideChaining.ChainPart> chainParts = Arrays.asList(SideChaining.ChainPart.values());
+        int index = chainParts.indexOf(chainPart);
+        if (index <= 0) {
+            ((SideChaining) blockData).setSideChain(chainParts.getLast());
+        } else {
+            ((SideChaining) blockData).setSideChain(chainParts.get(index - 1));
+        }
+        this.chainPart = ((SideChaining) blockData).getSideChain();
+        return this;
+    }
+
+    @Override
+    public BlockData copyTo(BlockData blockData) {
+        ((SideChaining) blockData).setSideChain(chainPart);
+        return blockData;
+    }
+
+    @Override
+    public SubBlockData fromBlockData(BlockData blockData) {
+        return new SideChainingData(blockData);
+    }
+}