Skip to content

Commit 6e3538d

Browse files
ybw0014ybw0014
committed
feat: more attributes
1 parent 7f76d0e commit 6e3538d

4 files changed

Lines changed: 75 additions & 7 deletions

File tree

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ subprojects {
3737
}
3838

3939
api("com.google.code.findbugs:jsr305:3.0.2")
40-
compileOnlyAndTestImplementation("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
40+
compileOnlyAndTestImplementation("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
4141
testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.1")
4242
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.1")
4343
}
@@ -69,7 +69,7 @@ subprojects {
6969
publishing {
7070
publications {
7171
create<MavenPublication>("maven") {
72-
project.shadow.component(this)
72+
from(components["shadow"])
7373

7474
artifact(tasks.named("javadocJar").get())
7575
artifact(tasks.named("sourcesJar").get())
@@ -116,8 +116,8 @@ subprojects {
116116
nexusPublishing {
117117
repositories {
118118
sonatype {
119-
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
120-
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
119+
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
120+
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
121121
}
122122
}
123123
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.3.0
1+
version=2.4.0-SNAPSHOT

‎guizhanlib-minecraft/src/main/java/net/guizhanss/guizhanlib/minecraft/utils/compatibility/AttributeX.java‎

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,79 @@
1616
public class AttributeX {
1717

1818
public static final Attribute GENERIC_JUMP_STRENGTH;
19+
public static final Attribute MAX_HEALTH;
20+
public static final Attribute FOLLOW_RANGE;
21+
public static final Attribute KNOCKBACK_RESISTANCE;
22+
public static final Attribute MOVEMENT_SPEED;
23+
public static final Attribute FLYING_SPEED;
24+
public static final Attribute ATTACK_DAMAGE;
25+
public static final Attribute ATTACK_KNOCKBACK;
26+
public static final Attribute ATTACK_SPEED;
27+
public static final Attribute ARMOR;
28+
public static final Attribute ARMOR_TOUGHNESS;
29+
public static final Attribute FALL_DAMAGE_MULTIPLIER;
30+
public static final Attribute LUCK;
31+
public static final Attribute MAX_ABSORPTION;
32+
public static final Attribute SAFE_FALL_DISTANCE;
33+
public static final Attribute SCALE;
34+
public static final Attribute STEP_HEIGHT;
35+
public static final Attribute GRAVITY;
36+
public static final Attribute JUMP_STRENGTH;
37+
public static final Attribute BURNING_TIME; // 1.21+
38+
public static final Attribute EXPLOSION_KNOCKBACK_RESISTANCE; // 1.21+
39+
public static final Attribute MOVEMENT_EFFICIENCY; // 1.21+
40+
public static final Attribute OXYGEN_BONUS; // 1.21+
41+
public static final Attribute WATER_MOVEMENT_EFFICIENCY; // 1.21+
42+
public static final Attribute TEMPT_RANGE;
43+
public static final Attribute BLOCK_INTERACTION_RANGE;
44+
public static final Attribute ENTITY_INTERACTION_RANGE;
45+
public static final Attribute BLOCK_BREAK_SPEED;
46+
public static final Attribute MINING_EFFICIENCY; // 1.21+
47+
public static final Attribute SNEAKING_SPEED; // 1.21+
48+
public static final Attribute SUBMERGED_MINING_SPEED; // 1.21+
49+
public static final Attribute SWEEPING_DAMAGE_RATIO; // 1.21+
50+
public static final Attribute SPAWN_REINFORCEMENTS;
1951

2052
static {
2153
boolean isPost205 = MinecraftVersionUtil.isAtLeast(20, 5);
54+
boolean isPost213 = MinecraftVersionUtil.isAtLeast(21, 3);
2255

23-
GENERIC_JUMP_STRENGTH = isPost205 ? Attribute.GENERIC_JUMP_STRENGTH : getField("HORSE_JUMP_STRENGTH");
56+
// 1.20.5 rename
57+
GENERIC_JUMP_STRENGTH = isPost213 ? Attribute.JUMP_STRENGTH : isPost205 ? getField("GENERIC_JUMP_STRENGTH") : getField("HORSE_JUMP_STRENGTH");
58+
59+
// 1.21.3 rename
60+
MAX_HEALTH = isPost213 ? Attribute.MAX_HEALTH : getField("GENERIC_MAX_HEALTH");
61+
FOLLOW_RANGE = isPost213 ? Attribute.FOLLOW_RANGE : getField("GENERIC_FOLLOW_RANGE");
62+
KNOCKBACK_RESISTANCE = isPost213 ? Attribute.KNOCKBACK_RESISTANCE : getField("GENERIC_KNOCKBACK_RESISTANCE");
63+
MOVEMENT_SPEED = isPost213 ? Attribute.MOVEMENT_SPEED : getField("GENERIC_MOVEMENT_SPEED");
64+
FLYING_SPEED = isPost213 ? Attribute.FLYING_SPEED : getField("GENERIC_FLYING_SPEED");
65+
ATTACK_DAMAGE = isPost213 ? Attribute.ATTACK_DAMAGE : getField("GENERIC_ATTACK_DAMAGE");
66+
ATTACK_KNOCKBACK = isPost213 ? Attribute.ATTACK_KNOCKBACK : getField("GENERIC_ATTACK_KNOCKBACK");
67+
ATTACK_SPEED = isPost213 ? Attribute.ATTACK_SPEED : getField("GENERIC_ATTACK_SPEED");
68+
ARMOR = isPost213 ? Attribute.ARMOR : getField("GENERIC_ARMOR");
69+
ARMOR_TOUGHNESS = isPost213 ? Attribute.ARMOR_TOUGHNESS : getField("GENERIC_ARMOR_TOUGHNESS");
70+
FALL_DAMAGE_MULTIPLIER = isPost213 ? Attribute.FALL_DAMAGE_MULTIPLIER : getField("GENERIC_FALL_DAMAGE_MULTIPLIER");
71+
LUCK = isPost213 ? Attribute.LUCK : getField("GENERIC_LUCK");
72+
MAX_ABSORPTION = isPost213 ? Attribute.MAX_ABSORPTION : getField("GENERIC_MAX_ABSORPTION");
73+
SAFE_FALL_DISTANCE = isPost213 ? Attribute.SAFE_FALL_DISTANCE : getField("GENERIC_SAFE_FALL_DISTANCE");
74+
SCALE = isPost213 ? Attribute.SCALE : getField("GENERIC_SCALE");
75+
STEP_HEIGHT = isPost213 ? Attribute.STEP_HEIGHT : getField("GENERIC_STEP_HEIGHT");
76+
GRAVITY = isPost213 ? Attribute.GRAVITY : getField("GENERIC_GRAVITY");
77+
JUMP_STRENGTH = GENERIC_JUMP_STRENGTH;
78+
BURNING_TIME = isPost213 ? Attribute.BURNING_TIME : getField("GENERIC_BURNING_TIME");
79+
EXPLOSION_KNOCKBACK_RESISTANCE = isPost213 ? Attribute.EXPLOSION_KNOCKBACK_RESISTANCE : getField("GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE");
80+
MOVEMENT_EFFICIENCY = isPost213 ? Attribute.MOVEMENT_EFFICIENCY : getField("GENERIC_MOVEMENT_EFFICIENCY");
81+
OXYGEN_BONUS = isPost213 ? Attribute.OXYGEN_BONUS : getField("GENERIC_OXYGEN_BONUS");
82+
WATER_MOVEMENT_EFFICIENCY = isPost213 ? Attribute.WATER_MOVEMENT_EFFICIENCY : getField("GENERIC_WATER_MOVEMENT_EFFICIENCY");
83+
TEMPT_RANGE = isPost213 ? Attribute.TEMPT_RANGE : getField("GENERIC_TEMPT_RANGE");
84+
BLOCK_INTERACTION_RANGE = isPost213 ? Attribute.BLOCK_INTERACTION_RANGE : getField("PLAYER_BLOCK_INTERACTION_RANGE");
85+
ENTITY_INTERACTION_RANGE = isPost213 ? Attribute.ENTITY_INTERACTION_RANGE : getField("PLAYER_ENTITY_INTERACTION_RANGE");
86+
BLOCK_BREAK_SPEED = isPost213 ? Attribute.BLOCK_BREAK_SPEED : getField("PLAYER_BLOCK_BREAK_SPEED");
87+
MINING_EFFICIENCY = isPost213 ? Attribute.MINING_EFFICIENCY : getField("PLAYER_MINING_EFFICIENCY");
88+
SNEAKING_SPEED = isPost213 ? Attribute.SNEAKING_SPEED : getField("PLAYER_SNEAKING_SPEED");
89+
SUBMERGED_MINING_SPEED = isPost213 ? Attribute.SUBMERGED_MINING_SPEED : getField("PLAYER_SUBMERGED_MINING_SPEED");
90+
SWEEPING_DAMAGE_RATIO = isPost213 ? Attribute.SWEEPING_DAMAGE_RATIO : getField("PLAYER_SWEEPING_DAMAGE_RATIO");
91+
SPAWN_REINFORCEMENTS = isPost213 ? Attribute.SPAWN_REINFORCEMENTS : getField("ZOMBIE_SPAWN_REINFORCEMENTS");
2492
}
2593

2694
@Nullable

‎guizhanlib-slimefun/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ dependencies {
22
api(project(":guizhanlib-common", configuration = "shadow"))
33
api(project(":guizhanlib-localization", configuration = "shadow"))
44
api(project(":guizhanlib-minecraft", configuration = "shadow"))
5-
compileOnly("com.github.slimefun:Slimefun4:3ea21da4fe")
5+
compileOnly("com.github.slimefun:Slimefun4:experimental-SNAPSHOT")
66
}

0 commit comments

Comments
 (0)