Skip to content

Commit 8a9f2c7

Browse files
DerFrZockerDerFrZocker
committed
Use new version api
Took 35 minutes
1 parent 2d6fb56 commit 8a9f2c7

File tree

16 files changed

+571
-692
lines changed

16 files changed

+571
-692
lines changed

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

Lines changed: 137 additions & 173 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@
3131
import de.derfrzocker.custom.ore.generator.api.OreConfig;
3232
import de.derfrzocker.custom.ore.generator.api.OreGenerator;
3333
import de.derfrzocker.custom.ore.generator.factory.OreConfigFactory;
34-
import de.derfrzocker.spigot.utils.Version;
3534
import de.derfrzocker.spigot.utils.command.CommandUtil;
3635
import de.derfrzocker.spigot.utils.message.MessageValue;
37-
import net.md_5.bungee.api.chat.ClickEvent;
38-
import net.md_5.bungee.api.chat.HoverEvent;
39-
import net.md_5.bungee.api.chat.TextComponent;
36+
import de.derfrzocker.spigot.utils.version.InternalVersion;
37+
import de.derfrzocker.spigot.utils.version.ServerVersion;
4038
import org.apache.commons.lang.Validate;
4139
import org.bukkit.Bukkit;
42-
import org.bukkit.ChatColor;
4340
import org.bukkit.Material;
4441
import org.bukkit.command.Command;
4542
import org.bukkit.command.CommandSender;
@@ -78,7 +75,7 @@ public CreateCommand(@NotNull final Supplier<CustomOreGeneratorService> serviceS
7875

7976
@Override //oregen create <name> <material> [<ore-generator>] [<block-selector>]
8077
public boolean onCommand(@NotNull final CommandSender sender, @NotNull final Command command, @NotNull final String label, @NotNull final String[] args) {
81-
if (args.length == 0 && sender instanceof Player && Version.getServerVersion(Bukkit.getServer()).isNewerOrSameThan(Version.v1_14_R1)) {
78+
if (args.length == 0 && sender instanceof Player && ServerVersion.getCurrentVersion(Bukkit.getServer()).isNewerThanOrSameAs(InternalVersion.v1_14_R1.getServerVersionRange().minInclusive())) {
8279
final OreConfigFactory oreConfigFactory = new OreConfigFactory(this.javaPlugin, this.serviceSupplier, (Player) sender);
8380

8481
oreConfigFactory.setName();

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

Lines changed: 59 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -48,53 +48,31 @@
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.AutoApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
5050
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
51-
import de.derfrzocker.spigot.utils.Version;
51+
import de.derfrzocker.spigot.utils.version.InternalVersion;
52+
import de.derfrzocker.spigot.utils.version.ServerVersion;
53+
import java.util.HashSet;
54+
import java.util.Set;
55+
import java.util.function.Function;
5256
import org.apache.commons.lang.Validate;
5357
import org.bukkit.Bukkit;
5458
import org.bukkit.Material;
5559
import org.bukkit.block.BlockState;
5660
import org.jetbrains.annotations.NotNull;
5761

58-
import java.util.HashSet;
59-
import java.util.Set;
60-
import java.util.function.Function;
61-
6262
public class AutoCustomData extends AbstractAutoCustomData {
6363

6464
private static final Set<Material> MATERIALS = new HashSet<>();
6565

6666
static {
67-
switch (Version.getServerVersion(Bukkit.getServer())) {
68-
case v1_20_R4:
69-
case v1_20_R3:
70-
case v1_20_R2:
71-
case v1_20_R1:
72-
case v1_19_R3:
73-
case v1_19_R2:
74-
case v1_19_R1:
75-
case v1_18_R2:
76-
case v1_18_R1:
77-
case v1_17_R1:
78-
case v1_16_R3:
79-
case v1_16_R2:
80-
case v1_16_R1:
81-
case v1_15_R1:
82-
case v1_14_R1:
83-
case v1_13_R2:
84-
case v1_13_R1:
85-
MATERIALS.add(Material.valueOf("COMMAND_BLOCK"));
86-
MATERIALS.add(Material.valueOf("CHAIN_COMMAND_BLOCK"));
87-
MATERIALS.add(Material.valueOf("REPEATING_COMMAND_BLOCK"));
88-
break;
89-
case v1_12_R1:
90-
case v1_11_R1:
91-
case v1_10_R1:
92-
case v1_9_R2:
93-
case v1_9_R1:
94-
MATERIALS.add(Material.valueOf("COMMAND"));
95-
MATERIALS.add(Material.valueOf("COMMAND_REPEATING"));
96-
MATERIALS.add(Material.valueOf("COMMAND_CHAIN"));
97-
break;
67+
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
68+
if (version.isNewerThanOrSameAs(InternalVersion.v1_13_R1.getServerVersionRange().minInclusive())) {
69+
MATERIALS.add(Material.valueOf("COMMAND_BLOCK"));
70+
MATERIALS.add(Material.valueOf("CHAIN_COMMAND_BLOCK"));
71+
MATERIALS.add(Material.valueOf("REPEATING_COMMAND_BLOCK"));
72+
} else if (version.isNewerThanOrSameAs(InternalVersion.v1_9_R1.getServerVersionRange().minInclusive())) {
73+
MATERIALS.add(Material.valueOf("COMMAND"));
74+
MATERIALS.add(Material.valueOf("COMMAND_REPEATING"));
75+
MATERIALS.add(Material.valueOf("COMMAND_CHAIN"));
9876
}
9977
}
10078

@@ -117,51 +95,51 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
11795
@NotNull
11896
@Override
11997
protected AutoApplier getCustomDataApplier0() {
120-
switch (Version.getServerVersion(Bukkit.getServer())) {
121-
case v1_20_R4:
122-
return new AutoApplier_v1_20_R1(this);
123-
case v1_20_R3:
124-
return new AutoApplier_v1_20_R3(this);
125-
case v1_20_R2:
126-
return new AutoApplier_v1_20_R2(this);
127-
case v1_20_R1:
128-
return new AutoApplier_v1_20_R1(this);
129-
case v1_19_R3:
130-
return new AutoApplier_v1_19_R3(this);
131-
case v1_19_R2:
132-
return new AutoApplier_v1_19_R2(this);
133-
case v1_19_R1:
134-
return new AutoApplier_v1_19_R1(this);
135-
case v1_18_R2:
136-
return new AutoApplier_v1_18_R2(this);
137-
case v1_18_R1:
138-
return new AutoApplier_v1_18_R1(this);
139-
case v1_17_R1:
140-
return new AutoApplier_v1_17_R1(this);
141-
case v1_16_R3:
142-
return new AutoApplier_v1_16_R3(this);
143-
case v1_16_R2:
144-
return new AutoApplier_v1_16_R2(this);
145-
case v1_16_R1:
146-
return new AutoApplier_v1_16_R1(this);
147-
case v1_15_R1:
148-
return new AutoApplier_v1_15_R1(this);
149-
case v1_14_R1:
150-
return new AutoApplier_v1_14_R1(this);
151-
case v1_13_R2:
152-
return new AutoApplier_v1_13_R2(this);
153-
case v1_13_R1:
154-
return new AutoApplier_v1_13_R1(this);
155-
case v1_12_R1:
156-
return new AutoApplier_v1_12_R1(this);
157-
case v1_11_R1:
158-
return new AutoApplier_v1_11_R1(this);
159-
case v1_10_R1:
160-
return new AutoApplier_v1_10_R1(this);
161-
case v1_9_R2:
162-
return new AutoApplier_v1_9_R2(this);
163-
case v1_9_R1:
164-
return new AutoApplier_v1_9_R1(this);
98+
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
99+
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
100+
return new AutoApplier_v1_20_R1(this);
101+
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
102+
return new AutoApplier_v1_20_R3(this);
103+
} else if (InternalVersion.v1_20_R2.getServerVersionRange().isInRange(version)) {
104+
return new AutoApplier_v1_20_R2(this);
105+
} else if (InternalVersion.v1_20_R1.getServerVersionRange().isInRange(version)) {
106+
return new AutoApplier_v1_20_R1(this);
107+
} else if (InternalVersion.v1_19_R3.getServerVersionRange().isInRange(version)) {
108+
return new AutoApplier_v1_19_R3(this);
109+
} else if (InternalVersion.v1_19_R2.getServerVersionRange().isInRange(version)) {
110+
return new AutoApplier_v1_19_R2(this);
111+
} else if (InternalVersion.v1_19_R1.getServerVersionRange().isInRange(version)) {
112+
return new AutoApplier_v1_19_R1(this);
113+
} else if (InternalVersion.v1_18_R2.getServerVersionRange().isInRange(version)) {
114+
return new AutoApplier_v1_18_R2(this);
115+
} else if (InternalVersion.v1_18_R1.getServerVersionRange().isInRange(version)) {
116+
return new AutoApplier_v1_18_R1(this);
117+
} else if (InternalVersion.v1_17_R1.getServerVersionRange().isInRange(version)) {
118+
return new AutoApplier_v1_17_R1(this);
119+
} else if (InternalVersion.v1_16_R3.getServerVersionRange().isInRange(version)) {
120+
return new AutoApplier_v1_16_R3(this);
121+
} else if (InternalVersion.v1_16_R2.getServerVersionRange().isInRange(version)) {
122+
return new AutoApplier_v1_16_R2(this);
123+
} else if (InternalVersion.v1_16_R1.getServerVersionRange().isInRange(version)) {
124+
return new AutoApplier_v1_16_R1(this);
125+
} else if (InternalVersion.v1_15_R1.getServerVersionRange().isInRange(version)) {
126+
return new AutoApplier_v1_15_R1(this);
127+
} else if (InternalVersion.v1_14_R1.getServerVersionRange().isInRange(version)) {
128+
return new AutoApplier_v1_14_R1(this);
129+
} else if (InternalVersion.v1_13_R2.getServerVersionRange().isInRange(version)) {
130+
return new AutoApplier_v1_13_R2(this);
131+
} else if (InternalVersion.v1_13_R1.getServerVersionRange().isInRange(version)) {
132+
return new AutoApplier_v1_13_R1(this);
133+
} else if (InternalVersion.v1_12_R1.getServerVersionRange().isInRange(version)) {
134+
return new AutoApplier_v1_12_R1(this);
135+
} else if (InternalVersion.v1_11_R1.getServerVersionRange().isInRange(version)) {
136+
return new AutoApplier_v1_11_R1(this);
137+
} else if (InternalVersion.v1_10_R1.getServerVersionRange().isInRange(version)) {
138+
return new AutoApplier_v1_10_R1(this);
139+
} else if (InternalVersion.v1_9_R2.getServerVersionRange().isInRange(version)) {
140+
return new AutoApplier_v1_9_R2(this);
141+
} else if (InternalVersion.v1_9_R1.getServerVersionRange().isInRange(version)) {
142+
return new AutoApplier_v1_9_R1(this);
165143
}
166144

167145
throw new UnsupportedOperationException("Version not supported jet!");

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
import de.derfrzocker.custom.ore.generator.impl.v1_20_R2.customdata.BlockStateApplier_v1_20_R2;
4848
import de.derfrzocker.custom.ore.generator.impl.v1_20_R3.customdata.BlockStateApplier_v1_20_R3;
4949
import de.derfrzocker.custom.ore.generator.impl.v1_20_R4.customdata.BlockStateApplier_v1_20_R4;
50-
import de.derfrzocker.spigot.utils.Version;
51-
import org.apache.commons.lang.Validate;
52-
import org.bukkit.Bukkit;
53-
import org.jetbrains.annotations.NotNull;
54-
50+
import de.derfrzocker.spigot.utils.version.InternalVersion;
51+
import de.derfrzocker.spigot.utils.version.ServerVersion;
5552
import java.io.File;
5653
import java.util.function.Function;
5754
import java.util.function.Supplier;
55+
import org.apache.commons.lang.Validate;
56+
import org.bukkit.Bukkit;
57+
import org.jetbrains.annotations.NotNull;
5858

5959
public class BlockStateCustomData extends AbstractBlockStateCustomData {
6060

@@ -71,47 +71,47 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
7171
@NotNull
7272
@Override
7373
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
74-
switch (Version.getServerVersion(Bukkit.getServer())) {
75-
case v1_20_R4:
76-
return new BlockStateApplier_v1_20_R4(this.serviceSupplier, this);
77-
case v1_20_R3:
78-
return new BlockStateApplier_v1_20_R3(this.serviceSupplier, this);
79-
case v1_20_R2:
80-
return new BlockStateApplier_v1_20_R2(this.serviceSupplier, this);
81-
case v1_20_R1:
82-
return new BlockStateApplier_v1_20_R1(this.serviceSupplier, this);
83-
case v1_19_R3:
84-
return new BlockStateApplier_v1_19_R3(this.serviceSupplier, this);
85-
case v1_19_R2:
86-
return new BlockStateApplier_v1_19_R2(this.serviceSupplier, this);
87-
case v1_19_R1:
88-
return new BlockStateApplier_v1_19_R1(this.serviceSupplier, this);
89-
case v1_18_R2:
90-
return new BlockStateApplier_v1_18_R2(this.serviceSupplier, this);
91-
case v1_18_R1:
92-
return new BlockStateApplier_v1_18_R1(this.serviceSupplier, this);
93-
case v1_17_R1:
94-
return new BlockStateApplier_v1_17_R1(this.serviceSupplier, this);
95-
case v1_16_R3:
96-
return new BlockStateApplier_v1_16_R3(this.serviceSupplier, this);
97-
case v1_16_R2:
98-
return new BlockStateApplier_v1_16_R2(this.serviceSupplier, this);
99-
case v1_16_R1:
100-
return new BlockStateApplier_v1_16_R1(this.serviceSupplier, this);
101-
case v1_15_R1:
102-
return new BlockStateApplier_v1_15_R1(this.serviceSupplier, this);
103-
case v1_14_R1:
104-
return new BlockStateApplier_v1_14_R1(this.serviceSupplier, this);
105-
case v1_13_R2:
106-
return new BlockStateApplier_v1_13_R2(this.serviceSupplier, this);
107-
case v1_13_R1:
108-
return new BlockStateApplier_v1_13_R1(this.serviceSupplier, this);
109-
case v1_12_R1:
110-
return new BlockStateApplier_v1_12_R1(this.serviceSupplier, this);
111-
case v1_11_R1:
112-
return new BlockStateApplier_v1_11_R1(this.serviceSupplier, this);
113-
case v1_10_R1:
114-
return new BlockStateApplier_v1_10_R1(this.serviceSupplier, this);
74+
ServerVersion version = ServerVersion.getCurrentVersion(Bukkit.getServer());
75+
if (InternalVersion.v1_20_R4.getServerVersionRange().isInRange(version)) {
76+
return new BlockStateApplier_v1_20_R4(this.serviceSupplier, this);
77+
} else if (InternalVersion.v1_20_R3.getServerVersionRange().isInRange(version)) {
78+
return new BlockStateApplier_v1_20_R3(this.serviceSupplier, this);
79+
} else if (InternalVersion.v1_20_R2.getServerVersionRange().isInRange(version)) {
80+
return new BlockStateApplier_v1_20_R2(this.serviceSupplier, this);
81+
} else if (InternalVersion.v1_20_R1.getServerVersionRange().isInRange(version)) {
82+
return new BlockStateApplier_v1_20_R1(this.serviceSupplier, this);
83+
} else if (InternalVersion.v1_19_R3.getServerVersionRange().isInRange(version)) {
84+
return new BlockStateApplier_v1_19_R3(this.serviceSupplier, this);
85+
} else if (InternalVersion.v1_19_R2.getServerVersionRange().isInRange(version)) {
86+
return new BlockStateApplier_v1_19_R2(this.serviceSupplier, this);
87+
} else if (InternalVersion.v1_19_R1.getServerVersionRange().isInRange(version)) {
88+
return new BlockStateApplier_v1_19_R1(this.serviceSupplier, this);
89+
} else if (InternalVersion.v1_18_R2.getServerVersionRange().isInRange(version)) {
90+
return new BlockStateApplier_v1_18_R2(this.serviceSupplier, this);
91+
} else if (InternalVersion.v1_18_R1.getServerVersionRange().isInRange(version)) {
92+
return new BlockStateApplier_v1_18_R1(this.serviceSupplier, this);
93+
} else if (InternalVersion.v1_17_R1.getServerVersionRange().isInRange(version)) {
94+
return new BlockStateApplier_v1_17_R1(this.serviceSupplier, this);
95+
} else if (InternalVersion.v1_16_R3.getServerVersionRange().isInRange(version)) {
96+
return new BlockStateApplier_v1_16_R3(this.serviceSupplier, this);
97+
} else if (InternalVersion.v1_16_R2.getServerVersionRange().isInRange(version)) {
98+
return new BlockStateApplier_v1_16_R2(this.serviceSupplier, this);
99+
} else if (InternalVersion.v1_16_R1.getServerVersionRange().isInRange(version)) {
100+
return new BlockStateApplier_v1_16_R1(this.serviceSupplier, this);
101+
} else if (InternalVersion.v1_15_R1.getServerVersionRange().isInRange(version)) {
102+
return new BlockStateApplier_v1_15_R1(this.serviceSupplier, this);
103+
} else if (InternalVersion.v1_14_R1.getServerVersionRange().isInRange(version)) {
104+
return new BlockStateApplier_v1_14_R1(this.serviceSupplier, this);
105+
} else if (InternalVersion.v1_13_R2.getServerVersionRange().isInRange(version)) {
106+
return new BlockStateApplier_v1_13_R2(this.serviceSupplier, this);
107+
} else if (InternalVersion.v1_13_R1.getServerVersionRange().isInRange(version)) {
108+
return new BlockStateApplier_v1_13_R1(this.serviceSupplier, this);
109+
} else if (InternalVersion.v1_12_R1.getServerVersionRange().isInRange(version)) {
110+
return new BlockStateApplier_v1_12_R1(this.serviceSupplier, this);
111+
} else if (InternalVersion.v1_11_R1.getServerVersionRange().isInRange(version)) {
112+
return new BlockStateApplier_v1_11_R1(this.serviceSupplier, this);
113+
} else if (InternalVersion.v1_10_R1.getServerVersionRange().isInRange(version)) {
114+
return new BlockStateApplier_v1_10_R1(this.serviceSupplier, this);
115115
}
116116

117117
throw new UnsupportedOperationException("Version not supported jet!");

0 commit comments

Comments
 (0)