Skip to content

Commit d94df7d

Browse files
YufiriaMazentaYufiriaMazenta
committed
[1.13.0.5]修复Star不能正确跟随attachEntity的问题,优化particle模块一些代码
1 parent f2ae807 commit d94df7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+358
-276
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
java.sourceCompatibility = JavaVersion.VERSION_1_8
22
java.targetCompatibility = JavaVersion.VERSION_1_8
33
rootProject.group = "com.crypticlib"
4-
rootProject.version = "1.13.0.1"
4+
rootProject.version = "1.13.0.5"
55
//当全项目重构时更新大版本号,当添加模块或有较大更改时更新子版本号,当bug修复和功能补充时更新小版本号
66

77
var repositoryUrl = "https://repo.crypticlib.com:8081/repository/"

‎module/bukkit/particle/src/main/java/com/crypticlib/particle/utils/coordinate/package-info.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎module/bukkit/particle/src/main/java/com/crypticlib/particle/utils/matrix/package-info.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎module/bukkit/particle/src/main/java/com/crypticlib/particle/utils/projector/package-info.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/Arc.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/Arc.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

33
import com.google.common.collect.Lists;
44
import crypticlib.scheduler.CrypticLibRunnable;
@@ -60,7 +60,7 @@ public Arc(Location origin, double startAngle, double angle, double radius, doub
6060
* @param period 特效周期(如果需要可以使用)
6161
*/
6262
public Arc(Location origin, double startAngle, double angle, double radius, double step, long period) {
63-
setOrigin(origin);
63+
setOriginLocation(origin);
6464
this.startAngle = startAngle;
6565
this.angle = angle;
6666
this.radius = radius;
@@ -76,12 +76,12 @@ public List<Location> calculateLocations() {
7676
double x = radius * Math.cos(radians);
7777
double z = radius * Math.sin(radians);
7878

79-
Location showLocation = getOrigin().clone().add(x, 0, z);
79+
Location showLocation = getOriginLocation().clone().add(x, 0, z);
8080
if (hasMatrix()) {
8181
Vector vector = new Vector(x, 0, z);
8282
Vector changed = getMatrix().applyVector(vector);
8383

84-
showLocation = getOrigin().clone().add(changed);
84+
showLocation = getOriginLocation().clone().add(changed);
8585
}
8686

8787
showLocation.add(getIncrementX(), getIncrementY(), getIncrementZ());
@@ -96,7 +96,7 @@ public void show() {
9696
double radians = Math.toRadians(i);
9797
double x = radius * Math.cos(radians);
9898
double z = radius * Math.sin(radians);
99-
spawnParticle(getOrigin().clone().add(x, 0, z));
99+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
100100
}
101101
}
102102

@@ -115,7 +115,7 @@ public void run() {
115115
double x = radius * Math.cos(radians);
116116
double z = radius * Math.sin(radians);
117117

118-
spawnParticle(getOrigin().clone().add(x, 0, z));
118+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
119119
}
120120
}.syncTimer(0, getPeriod());
121121
}
@@ -127,7 +127,7 @@ public void playNextPoint() {
127127
double x = radius * Math.cos(radians);
128128
double z = radius * Math.sin(radians);
129129

130-
spawnParticle(getOrigin().clone().add(x, 0, z));
130+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
131131

132132
// 进行重置
133133
if (currentAngle > angle) {

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/Astroid.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/Astroid.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

33
import com.google.common.collect.Lists;
44
import crypticlib.scheduler.CrypticLibRunnable;
@@ -41,7 +41,7 @@ public Astroid(double radius, Location origin) {
4141
public Astroid(double radius, Location origin, double step) {
4242
this.radius = radius;
4343
this.step = step;
44-
setOrigin(origin);
44+
setOriginLocation(origin);
4545
}
4646

4747
@Override
@@ -53,12 +53,12 @@ public List<Location> calculateLocations() {
5353
double x = Math.pow(this.radius * Math.cos(radians), 3.0D);
5454
double z = Math.pow(this.radius * Math.sin(radians), 3.0D);
5555

56-
Location showLocation = getOrigin().clone().add(x, 0, z);
56+
Location showLocation = getOriginLocation().clone().add(x, 0, z);
5757
if (hasMatrix()) {
5858
Vector vector = new Vector(x, 0, z);
5959
Vector changed = getMatrix().applyVector(vector);
6060

61-
showLocation = getOrigin().clone().add(changed);
61+
showLocation = getOriginLocation().clone().add(changed);
6262
}
6363

6464
showLocation.add(getIncrementX(), getIncrementY(), getIncrementZ());
@@ -75,7 +75,7 @@ public void show() {
7575
double x = Math.pow(this.radius * Math.cos(radians), 3.0D);
7676
double z = Math.pow(this.radius * Math.sin(radians), 3.0D);
7777

78-
spawnParticle(getOrigin().clone().add(x, 0, z));
78+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
7979
}
8080
}
8181

@@ -95,7 +95,7 @@ public void run() {
9595
double x = Math.pow(getRadius() * Math.cos(radians), 3.0D);
9696
double z = Math.pow(getRadius() * Math.sin(radians), 3.0D);
9797

98-
spawnParticle(getOrigin().clone().add(x, 0, z));
98+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
9999
}
100100
}.syncTimer(0, getPeriod());
101101
}
@@ -108,7 +108,7 @@ public void playNextPoint() {
108108
double x = Math.pow(this.radius * Math.cos(radians), 3.0D);
109109
double z = Math.pow(this.radius * Math.sin(radians), 3.0D);
110110

111-
spawnParticle(getOrigin().clone().add(x, 0, z));
111+
spawnParticle(getOriginLocation().clone().add(x, 0, z));
112112
// 重置
113113
if (currentT > 360D) {
114114
currentT = 0D;

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/Circle.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/Circle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

33
import org.bukkit.Location;
44

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/Cone.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/Cone.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

3-
import com.crypticlib.particle.utils.MathUtils;
43
import com.google.common.collect.Lists;
4+
import crypticlib.particle.utils.MathUtils;
55
import crypticlib.scheduler.CrypticLibRunnable;
66
import org.bukkit.Location;
77
import org.bukkit.util.Vector;
@@ -34,7 +34,7 @@ public Cone(Location origin) {
3434
* @param radius 球的半径
3535
*/
3636
public Cone(Location origin, int sample, double radius, double height) {
37-
setOrigin(origin);
37+
setOriginLocation(origin);
3838
this.sample = sample;
3939
this.radius = radius;
4040
this.height = height;
@@ -64,16 +64,16 @@ public List<Location> calculateLocations() {
6464
double y = height * -Math.sin(phi);
6565
double z = radius * Math.sin(theta) * Math.sin(phi);
6666

67-
points.add(getOrigin().clone().add(x, y, z));
67+
points.add(getOriginLocation().clone().add(x, y, z));
6868
}
6969
// 做一个对 Matrix 和 Increment 的兼容
7070
return points.stream().map(location -> {
7171
Location showLocation = location;
7272
if (hasMatrix()) {
73-
Vector v = new Vector(location.getX() - getOrigin().getX(), location.getY() - getOrigin().getY(), location.getZ() - getOrigin().getZ());
73+
Vector v = new Vector(location.getX() - getOriginLocation().getX(), location.getY() - getOriginLocation().getY(), location.getZ() - getOriginLocation().getZ());
7474
Vector changed = getMatrix().applyVector(v);
7575

76-
showLocation = getOrigin().clone().add(changed);
76+
showLocation = getOriginLocation().clone().add(changed);
7777
}
7878

7979
showLocation.add(getIncrementX(), getIncrementY(), getIncrementZ());
@@ -157,7 +157,7 @@ public void resetLocations() {
157157
double y = height * -Math.sin(phi);
158158
double z = radius * Math.sin(theta) * Math.sin(phi);
159159

160-
locations.add(getOrigin().clone().add(x, y, z));
160+
locations.add(getOriginLocation().clone().add(x, y, z));
161161
}
162162
}
163163
}

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/Cube.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/Cube.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

3-
import com.crypticlib.particle.utils.VectorUtils;
43
import com.google.common.collect.Lists;
4+
import crypticlib.particle.utils.VectorUtils;
55
import org.bukkit.Location;
66
import org.bukkit.util.Vector;
77

@@ -46,7 +46,7 @@ public Cube(Location minLoc, Location maxLoc, double step) {
4646
throw new IllegalArgumentException("这两个坐标的所对应的世界不相同");
4747
}
4848

49-
setOrigin(minLoc.clone().add(VectorUtils.createVector(minLoc, maxLoc).multiply(0.5)));
49+
setOriginLocation(minLoc.clone().add(VectorUtils.createVector(minLoc, maxLoc).multiply(0.5)));
5050
}
5151

5252
public Location getMinLocation() {
@@ -124,10 +124,10 @@ public List<Location> calculateLocations() {
124124
return points.stream().map(location -> {
125125
Location showLocation = location;
126126
if (hasMatrix()) {
127-
Vector v = new Vector(location.getX() - getOrigin().getX(), location.getY() - getOrigin().getY(), location.getZ() - getOrigin().getZ());
127+
Vector v = new Vector(location.getX() - getOriginLocation().getX(), location.getY() - getOriginLocation().getY(), location.getZ() - getOriginLocation().getZ());
128128
Vector changed = getMatrix().applyVector(v);
129129

130-
showLocation = getOrigin().clone().add(changed);
130+
showLocation = getOriginLocation().clone().add(changed);
131131
}
132132

133133
showLocation.add(getIncrementX(), getIncrementY(), getIncrementZ());

module/bukkit/particle/src/main/java/com/crypticlib/particle/pobject/EffectGroup.java renamed to module/bukkit/particle/src/main/java/crypticlib/particle/pobject/EffectGroup.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.crypticlib.particle.pobject;
1+
package crypticlib.particle.pobject;
22

3-
import com.crypticlib.particle.utils.matrix.Matrix;
4-
import com.crypticlib.particle.utils.matrix.Matrixs;
53
import com.google.common.collect.Lists;
4+
import crypticlib.particle.utils.matrix.Matrix;
5+
import crypticlib.particle.utils.matrix.Matrixs;
66
import org.bukkit.Color;
77
import org.bukkit.Location;
88
import org.bukkit.Particle;
@@ -159,7 +159,7 @@ public EffectGroup attachEntity(Entity entity) {
159159
}
160160

161161
public EffectGroup setOrigin(Location origin) {
162-
effectList.forEach(effect -> effect.setOrigin(origin));
162+
effectList.forEach(effect -> effect.setOriginLocation(origin));
163163
return this;
164164
}
165165

0 commit comments

Comments
 (0)