Merge branch 'master' of github.com:EngineHub/CommandHelper

Author: LadyCailin

.github/workflows/maven-publish.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 2
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
     - name: Build with Maven
       run: sudo -- sh -c "export methodscript_run_llvm_integration_tests=1 && export PATH=$JAVA_HOME/bin:\$PATH && export JAVA_HOME=$JAVA_HOME && mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures"
@@ -24,23 +24,23 @@ jobs:
       methodscript_run_llvm_integration_tests: 1
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B clean package --file pom.xml -Pfail-on-test-failures
   build_mac:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       env:
         methodscript_run_llvm_integration_tests: 1
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures
@@ -53,10 +53,10 @@ jobs:
       packages: write
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/maven.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
     - name: Build with Maven
       run: sudo -- sh -c "export methodscript_run_llvm_integration_tests=1 && export PATH=$JAVA_HOME/bin:\$PATH && export JAVA_HOME=$JAVA_HOME && mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures"
@@ -25,10 +25,10 @@ jobs:
       methodscript_run_llvm_integration_tests: 1
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v2
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B clean package --file pom.xml -Pfail-on-test-failures

azure-pipelines.yml

@@ -9,20 +9,20 @@ pool:
 steps:
 - task: JavaToolInstaller@0
   inputs:
-    versionSpec: '21' 
+    versionSpec: '25' 
     jdkArchitectureOption: x64
     jdkSourceOption: 'AzureStorage'
     azureResourceManagerEndpoint: Azure Resource Manager OIDC
     azureStorageAccountName: methodscriptjdkbuilds
     azureContainerName: jdks
-    azureCommonVirtualFile: 'OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9.zip'
-    jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk21'
+    azureCommonVirtualFile: 'OpenJDK25U-jdk_x64_windows_hotspot_25.0.3_9.zip'
+    jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk25'
     cleanDestinationDirectory: true
 - task: Maven@4
   inputs:
     mavenPomFile: 'pom.xml'
     javaHomeOption: 'Path'
-    jdkDirectory: '$(agent.toolsDirectory)\jdk21\JAVA_HOME_21_X64_OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9_zip\jdk-21.0.3+9'
+    jdkDirectory: '$(agent.toolsDirectory)\jdk25\JAVA_HOME_25_X64_OpenJDK25U-jdk_x64_windows_hotspot_25.0.3_9_zip\jdk-25.0.3+9'
     jdkArchitectureOption: 'x64'
     publishJUnitResults: true
     testResultsFiles: '**/TEST-*.xml'

pom.xml

@@ -173,7 +173,7 @@
 		<dependency>
 			<groupId>io.papermc.paper</groupId>
 			<artifactId>paper-api</artifactId>
-			<version>1.21.11-R0.1-SNAPSHOT</version>
+			<version>[26.2.build,)</version>
 		</dependency>
 
 		<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->

src/main/java/com/laytonsmith/abstraction/MCParticleData.java

@@ -97,4 +97,22 @@ public MCColor color() {
 			return this.color;
 		}
 	}
+
+	public static class GeyserBase {
+		int waterBlocks;
+		float burstImpulseBase;
+
+		public GeyserBase(int waterBlocks, float burstImpulseBase) {
+			this.waterBlocks = waterBlocks;
+			this.burstImpulseBase = burstImpulseBase;
+		}
+
+		public int waterBlocks() {
+			return this.waterBlocks;
+		}
+
+		public float burstImpulseBase() {
+			return this.burstImpulseBase;
+		}
+	}
 }

src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java

