benjamin
/
Sharehealth
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new setup

Browse Source
master
Benjamin Kraft 3 years ago
parent 5d8830c482
commit 9b33ffc076
12 changed files with 131 additions and 147 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 114
      .gitignore
  2. 9
      .idea/artifacts/Sharehealth.xml
  3. 5
      .idea/jarRepositories.xml
  4. 11
      .idea/libraries/spigot.xml
  5. 2
      .idea/misc.xml
  6. 39
      Sharehealth.iml
  7. 76
      pom.xml
  8. 2
      scripts/deploy.sh
  9. 2
      scripts/start_server.sh
  10. 8
      src/main/java/com/benjocraeft/sharehealth/Messenger.java
  11. 3
      src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
  12. 7
      src/main/resources/plugin.yml

114
.gitignore vendored
Unescape View File

@ -1,114 +1,4 @@
# User-specific stuff # User-specific stuff
!*/.idea/libraries/spigot.xml .idea/
#*.iml
*.ipr
*.iws
# IntelliJ
out/ out/
target/
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
target/
server/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
.flattened-pom.xml
# Common working directory
run/

9
.idea/artifacts/Sharehealth.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="Sharehealth">
<output-path>$PROJECT_DIR$/target/</output-path>
<root id="archive" name="Sharehealth.jar">
<element id="module-output" name="Sharehealth" />
<element id="file-copy" path="$PROJECT_DIR$/plugin.yml" />
</root>
</artifact>
</component>

5
.idea/jarRepositories.xml
Unescape View File

@ -21,6 +21,11 @@
<option name="name" value="Maven Central repository" /> <option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" /> <option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="papermc-repo" />
<option name="name" value="papermc-repo" />
<option name="url" value="https://papermc.io/repo/repository/maven-public/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="jboss.community" /> <option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" /> <option name="name" value="JBoss Community repository" />

11
.idea/libraries/spigot.xml
Unescape View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="spigot">
<CLASSES>
<root url="jar://$PROJECT_DIR$/server/spigot.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/server/spigot.jar!/" />
</SOURCES>
</library>
</component>

2
.idea/misc.xml
Unescape View File

@ -12,7 +12,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="openjdk-13" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

39
Sharehealth.iml
Unescape View File

@ -4,7 +4,8 @@
<facet type="minecraft" name="Minecraft"> <facet type="minecraft" name="Minecraft">
<configuration> <configuration>
<autoDetectTypes> <autoDetectTypes>
<platformType>SPIGOT</platformType> <platformType>PAPER</platformType>
<platformType>ADVENTURE</platformType>
</autoDetectTypes> </autoDetectTypes>
</configuration> </configuration>
</facet> </facet>
@ -14,11 +15,41 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/server" /> <excludeFolder url="file://$MODULE_DIR$/server" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="jdk" jdkName="openjdk-13" jdkType="JavaSDK" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="spigot" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.0.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: com.google.errorprone:error_prone_annotations:2.7.1" 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.8.8" 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.30" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.5.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.8.0-beta4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-api:4.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-key:4.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-api:1.3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-string:1.3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:22.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-gson:4.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-legacy:4.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-plain:4.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:9.2" level="project" />
</component> </component>
</module> </module>

76
pom.xml
Unescape View File

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.benjocraeft</groupId>
<artifactId>sharehealth</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>Sharehealth</name>
<description>This plugin makes all players on the server share their health, if one dies, everybody dies.
</description>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<url>https://mc.benjocraeft.com</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
<repositories>
<repository>
<id>papermc-repo</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

2
scripts/deploy.sh
Unescape View File

@ -1 +1 @@
cp target/Sharehealth.jar server/plugins/ cp target/sharehealth-1.0.jar server/plugins/

2
scripts/start_server.sh
Unescape View File

@ -1,2 +1,2 @@
cd server || exit cd server || exit
java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar spigot.jar nogui java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar paper.jar nogui

8
src/main/java/com/benjocraeft/sharehealth/Messenger.java
Unescape View File

@ -4,7 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_17_R1.projectiles.CraftBlockProjectileSource; import org.bukkit.projectiles.BlockProjectileSource;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
@ -21,7 +21,7 @@ import java.util.logging.Logger;
public class Messenger { public class Messenger {
private Logger logger; private final Logger logger;
Messenger(Logger logger){ Messenger(Logger logger){
this.logger = logger; this.logger = logger;
@ -74,8 +74,8 @@ public class Messenger {
Entity shooterEntity = (Entity) source; Entity shooterEntity = (Entity) source;
name = shooterEntity.getName(); name = shooterEntity.getName();
} }
if (source instanceof CraftBlockProjectileSource){ if (source instanceof BlockProjectileSource){
CraftBlockProjectileSource shooterBlock = (CraftBlockProjectileSource) source; BlockProjectileSource shooterBlock = (BlockProjectileSource) source;
return damageMessage(player, damage, shooterBlock.getBlock()); return damageMessage(player, damage, shooterBlock.getBlock());
} }
} }

3
src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
Unescape View File

@ -105,7 +105,7 @@ public class Sharehealth extends JavaPlugin {
healthManager.updatePlayer(player); healthManager.updatePlayer(player);
} }
void onPlayerGotDamage(Player player, double damage, DamageCause cause, boolean allowed, double absorbedDamage){ void onPlayerGotDamage(Player player, double damage, DamageCause cause, boolean allowed, double absorbedDamage){
if (isFailed) if (isFailed)
return; return;
@ -239,3 +239,4 @@ public class Sharehealth extends JavaPlugin {
} }
} }

7
plugin.yml → src/main/resources/plugin.yml
Unescape View File

@ -1,7 +1,8 @@
name: Sharehealth name: Sharehealth
version: 1.0 version: '${project.version}'
main: com.benjocraeft.sharehealth.Sharehealth main: com.benjocraeft.sharehealth.Sharehealth
api-version: 1.17 api-version: 1.18
prefix: Sharehealth
authors: [ BenjoCraeft ] authors: [ BenjoCraeft ]
description: This plugin makes all players on the server share their health, if one dies, everybody dies. description: This plugin makes all players on the server share their health, if one dies, everybody dies.
website: https://mc.benjocraeft.com website: https://mc.benjocraeft.com
@ -9,4 +10,4 @@ website: https://mc.benjocraeft.com
commands: commands:
sharehealth: sharehealth:
aliases: [sh] aliases: [sh]
description: Commands to control the Sharehealth System added by the Plugin description: Commands to control the Sharehealth System added by the Plugin
Write Preview
Loading…
Cancel
Save