Skip to content

Commit bc39ca4

Browse files
authored
Merge pull request Sefiraat#191 from balugaq/master
Resolves Sefiraat#190
2 parents e322cc3 + 7354951 commit bc39ca4

Some content is hidden

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

49 files changed

+3319
-2088
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 重要
2+
网络拓展不需要网络作为前置
3+
14
## 特别鸣谢
25

36
感谢 [m1919810 / matl114](https://github.com/m1919810) — 帮助我找到了一些网络拓展的 bug
@@ -7,4 +10,4 @@
710
增强网络运输的功能
811

912
## 更新计划
10-
1. 解决所有已知的issues后,暂停更新,并发布 final version
13+
1. 解决所有已知的issues后,暂停更新,并发布 Final Version

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.ytdd9527.networksexpansion</groupId>
88
<artifactId>NetworksExpansion</artifactId>
9-
<version>2.1-Alpha-11</version>
9+
<version>2.1-Alpha-14</version>
1010

1111
<distributionManagement>
1212
<repository>

src/main/java/com/balugaq/netex/api/enums/MCVersion.java renamed to src/main/java/com/balugaq/netex/api/enums/MinecraftVersion.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.Getter;
44

55
@Getter
6-
public enum MCVersion {
6+
public enum MinecraftVersion {
77
MC1_20(20, 0),
88
MC1_20_1(20, 1),
99
MC1_20_2(20, 2),
@@ -18,21 +18,21 @@ public enum MCVersion {
1818
private final int major;
1919
private final int minor;
2020

21-
MCVersion(int major, int minor) {
21+
MinecraftVersion(int major, int minor) {
2222
this.major = major;
2323
this.minor = minor;
2424
}
2525

26-
public static MCVersion of(int major, int minor) {
27-
for (MCVersion version : values()) {
26+
public static MinecraftVersion of(int major, int minor) {
27+
for (MinecraftVersion version : values()) {
2828
if (version.major == major && version.minor == minor) {
2929
return version;
3030
}
3131
}
3232
return UNKNOWN;
3333
}
3434

35-
public boolean isAtLeast(MCVersion version) {
35+
public boolean isAtLeast(MinecraftVersion version) {
3636
return this.major > version.major || (this.major == version.major && this.minor >= version.minor);
3737
}
3838
}

src/main/java/com/balugaq/netex/api/enums/Transformations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public Transformation getTransformation() {
6060
public Transformation getTransformation(boolean itemDisplay) {
6161
// In 1.20+ the y axis of item displays are rotated by 180°
6262
// This corrects the visuals by rotating again
63-
if (itemDisplay && Networks.getInstance().getMCVersion().isAtLeast(MCVersion.MC1_20)) {
63+
if (itemDisplay && Networks.getInstance().getMCVersion().isAtLeast(MinecraftVersion.MC1_20)) {
6464
return new Transformation(transformation.getTranslation(),
6565
transformation.getLeftRotation(),
6666
transformation.getScale(),

src/main/java/com/balugaq/netex/api/event/NetworksExpansionGuideOpenEvent.java

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

src/main/java/com/balugaq/netex/api/event/package-info.java

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)