CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from CivMC/master

Browse Source 
Sync
This commit is contained in:
Aleksey Terzi
2022-07-14 21:35:55 -06:00
committed by GitHub
parent 9ab3643017 b0b7271af1
commit a818dbe6e9
5 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/finale-paper/build.gradle.kts
View File

@@ -1,9 +1,7 @@
import net.civmc.civgradle.common.util.civRepo
import net.civmc.civgradle.CivGradleExtension
plugins {
`java-library`
`maven-publish`
id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT"
id("net.civmc.civgradle") version "2.+" apply false
}
// Temporary hack:
@@ -12,44 +10,28 @@ gradle.buildFinished {
project.buildDir.deleteRecursively()
}
allprojects {
group = "net.civmc.finale"
version = "2.0.0-SNAPSHOT"
description = "Finale"
}
subprojects {
apply(plugin = "net.civmc.civgradle.plugin")
apply(plugin = "java-library")
apply(plugin = "maven-publish")
apply(plugin = "net.civmc.civgradle")
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
configure<CivGradleExtension> {
pluginName = project.property("pluginName") as String
}
repositories {
mavenCentral()
civRepo("CivMC/CivModCore")
civRepo("CivMC/CombatTagPlus")
maven("https://repo.civmc.net/repository/maven-public")
maven("https://repo.dmulloy2.net/content/groups/public/")
}
publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/CivMC/Finale")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}
publications {
register<MavenPublication>("gpr") {
from(components["java"])
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/CivMC/Finale")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}

7
plugins/finale-paper/gradle.properties Normal file
View File

@@ -0,0 +1,7 @@
# Gradle properties
group = net.civmc.finale
version = 2.0.1
description = Finale
# Custom Properties
pluginName = Finale

11
plugins/finale-paper/paper/build.gradle.kts
View File

@@ -1,13 +1,6 @@
plugins {
`java-library`
id("net.civmc.civgradle.plugin")
id("io.papermc.paperweight.userdev") version "1.3.1"
}
civGradle {
paper {
pluginName = "Finale"
}
id("net.civmc.civgradle")
id("io.papermc.paperweight.userdev")
}
dependencies {

9
plugins/finale-paper/paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java
View File

@@ -25,15 +25,15 @@ import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftBoat;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftVehicle;
import org.bukkit.entity.Damageable;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -82,8 +82,9 @@ public class AsyncPacketHandler extends PacketAdapter implements Listener {
if (target == null || target.isDead() || target.isInvulnerable() ||
!world.getUID().equals(target.getWorld().getUID()) || !(target instanceof LivingEntity)) {
if (entity instanceof CraftVehicle vehicle){
vehicle.getHandle().hurt(DamageSource.playerAttack(((CraftPlayer) attacker).getHandle()), (float) ((CraftPlayer) attacker).getHandle().getAttribute(Attributes.ATTACK_DAMAGE).getValue());
if (entity instanceof CraftVehicle || entity.getType() == EntityType.ITEM_FRAME){
CraftEntity craftEntity = (CraftEntity)entity;
craftEntity.getHandle().hurt(DamageSource.playerAttack(((CraftPlayer) attacker).getHandle()), (float) ((CraftPlayer) attacker).getHandle().getAttribute(Attributes.ATTACK_DAMAGE).getValue());
}
return;
}

3
plugins/finale-paper/settings.gradle.kts
View File

@@ -14,4 +14,7 @@ pluginManagement {
}
}
rootProject.name = "finale"
include(":paper")
project(":paper").name = rootProject.name + "-paper"