Skip to content

Commit

Permalink
Updated GitHub repository. Updated Maven-COmpiler-Plugin to 3.11.0.…
Browse files Browse the repository at this point in the history
… Updated FoliaLib to `0.3.0`. Downgraded to Java 11. Added 1 tick delay to effect addition. Changed plugin version to `1.0.2`.
  • Loading branch information
BuildTools committed Sep 20, 2023
1 parent 16c798f commit 0cc5b00
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 240 deletions.
3 changes: 0 additions & 3 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_gson_gson_2_10.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_guava_guava_31_1_jre.xml

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_rylinaux_PlugMan_2_2_9.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_tcoded_FoliaLib_0_2_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__io_papermc_paperlib_1_0_7.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__net_md_5_bungeecord_chat_1_16_R0_4.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_joml_joml_1_10_5.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_yaml_snakeyaml_1_33.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 1 addition & 27 deletions StormerTPAReloaded.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
Expand All @@ -9,30 +9,4 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.joml:joml:1.10.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
<orderEntry type="library" name="Maven: io.papermc:paperlib:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.tcoded:FoliaLib:0.2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.rylinaux:PlugMan:2.2.9" level="project" />
</component>
</module>
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@

<groupId>me.loving11ish</groupId>
<artifactId>StormerTPAReloaded</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<packaging>jar</packaging>

<name>StormerTPAReloaded</name>

<properties>
<java.version>17</java.version>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<defaultGoal>clean package</defaultGoal>
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand Down Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>com.tcoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>0.2.4</version>
<version>0.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,11 @@ public void loadConfig() {

@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if(!(sender instanceof Player p)) {
if(!(sender instanceof Player)) {
Message.error(sender, Lang.ERROR_PLAYERONLY.toString());
return false;
}
Player p = (Player) sender;
if(command.getName().equalsIgnoreCase("tpa") || command.getName().equalsIgnoreCase("tpahere")) {
if(args.length == 0) {
Message.error(p, Lang.ERROR_MISSING_PLAYER_ARG.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,11 @@ private static void teleport(Player target, Location loc) {
effectList.add(potionEffect);
}
}
for (PotionEffectType potionEffectType : effectList) {
target.addPotionEffect(new PotionEffect(potionEffectType, duration, multiplier, true));
}
StormerTPAReloaded.i.getFoliaLib().getImpl().runAtEntityLater(target, () -> {
for (PotionEffectType potionEffectType : effectList) {
target.addPotionEffect(new PotionEffect(potionEffectType, duration, multiplier, true));
}
}, 20L, TimeUnit.MILLISECONDS);
}
}

Expand Down

0 comments on commit 0cc5b00

Please sign in to comment.