@@ -1871,7 +1871,40 @@ public enum MCVanillaMaterial {
 
 		// 26.1 additions
 		GOLDEN_DANDELION(MCVersion.MC26_1),
-		POTTED_GOLDEN_DANDELION(MCVersion.MC26_1);
+		POTTED_GOLDEN_DANDELION(MCVersion.MC26_1),
+
+		// 26.2 additions
+		CHISELED_CINNABAR(MCVersion.MC26_2),
+		CHISELED_SULFUR(MCVersion.MC26_2),
+		CINNABAR(MCVersion.MC26_2),
+		CINNABAR_BRICK_SLAB(MCVersion.MC26_2),
+		CINNABAR_BRICK_STAIRS(MCVersion.MC26_2),
+		CINNABAR_BRICK_WALL(MCVersion.MC26_2),
+		CINNABAR_BRICKS(MCVersion.MC26_2),
+		CINNABAR_SLAB(MCVersion.MC26_2),
+		CINNABAR_STAIRS(MCVersion.MC26_2),
+		CINNABAR_WALL(MCVersion.MC26_2),
+		MUSIC_DISC_BOUNCE(MCVersion.MC26_2),
+		POLISHED_CINNABAR(MCVersion.MC26_2),
+		POLISHED_CINNABAR_SLAB(MCVersion.MC26_2),
+		POLISHED_CINNABAR_STAIRS(MCVersion.MC26_2),
+		POLISHED_CINNABAR_WALL(MCVersion.MC26_2),
+		POLISHED_SULFUR(MCVersion.MC26_2),
+		POLISHED_SULFUR_SLAB(MCVersion.MC26_2),
+		POLISHED_SULFUR_STAIRS(MCVersion.MC26_2),
+		POLISHED_SULFUR_WALL(MCVersion.MC26_2),
+		POTENT_SULFUR(MCVersion.MC26_2),
+		SULFUR(MCVersion.MC26_2),
+		SULFUR_CUBE_BUCKET(MCVersion.MC26_2),
+		SULFUR_CUBE_SPAWN_EGG(MCVersion.MC26_2),
+		SULFUR_BRICK_SLAB(MCVersion.MC26_2),
+		SULFUR_BRICK_STAIRS(MCVersion.MC26_2),
+		SULFUR_BRICK_WALL(MCVersion.MC26_2),
+		SULFUR_BRICKS(MCVersion.MC26_2),
+		SULFUR_SLAB(MCVersion.MC26_2),
+		SULFUR_SPIKE(MCVersion.MC26_2),
+		SULFUR_STAIRS(MCVersion.MC26_2),
+		SULFUR_WALL(MCVersion.MC26_2);
 
 		private final MCVersion since;
 		private final MCVersion until;

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java

@@ -39,6 +39,7 @@
 import com.laytonsmith.abstraction.enums.MCWorldType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCBiomeType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDifficulty;
+import com.laytonsmith.abstraction.enums.bukkit.BukkitMCEffect;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCEntityType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCParticle;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCSound;
@@ -319,13 +320,13 @@ public boolean generateTree(MCLocation l, MCTreeType treeType) {
 	}
 
 	@Override
-	public void playEffect(MCLocation l, MCEffect mCEffect, int data, int radius) {
-		w.playEffect(((BukkitMCLocation) l).l, Effect.valueOf(mCEffect.name()), data, radius);
+	public void playEffect(MCLocation l, MCEffect mcEffect, int data, int radius) {
+		w.playEffect(((BukkitMCLocation) l).l, BukkitMCEffect.getConvertor().getConcreteEnum(mcEffect), data, radius);
 	}
 
 	@Override
 	public void playEffect(MCLocation l, MCEffect mcEffect, Object data, int radius) {
-		Effect effect = Effect.valueOf(mcEffect.name());
+		Effect effect = BukkitMCEffect.getConvertor().getConcreteEnum(mcEffect);
 		switch(mcEffect) {
 			case RECORD_PLAY:
 			case STEP_SOUND:
@@ -336,6 +337,7 @@ public void playEffect(MCLocation l, MCEffect mcEffect, Object data, int radius)
 				w.playEffect((Location) l.getHandle(), effect, BlockFace.valueOf(((MCBlockFace) data).name()), radius);
 				return;
 			case PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE:
+			case DESTROY_BLOCK:
 				w.playEffect((Location) l.getHandle(), effect, ((MCBlockData) data).getHandle(), radius);
 				return;
 		}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorldCreator.java

@@ -2,6 +2,7 @@
 
 import com.laytonsmith.abstraction.MCWorld;
 import com.laytonsmith.abstraction.MCWorldCreator;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.MCWorldEnvironment;
 import com.laytonsmith.abstraction.enums.MCWorldType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCWorldEnvironment;
@@ -26,7 +27,8 @@ public BukkitMCWorldCreator(String name) {
 	@Override
 	public MCWorld createWorld() {
 		World w = creator.createWorld();
-		if(w != null && w.getEnvironment() == Environment.NORMAL) {
+		if(w != null && w.getEnvironment() == Environment.NORMAL
+				&& Static.getServer().getMinecraftVersion().lt(MCVersion.MC26_1)) {
 			File nether = new File(w.getWorldFolder(), "DIM-1");
 			if(nether.exists()) {
 				Static.getLogger().log(Level.WARNING, "Loaded " + w.getName() + " world with overworld (NORMAL)"
@@ -44,6 +46,9 @@ public MCWorld createWorld() {
 	@Override
 	public MCWorldCreator type(MCWorldType type) {
 		WorldType wt = BukkitMCWorldType.getConvertor().getConcreteEnum(type);
+		if(wt == null) {
+			throw new IllegalArgumentException(type.name() + " unsupported on this version.");
+		}
 		creator.type(wt);
 		return this;
 	}

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java

@@ -693,7 +693,7 @@ public void playSound(MCEntity ent, MCSound sound, MCSoundCategory category, flo
 		if(cat == null) {
 			cat = SoundCategory.MASTER;
 		}
-		if(category == null) {
+		if(seed == null) {
 			p.playSound((Entity) ent.getHandle(), ((BukkitMCSound) sound).getConcrete(), cat, volume, pitch);
 		} else {
 			p.playSound((Entity) ent.getHandle(), ((BukkitMCSound) sound).getConcrete(), cat, volume, pitch, seed);

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCSulfurCube.java

@@ -0,0 +1,22 @@
+package com.laytonsmith.abstraction.bukkit.entities;
+
+import com.laytonsmith.abstraction.entities.MCSulfurCube;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.SulfurCube;
+
+public class BukkitMCSulfurCube extends BukkitMCLivingEntity implements MCSulfurCube {
+
+	public BukkitMCSulfurCube(Entity sulfurCube) {
+		super(sulfurCube);
+	}
+
+	@Override
+	public int getSize() {
+		return ((SulfurCube) getHandle()).getSize();
+	}
+
+	@Override
+	public void setSize(int size) {
+		((SulfurCube) getHandle()).setSize(size);
+	}
+}