Merge remote-tracking branch 'origin/master' into changelogprep

Author: LadyCailin

checkstyle_suppressions.xml

@@ -16,6 +16,8 @@
 	<!-- Ignore type name check for package "com.laytonsmith.core.events drivers" since event driver classes use a different format -->
 	<suppress checks="TypeName" files="com[\\/]laytonsmith[\\/]core[\\/]events[\\/]drivers.*\.java$"/>
 
+	<!-- Ignore bStats, reformatting is not allowed -->
+	<suppress checks=".*" files="com[\\/]laytonsmith[\\/]commandhelper[\\/]Metrics.java$"/>
 
 	<!-- It's too difficult to manage checkstyle for half generated files, so just exclude them. -->
 	<suppress checks=".*" files="com[\\/]laytonsmith[\\/]tools[\\/]docgen[\\/]localization[\\/]LocalizationUI.java$"/>

pom.xml

@@ -175,7 +175,7 @@
 			<!-- GPL -->
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.17-R0.1-SNAPSHOT</version>
+			<version>1.19-R0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->
@@ -258,7 +258,7 @@
 			<!-- Apache 2.0 -->
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.26</version>
+			<version>1.32</version>
 		</dependency>
 
 		<!-- Apache commons IO -->
@@ -382,7 +382,7 @@
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
 			<artifactId>org.eclipse.lsp4j</artifactId>
-			<version>0.12.0</version>
+			<version>0.13.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
@@ -927,12 +927,6 @@
 										<exclude>META-INF/**</exclude>
 									</excludes>
 								</filter>
-								<filter>
-									<artifact>org.spigotmc:spigot-api:jar:*</artifact>
-									<includes>
-										<include>org/bukkit/Material.class</include>
-									</includes>
-								</filter>
 							</filters>
 						</configuration>
 					</execution>

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassMirror/ClassMirror.java

@@ -507,7 +507,7 @@ public boolean directlyExtendsFrom(Class<?> superClass) {
 			}
 		}
 		String name = superClass.getName().replace('.', '/');
-		if(info.superClass.equals(name)) {
+		if(name.equals(info.superClass)) {
 			return true;
 		}
 		for(String in : info.interfaces) {

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/DynamicEnum.java

@@ -5,7 +5,7 @@
  */
 public abstract class DynamicEnum<Abstracted extends Enum, Concrete> {
 
-	protected Abstracted abstracted;
+	protected Abstracted abstracted; // field name reflectively accessed
 	protected Concrete concrete;
 
 	public DynamicEnum(Abstracted abstracted, Concrete concrete) {
@@ -15,11 +15,6 @@ public DynamicEnum(Abstracted abstracted, Concrete concrete) {
 
 	public abstract String name();
 
-	/**
-	 * @return always returns the concrete name
-	 */
-	public abstract String concreteName();
-
 	/**
 	 * Override me in API
 	 *

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

@@ -0,0 +1,10 @@
+package com.laytonsmith.abstraction;
+
+import com.laytonsmith.abstraction.blocks.MCBlockData;
+import com.laytonsmith.abstraction.blocks.MCMaterial;
+
+public interface MCBlockDataMeta extends MCItemMeta {
+	MCBlockData getBlockData(MCMaterial material);
+	boolean hasBlockData();
+	void setBlockData(MCBlockData blockData);
+}

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

@@ -8,4 +8,16 @@ public interface MCCreatureSpawner extends MCBlockState {
 	void setSpawnedType(MCEntityType type);
 	int getDelay();
 	void setDelay(int delay);
+	int getMinDelay();
+	void setMinDelay(int delay);
+	int getMaxDelay();
+	void setMaxDelay(int delay);
+	int getSpawnCount();
+	void setSpawnCount(int count);
+	int getMaxNearbyEntities();
+	void setMaxNearbyEntities(int max);
+	int getPlayerRange();
+	void setPlayerRange(int range);
+	int getSpawnRange();
+	void setSpawnRange(int range);
 }

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

@@ -57,8 +57,6 @@ public interface MCLocation extends AbstractionObject {
 
 	void setYaw(float y);
 
-	void breakBlock();
-
 	Vector3D getDirection();
 
 	MCLocation clone();

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

@@ -136,6 +136,8 @@ public interface MCPlayer extends MCCommandSender, MCHumanEntity, MCOfflinePlaye
 
 	void playSound(MCLocation l, MCSound sound, MCSoundCategory category, float volume, float pitch);
 
+	void playSound(MCEntity ent, MCSound sound, MCSoundCategory category, float volume, float pitch);
+
 	void playSound(MCLocation l, String sound, MCSoundCategory category, float volume, float pitch);
 
 	void stopSound(MCSound sound);
@@ -184,4 +186,8 @@ public interface MCPlayer extends MCCommandSender, MCHumanEntity, MCOfflinePlaye
 	void setStatistic(MCPlayerStatistic stat, MCEntityType type, int amount);
 
 	void setStatistic(MCPlayerStatistic stat, MCMaterial type, int amount);
+
+	MCWorldBorder getWorldBorder();
+
+	void setWorldBorder(MCWorldBorder border);
 }

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

@@ -182,4 +182,6 @@ public interface MCServer extends AbstractionObject {
 	MCBlockData createBlockData(String data);
 
 	MCMerchant createMerchant(String title);
+
+	MCWorldBorder createWorldBorder();
 }

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

@@ -0,0 +1,15 @@
+package com.laytonsmith.abstraction;
+
+import com.laytonsmith.abstraction.MCLivingEntity.MCEffect;
+import com.laytonsmith.abstraction.enums.MCPotionEffectType;
+import com.laytonsmith.core.constructs.Target;
+
+import java.util.List;
+
+public interface MCSuspiciousStewMeta extends MCItemMeta {
+
+	boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t);
+
+	List<MCEffect> getCustomEffects();
+
+}