trueog/PureKitPvP
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.20.4 error in depend ProtocolSidebar

Browse Source 
cleaned up pom.xml because of this
This commit is contained in:
Luka de Vrij committed 2023-12-12 16:25:21 +01:00
1 parent c67697e5f9
commit da3fdf06cd
6 files changed
+71 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PureKitsFork/pom.xml
+44 -44
View File
@@ -44,45 +44,45 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.md-5</groupId>
<artifactId>specialsource-maven-plugin</artifactId>
<version>1.2.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>remap</goal>
</goals>
<id>remap-obf</id>
<configuration>
<srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
<reverse>true</reverse>
<remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
<remappedArtifactAttached>true</remappedArtifactAttached>
<remappedClassifierName>remapped-obf</remappedClassifierName>
</configuration>
</execution>
<execution>
<phase>package</phase>
<goals>
<goal>remap</goal>
</goals>
<id>remap-spigot</id>
<configuration>
<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
<srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
<remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>net.md-5</groupId>-->
<!-- <artifactId>specialsource-maven-plugin</artifactId>-->
<!-- <version>1.2.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>remap</goal>-->
<!-- </goals>-->
<!-- <id>remap-obf</id>-->
<!-- <configuration>-->
<!-- <srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>-->
<!-- <reverse>true</reverse>-->
<!-- <remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>-->
<!-- <remappedArtifactAttached>true</remappedArtifactAttached>-->
<!-- <remappedClassifierName>remapped-obf</remappedClassifierName>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>remap</goal>-->
<!-- </goals>-->
<!-- <id>remap-spigot</id>-->
<!-- <configuration>-->
<!-- <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>-->
<!-- <srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>-->
<!-- <remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<outputDirectory>F:\Minecraft\Servers\MC 1.20 Server\plugins</outputDirectory>
<outputDirectory>F:\Minecraft\Servers\MC 1.20.4 Server\plugins</outputDirectory>
</configuration>
</plugin>
</plugins>
@@ -103,10 +103,10 @@
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
<repository>
<id>sk89q-repo</id>
<url>https://maven.enginehub.org/repo/</url>
</repository>
<!-- <repository>-->
<!-- <id>sk89q-repo</id>-->
<!-- <url>https://maven.enginehub.org/repo/</url>-->
<!-- </repository>-->
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
@@ -125,11 +125,11 @@
<artifactId>bukkit-sidebar</artifactId>
<version>6.2.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sk89q.worldguard</groupId>
<artifactId>worldguard-bukkit</artifactId>
<version>7.0.9</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.sk89q.worldguard</groupId>-->
<!-- <artifactId>worldguard-bukkit</artifactId>-->
<!-- <version>7.0.9</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
</dependencies>
</project>
PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/PureKitPvP.java
-2
View File
@@ -117,8 +117,6 @@ public final class PureKitPvP extends JavaPlugin {
getServer().getPluginManager().registerEvents(new KillMessageInventory(this), this);
getLogger().info("Enabled PureKitPvP");
getLogger().warning("Plugin active in world " + getConfig().getString("world") + ". To change this, see the config.");
}
PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/files/LanguageConfig.java
-1
View File
@@ -3,7 +3,6 @@ package me.lifelessnerd.purekitpvp.files;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.antlr.v4.misc.OrderedHashMap;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/sample.java
+13 -15
View File
@@ -12,7 +12,7 @@ public class sample {
public static void main(String[] args) {
System.out.println(mapStringToEnchantment("{CraftEnchantment[minecraft:knockback]=2, CraftEnchantment[minecraft:fire_aspect]=2}"));
System.out.println(mapStringToEnchantment("{CraftEnchantment[minecraft:knockback]=11, CraftEnchantment[minecraft:fire_aspect]=2}"));
@@ -20,28 +20,26 @@ public class sample {
public static String mapStringToEnchantment(String string){
//I {Enchantment:[minecraft:fire_protection, PROTECTION_FIRE]=4, Enchantment:[minecraft:infinity, INFINITY]=1}
//I {CraftEnchantment[minecraft:knockback]=2, CraftEnchantment[minecraft:fire_aspect]=2}
StringBuilder result = new StringBuilder();
StringBuilder builder = new StringBuilder(string);
builder.deleteCharAt(0);
builder.deleteCharAt(string.length() - 2);
string = builder.toString();
String[] split = string.split("minecraft:");
for (int index = 1; index < split.length; index++){
String word = split[index];
String[] splitAgain = word.split(",");
String levelString = splitAgain[1];
String[] isolateLevel = levelString.split("=");
int level = Integer.parseInt(isolateLevel[isolateLevel.length - 1]);
word = splitAgain[0];
word = MyStringUtils.itemCamelCase(word);
result.append(word).append(level).append(" ");
String[] split = string.split(",");
for(String substring : split){
substring = substring.trim();
substring = substring.substring(16);
String level = substring.split("=")[1];
String splitEnchantment = substring.split("]")[0];
String enchantment = splitEnchantment.split(":")[1];
result.append(MyStringUtils.itemCamelCase(enchantment)).append(level);
result.append(", ");
}
return result.toString();
return result.substring(0, result.length() - 2);
//Output: Fire Protection 4, Infinity 1
}
PureKitsFork/src/main/java/me/lifelessnerd/purekitpvp/utils/MyStringUtils.java
+13 -17
View File
@@ -26,32 +26,28 @@ public class MyStringUtils {
}
public static String mapStringToEnchantment(String string){
///TODO Enchantment has become CraftEnchantment - breaks everything?!
//I {Enchantment:[minecraft:fire_protection, PROTECTION_FIRE]=4, Enchantment:[minecraft:infinity, INFINITY]=1}
System.out.println(string);
//{CraftEnchantment[minecraft:knockback]=11, CraftEnchantment[minecraft:fire_aspect]=2}
StringBuilder result = new StringBuilder();
StringBuilder builder = new StringBuilder(string);
builder.deleteCharAt(0);
builder.deleteCharAt(string.length() - 2);
string = builder.toString();
String[] split = string.split("minecraft:");
for (int index = 1; index < split.length; index++){
String word = split[index];
String[] splitAgain = word.split(",");
String levelString = splitAgain[1];
String[] isolateLevel = levelString.split("=");
int level = Integer.parseInt(isolateLevel[isolateLevel.length - 1]);
word = splitAgain[0];
word = MyStringUtils.itemCamelCase(word);
result.append(word).append(level).append(" ");
String[] split = string.split(",");
for(String substring : split){
substring = substring.trim();
substring = substring.substring(16);
String level = substring.split("=")[1];
String splitEnchantment = substring.split("]")[0];
String enchantment = splitEnchantment.split(":")[1];
result.append(MyStringUtils.itemCamelCase(enchantment)).append(level);
result.append(", ");
}
return result.toString();
//Output: Fire Protection 4, Infinity 1
return result.substring(0, result.length() - 2);
//Output: Knockback 11, Fire Aspect 2
}
public static String itemMetaToEffects(String string){
PureKitsFork/src/main/resources/plugin.yml
+1 -1
View File
@@ -4,7 +4,7 @@ main: me.lifelessnerd.purekitpvp.PureKitPvP
api-version: 1.19
authors: [ LifelessNerd ]
description: KitPVP plugin, made to work with PureKits kits (abandoned)
depend:
softdepend:
- WorldGuard
commands:
getkit: