Skip to content

Commit fb7aede

Browse files
DerFrZockerDerFrZocker
committed
Updated to 1.17.1
Took 3 hours 43 minutes
1 parent 6e59061 commit fb7aede

File tree

37 files changed

+2291
-27
lines changed

37 files changed

+2291
-27
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212

1313
<artifactId>custom-ore-generator</artifactId>
1414

15+
<pluginRepositories>
16+
<pluginRepository>
17+
<id>apache.snapshots</id>
18+
<url>https://repository.apache.org/snapshots/</url>
19+
</pluginRepository>
20+
</pluginRepositories>
21+
1522
<dependencies>
1623
<dependency>
1724
<groupId>com.github.codedoctorde</groupId>
@@ -151,14 +158,20 @@
151158
<version>${project.version}</version>
152159
<scope>compile</scope>
153160
</dependency>
161+
<dependency>
162+
<groupId>de.derfrzocker</groupId>
163+
<artifactId>custom-ore-generator-impl-v1_17_R1</artifactId>
164+
<version>${project.version}</version>
165+
<scope>compile</scope>
166+
</dependency>
154167
</dependencies>
155168

156169
<build>
157170
<plugins>
158171
<plugin>
159172
<groupId>org.apache.maven.plugins</groupId>
160173
<artifactId>maven-shade-plugin</artifactId>
161-
<version>3.0.0</version>
174+
<version>3.3.0-SNAPSHOT</version>
162175
<executions>
163176
<execution>
164177
<phase>package</phase>

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

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,24 @@
2929
import de.derfrzocker.custom.ore.generator.api.Info;
3030
import de.derfrzocker.custom.ore.generator.api.OreSetting;
3131
import de.derfrzocker.custom.ore.generator.command.OreGenCommand;
32-
import de.derfrzocker.custom.ore.generator.impl.*;
32+
import de.derfrzocker.custom.ore.generator.impl.BiomeConfigYamlImpl;
33+
import de.derfrzocker.custom.ore.generator.impl.CustomOreGeneratorServiceImpl;
34+
import de.derfrzocker.custom.ore.generator.impl.OreConfigYamlImpl;
35+
import de.derfrzocker.custom.ore.generator.impl.OreSettingsContainerYamlImpl;
36+
import de.derfrzocker.custom.ore.generator.impl.WorldConfigYamlImpl;
3337
import de.derfrzocker.custom.ore.generator.impl.blockselector.CountRangeBlockSelector;
3438
import de.derfrzocker.custom.ore.generator.impl.blockselector.HighestBlockBlockSelector;
35-
import de.derfrzocker.custom.ore.generator.impl.customdata.*;
39+
import de.derfrzocker.custom.ore.generator.impl.customdata.AutoCustomData;
40+
import de.derfrzocker.custom.ore.generator.impl.customdata.BlockStateCustomData;
41+
import de.derfrzocker.custom.ore.generator.impl.customdata.CommandCustomData;
42+
import de.derfrzocker.custom.ore.generator.impl.customdata.DirectionCustomData;
43+
import de.derfrzocker.custom.ore.generator.impl.customdata.FacingCustomData;
44+
import de.derfrzocker.custom.ore.generator.impl.customdata.ItemModsCustomData;
45+
import de.derfrzocker.custom.ore.generator.impl.customdata.NBTTagCustomData;
46+
import de.derfrzocker.custom.ore.generator.impl.customdata.OraxenCustomData;
47+
import de.derfrzocker.custom.ore.generator.impl.customdata.SkullTextureCustomData;
48+
import de.derfrzocker.custom.ore.generator.impl.customdata.TickBlockCustomData;
49+
import de.derfrzocker.custom.ore.generator.impl.customdata.VariantCustomData;
3650
import de.derfrzocker.custom.ore.generator.impl.dao.OreConfigYamlDao;
3751
import de.derfrzocker.custom.ore.generator.impl.dao.WorldConfigYamlDao;
3852
import de.derfrzocker.custom.ore.generator.impl.dao.WorldConfigYamlDao_Old;
@@ -61,6 +75,8 @@
6175
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.oregenerator.MinableGenerator_v1_16_R2;
6276
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.WorldHandler_v1_16_R3;
6377
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.oregenerator.MinableGenerator_v1_16_R3;
78+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.WorldHandler_v1_17_R1;
79+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.oregenerator.MinableGenerator_v1_17_R1;
6480
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
6581
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
6682
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -101,6 +117,7 @@ public class CustomOreGenerator extends JavaPlugin {
101117
private CustomOreGeneratorMessages messages;
102118
private Permissions permissions;
103119
private Version version = Version.UNKNOWN;
120+
private boolean shouldLoad = true;
104121

105122
@Override
106123
public void onLoad() {
@@ -111,17 +128,29 @@ public void onLoad() {
111128
getLogger().warning("The Server version which you are running is unsupported, you are running version '" + version + "'");
112129
getLogger().warning("The plugin supports following versions " + combineVersions(Version.v1_8_R1, Version.v1_8_R2, Version.v1_8_R3,
113130
Version.v1_9_R1, Version.v1_9_R2, Version.v1_10_R1, Version.v1_11_R1, Version.v1_12_R1, Version.v1_13_R1, Version.v1_13_R2,
114-
Version.v1_14_R1, Version.v1_15_R1, Version.v1_16_R1, Version.v1_16_R2, Version.v1_16_R3));
115-
getLogger().warning("(Spigot / Paper version 1.8 - 1.16.4), if you are running such a Minecraft version, than your bukkit implementation is unsupported, in this case please contact the developer, so he can resolve this Issue");
131+
Version.v1_14_R1, Version.v1_15_R1, Version.v1_16_R1, Version.v1_16_R2, Version.v1_16_R3, Version.v1_17_R1));
132+
getLogger().warning("(Spigot / Paper version 1.8 - 1.17.1), if you are running such a Minecraft version, than your bukkit implementation is unsupported, in this case please contact the developer, so he can resolve this Issue");
116133

117134
if (version == Version.UNKNOWN) {
118135
getLogger().warning("The Version '" + version + "' can indicate, that you are using a newer Minecraft version than currently supported.");
119136
getLogger().warning("In this case please update to the newest version of this plugin. If this is the newest Version, than please be patient. It can take some weeks until the plugin is updated");
120137
}
121-
138+
shouldLoad = false;
122139
return;
123140
}
124141

142+
if (version == Version.v1_17_R1) {
143+
try {
144+
Class.forName("org.bukkit.generator.WorldInfo");
145+
} catch (ClassNotFoundException e) {
146+
// Unsupported version
147+
shouldLoad = false;
148+
getLogger().warning("The server version which you are running is unsupported");
149+
getLogger().warning("Make sure that you are running 1.17.1 Spigot build 3218 or higher, 1.17 is not supported.");
150+
return;
151+
}
152+
}
153+
125154
messages = new CustomOreGeneratorMessages(this);
126155
permissions = new Permissions(this);
127156

@@ -139,7 +168,7 @@ public void onLoad() {
139168

140169
@Override
141170
public void onEnable() {
142-
if (version == Version.UNKNOWN) {
171+
if (version == Version.UNKNOWN || !shouldLoad) {
143172
// print a stack Trace, so that the server owner can easily spot, that the plugin is not working
144173
getLogger().log(Level.WARNING, "No compatible Server version found!", new IllegalStateException("No compatible Server version found!"));
145174
getServer().getPluginManager().disablePlugin(this);
@@ -193,6 +222,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
193222
registerUtil.register(Version.v1_16_R1, Version.v1_16_R1, () -> new MinableGenerator_v1_16_R1(infoFunction, oreSettingInfoBiFunction), true);
194223
registerUtil.register(Version.v1_16_R2, Version.v1_16_R2, () -> new MinableGenerator_v1_16_R2(infoFunction, oreSettingInfoBiFunction), true);
195224
registerUtil.register(Version.v1_16_R3, Version.v1_16_R3, () -> new MinableGenerator_v1_16_R3(infoFunction, oreSettingInfoBiFunction), true);
225+
registerUtil.register(Version.v1_17_R1, Version.v1_17_R1, () -> new MinableGenerator_v1_17_R1(infoFunction, oreSettingInfoBiFunction), true);
196226
}
197227

198228
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -227,6 +257,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
227257

228258
private void initWorldHandler() {
229259
switch (version) {
260+
case v1_17_R1:
261+
new WorldHandler_v1_17_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
262+
return;
230263
case v1_16_R3:
231264
new WorldHandler_v1_16_R3(this, CustomOreGeneratorServiceSupplier.INSTANCE);
232265
return;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.AutoApplier_v1_16_R1;
3838
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.AutoApplier_v1_16_R2;
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.AutoApplier_v1_16_R3;
40+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.AutoApplier_v1_17_R1;
4041
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
4142
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
4243
import de.derfrzocker.spigot.utils.Version;
@@ -56,6 +57,8 @@ public class AutoCustomData extends AbstractAutoCustomData {
5657

5758
static {
5859
switch (Version.getServerVersion(Bukkit.getServer())) {
60+
case v1_17_R1:
61+
case v1_16_R3:
5962
case v1_16_R2:
6063
case v1_16_R1:
6164
case v1_15_R1:
@@ -98,6 +101,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
98101
@Override
99102
protected AutoApplier getCustomDataApplier0() {
100103
switch (Version.getServerVersion(Bukkit.getServer())) {
104+
case v1_17_R1:
105+
return new AutoApplier_v1_17_R1(this);
101106
case v1_16_R3:
102107
return new AutoApplier_v1_16_R3(this);
103108
case v1_16_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.BlockStateApplier_v1_16_R1;
3838
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.BlockStateApplier_v1_16_R2;
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.BlockStateApplier_v1_16_R3;
40+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.BlockStateApplier_v1_17_R1;
4041
import de.derfrzocker.spigot.utils.Version;
4142
import org.apache.commons.lang.Validate;
4243
import org.bukkit.Bukkit;
@@ -62,6 +63,8 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
6263
@Override
6364
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
6465
switch (Version.getServerVersion(Bukkit.getServer())) {
66+
case v1_17_R1:
67+
return new BlockStateApplier_v1_17_R1(this.serviceSupplier, this);
6568
case v1_16_R3:
6669
return new BlockStateApplier_v1_16_R3(this.serviceSupplier, this);
6770
case v1_16_R2:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.CommandApplier_v1_16_R1;
4040
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.CommandApplier_v1_16_R2;
4141
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.CommandApplier_v1_16_R3;
42+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.CommandApplier_v1_17_R1;
4243
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
4344
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
4445
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -62,6 +63,8 @@ public class CommandCustomData extends AbstractCustomData<CustomDataApplier> {
6263

6364
static {
6465
switch (Version.getServerVersion(Bukkit.getServer())) {
66+
case v1_17_R1:
67+
case v1_16_R3:
6568
case v1_16_R2:
6669
case v1_16_R1:
6770
case v1_15_R1:
@@ -128,6 +131,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
128131
@Override
129132
protected CustomDataApplier getCustomDataApplier0() {
130133
switch (Version.getServerVersion(Bukkit.getServer())) {
134+
case v1_17_R1:
135+
return new CommandApplier_v1_17_R1(this);
131136
case v1_16_R3:
132137
return new CommandApplier_v1_16_R3(this);
133138
case v1_16_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
@@ -37,6 +37,7 @@
3737
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.DirectionApplier_v1_16_R1;
3838
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.DirectionApplier_v1_16_R2;
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.DirectionApplier_v1_16_R3;
40+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.DirectionApplier_v1_17_R1;
4041
import de.derfrzocker.spigot.utils.Version;
4142
import org.apache.commons.lang.Validate;
4243
import org.bukkit.Bukkit;
@@ -119,6 +120,8 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
119120
@Override
120121
protected CustomDataApplier getCustomDataApplier0() {
121122
switch (Version.getServerVersion(Bukkit.getServer())) {
123+
case v1_17_R1:
124+
return new DirectionApplier_v1_17_R1(this, blockFace);
122125
case v1_16_R3:
123126
return new DirectionApplier_v1_16_R3(this, blockFace);
124127
case v1_16_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
@@ -37,6 +37,7 @@
3737
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.FacingApplier_v1_16_R1;
3838
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.FacingApplier_v1_16_R2;
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.FacingApplier_v1_16_R3;
40+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.FacingApplier_v1_17_R1;
4041
import de.derfrzocker.spigot.utils.Version;
4142
import org.apache.commons.lang.Validate;
4243
import org.bukkit.Bukkit;
@@ -104,6 +105,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
104105
@Override
105106
protected CustomDataApplier getCustomDataApplier0() {
106107
switch (Version.getServerVersion(Bukkit.getServer())) {
108+
case v1_17_R1:
109+
return new FacingApplier_v1_17_R1(this);
107110
case v1_16_R3:
108111
return new FacingApplier_v1_16_R3(this);
109112
case v1_16_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
@@ -39,6 +39,7 @@
3939
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.ItemModsApplier_v1_16_R1;
4040
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.ItemModsApplier_v1_16_R2;
4141
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.ItemModsApplier_v1_16_R3;
42+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.ItemModsApplier_v1_17_R1;
4243
import de.derfrzocker.spigot.utils.Version;
4344
import org.apache.commons.lang.Validate;
4445
import org.bukkit.Bukkit;
@@ -107,6 +108,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
107108
@Override
108109
protected CustomDataApplier getCustomDataApplier0() {
109110
switch (Version.getServerVersion(Bukkit.getServer())) {
111+
case v1_17_R1:
112+
return new ItemModsApplier_v1_17_R1(this);
110113
case v1_16_R3:
111114
return new ItemModsApplier_v1_16_R3(this);
112115
case v1_16_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.NBTTagApplier_v1_16_R1;
3737
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.NBTTagApplier_v1_16_R2;
3838
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.NBTTagApplier_v1_16_R3;
39+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.NBTTagApplier_v1_17_R1;
3940
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
4041
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
4142
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -58,6 +59,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
5859
@Override
5960
protected NBTTagApplier getCustomDataApplier0() {
6061
switch (Version.getServerVersion(Bukkit.getServer())) {
62+
case v1_17_R1:
63+
return new NBTTagApplier_v1_17_R1(this);
6164
case v1_16_R3:
6265
return new NBTTagApplier_v1_16_R3(this);
6366
case v1_16_R2:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.customdata.OraxenApplier_v1_16_R1;
3535
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.customdata.OraxenApplier_v1_16_R2;
3636
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.OraxenApplier_v1_16_R3;
37+
import de.derfrzocker.custom.ore.generator.impl.v1_17_R1.customdata.OraxenApplier_v1_17_R1;
3738
import de.derfrzocker.spigot.utils.Version;
3839
import io.th0rgal.oraxen.items.OraxenItems;
3940
import io.th0rgal.oraxen.mechanics.provided.block.BlockMechanic;
@@ -107,6 +108,8 @@ public Object getCustomData(@NotNull BlockState blockState) {
107108
@Override
108109
protected CustomDataApplier getCustomDataApplier0() {
109110
switch (Version.getServerVersion(Bukkit.getServer())) {
111+
case v1_17_R1:
112+
return new OraxenApplier_v1_17_R1(this);
110113
case v1_16_R3:
111114
return new OraxenApplier_v1_16_R3(this);
112115
case v1_16_R2:

0 commit comments

Comments
 (0)