Skip to content

Commit 41ced43

Browse files
DerFrZockerDerFrZocker
committed
update to minecraft version 1.15
Took 26 minutes
1 parent 11be5d1 commit 41ced43

24 files changed

+1602
-3
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>de.derfrzocker</groupId>
4141
<artifactId>spigot-utils</artifactId>
42-
<version>dev-36-SNAPSHOT</version>
42+
<version>dev-38-SNAPSHOT</version>
4343
<scope>compile</scope>
4444
</dependency>
4545
<dependency>
@@ -132,6 +132,12 @@
132132
<version>${project.version}</version>
133133
<scope>compile</scope>
134134
</dependency>
135+
<dependency>
136+
<groupId>de.derfrzocker</groupId>
137+
<artifactId>custom-ore-generator-impl-v1_15_R1</artifactId>
138+
<version>${project.version}</version>
139+
<scope>compile</scope>
140+
</dependency>
135141
</dependencies>
136142

137143
<build>

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/AutoCustomData.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.AutoApplier_v1_13_R1;
1111
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.AutoApplier_v1_13_R2;
1212
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.AutoApplier_v1_14_R1;
13+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.AutoApplier_v1_15_R1;
1314
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
1415
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
1516
import de.derfrzocker.spigot.utils.Version;
@@ -27,6 +28,7 @@ public class AutoCustomData implements CustomData {
2728

2829
static {
2930
switch (Version.getCurrent()) {
31+
case v1_15_R1:
3032
case v1_14_R1:
3133
case v1_13_R2:
3234
case v1_13_R1:
@@ -85,6 +87,8 @@ public CustomDataApplier getCustomDataApplier() {
8587

8688
private CustomDataApplier getCustomDataApplier0() {
8789
switch (Version.getCurrent()) {
90+
case v1_15_R1:
91+
return new AutoApplier_v1_15_R1(this);
8892
case v1_14_R1:
8993
return new AutoApplier_v1_14_R1(this);
9094
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/CommandCustomData.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.CommandApplier_v1_13_R1;
1111
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.CommandApplier_v1_13_R2;
1212
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.CommandApplier_v1_14_R1;
13+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.CommandApplier_v1_15_R1;
1314
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
1415
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
1516
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -30,6 +31,7 @@ public class CommandCustomData implements CustomData {
3031

3132
static {
3233
switch (Version.getCurrent()) {
34+
case v1_15_R1:
3335
case v1_14_R1:
3436
case v1_13_R2:
3537
case v1_13_R1:
@@ -93,6 +95,8 @@ public CustomDataApplier getCustomDataApplier() {
9395

9496
private CustomDataApplier getCustomDataApplier0() {
9597
switch (Version.getCurrent()) {
98+
case v1_15_R1:
99+
return new CommandApplier_v1_15_R1(this);
96100
case v1_14_R1:
97101
return new CommandApplier_v1_14_R1(this);
98102
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/DirectionCustomData.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.DirectionApplier_v1_13_R1;
1111
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.DirectionApplier_v1_13_R2;
1212
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.DirectionApplier_v1_14_R1;
13+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.DirectionApplier_v1_15_R1;
1314
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.DirectionApplier_v1_18_R1;
1415
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.DirectionApplier_v1_18_R2;
1516
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.DirectionApplier_v1_18_R3;
@@ -82,6 +83,8 @@ public CustomDataApplier getCustomDataApplier() {
8283

8384
private CustomDataApplier getCustomDataApplier0() {
8485
switch (Version.getCurrent()) {
86+
case v1_15_R1:
87+
return new DirectionApplier_v1_15_R1(this, blockFace);
8588
case v1_14_R1:
8689
return new DirectionApplier_v1_14_R1(this, blockFace);
8790
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/FacingCustomData.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.FacingApplier_v1_13_R1;
1111
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.FacingApplier_v1_13_R2;
1212
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.FacingApplier_v1_14_R1;
13+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.FacingApplier_v1_15_R1;
1314
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.FacingApplier_v1_18_R1;
1415
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.FacingApplier_v1_18_R2;
1516
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.FacingApplier_v1_18_R3;
@@ -74,6 +75,8 @@ public CustomDataApplier getCustomDataApplier() {
7475

7576
private CustomDataApplier getCustomDataApplier0() {
7677
switch (Version.getCurrent()) {
78+
case v1_15_R1:
79+
return new FacingApplier_v1_15_R1(this);
7780
case v1_14_R1:
7881
return new FacingApplier_v1_14_R1(this);
7982
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/ItemModsCustomData.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.ItemModsApplier_v1_13_R1;
1111
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.ItemModsApplier_v1_13_R2;
1212
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.ItemModsApplier_v1_14_R1;
13+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.ItemModsApplier_v1_15_R1;
1314
import de.derfrzocker.spigot.utils.Version;
1415
import org.jetbrains.annotations.NotNull;
1516
import org.jetbrains.annotations.Nullable;
@@ -68,6 +69,8 @@ public CustomDataApplier getCustomDataApplier() {
6869

6970
private CustomDataApplier getCustomDataApplier0() {
7071
switch (Version.getCurrent()) {
72+
case v1_15_R1:
73+
return new ItemModsApplier_v1_15_R1(this);
7174
case v1_14_R1:
7275
return new ItemModsApplier_v1_14_R1(this);
7376
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/SkullTextureCustomData.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.SkullTextureApplier_v1_13_R1;
1414
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.SkullTextureApplier_v1_13_R2;
1515
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.SkullTextureApplier_v1_14_R1;
16+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.SkullTextureApplier_v1_15_R1;
1617
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.SkullTextureApplier_v1_8_R1;
1718
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.SkullTextureApplier_v1_8_R2;
1819
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.SkullTextureApplier_v1_8_R3;
@@ -35,6 +36,7 @@ public class SkullTextureCustomData implements CustomData {
3536

3637
static {
3738
switch (Version.getCurrent()) {
39+
case v1_15_R1:
3840
case v1_14_R1:
3941
case v1_13_R2:
4042
case v1_13_R1:
@@ -103,6 +105,8 @@ public CustomDataApplier getCustomDataApplier() {
103105

104106
private CustomDataApplier getCustomDataApplier0() {
105107
switch (Version.getCurrent()) {
108+
case v1_15_R1:
109+
return new SkullTextureApplier_v1_15_R1(this);
106110
case v1_14_R1:
107111
return new SkullTextureApplier_v1_14_R1(this);
108112
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/TickBlockCustomData.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import de.derfrzocker.custom.ore.generator.impl.v1_13_R1.customdata.TickBlockApplier_v1_13_R1;
88
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.customdata.TickBlockApplier_v1_13_R2;
99
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.customdata.TickBlockApplier_v1_14_R1;
10+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.TickBlockApplier_v1_15_R1;
1011
import de.derfrzocker.spigot.utils.Version;
1112
import org.jetbrains.annotations.NotNull;
1213
import org.jetbrains.annotations.Nullable;
@@ -54,6 +55,8 @@ public CustomDataApplier getCustomDataApplier() {
5455

5556
private CustomDataApplier getCustomDataApplier0() {
5657
switch (Version.getCurrent()) {
58+
case v1_15_R1:
59+
return new TickBlockApplier_v1_15_R1(this);
5760
case v1_14_R1:
5861
return new TickBlockApplier_v1_14_R1(this);
5962
case v1_13_R2:

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/utils/VersionPicker.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import de.derfrzocker.custom.ore.generator.impl.v1_13_R2.paper.oregenerator.MinableGenerator_v1_13_R2_paper;
1818
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.WorldHandler_v1_14_R1;
1919
import de.derfrzocker.custom.ore.generator.impl.v1_14_R1.oregenerator.MinableGenerator_v1_14_R1;
20+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.WorldHandler_v1_15_R1;
21+
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.oregenerator.MinableGenerator_v1_15_R1;
2022
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
2123
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
2224
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -65,6 +67,9 @@ public void init() {
6567
service.registerOreGenerator(new SingleOreGenerator());
6668

6769
switch (version) {
70+
case v1_15_R1:
71+
init_V1_15_R1();
72+
return;
6873
case v1_14_R1:
6974
init_V1_14_R1();
7075
return;
@@ -226,4 +231,15 @@ private void init_V1_14_R1() {
226231
service.setDefaultOreGenerator(oreGenerator);
227232
}
228233

234+
235+
private void init_V1_15_R1() {
236+
final CustomOreGeneratorService service = serviceSupplier.get();
237+
238+
new WorldHandler_v1_15_R1(javaPlugin, serviceSupplier);
239+
final OreGenerator oreGenerator = new MinableGenerator_v1_15_R1();
240+
241+
service.registerOreGenerator(oreGenerator);
242+
service.setDefaultOreGenerator(oreGenerator);
243+
}
244+
229245
}

‎impl/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<module>v1_12_R1</module>
2323
<module>v1_13_R1</module>
2424
<module>v1_13_R2</module>
25-
<module>v1_14_R1</module>
2625
<module>v1_13_R2-paper</module>
26+
<module>v1_14_R1</module>
27+
<module>v1_15_R1</module>
2728
<module>ore-generators</module>
2829
</modules>
2930

0 commit comments

Comments
 (0)