Skip to content

Commit 5f3cae2

Browse files
DerFrZockerDerFrZocker
committed
update to Minecraft version 1.16.2
Took 1 hour 10 minutes
1 parent 3cc173f commit 5f3cae2

Some content is hidden

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

47 files changed

+2332
-82
lines changed

‎custom-ore-generator/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@
144144
<version>${project.version}</version>
145145
<scope>compile</scope>
146146
</dependency>
147+
<dependency>
148+
<groupId>de.derfrzocker</groupId>
149+
<artifactId>custom-ore-generator-impl-v1_16_R2</artifactId>
150+
<version>${project.version}</version>
151+
<scope>compile</scope>
152+
</dependency>
147153
</dependencies>
148154

149155
<build>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.oregenerator.MinableGenerator_v1_15_R1;
5858
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.WorldHandler_v1_16_R1;
5959
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.oregenerator.MinableGenerator_v1_16_R1;
60+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.WorldHandler_v1_16_R2;
61+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.oregenerator.MinableGenerator_v1_16_R2;
6062
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
6163
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
6264
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -160,6 +162,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
160162
registerUtil.register(Version.v1_14_R1, Version.v1_14_R1, () -> new MinableGenerator_v1_14_R1(infoFunction, oreSettingInfoBiFunction), true);
161163
registerUtil.register(Version.v1_15_R1, Version.v1_15_R1, () -> new MinableGenerator_v1_15_R1(infoFunction, oreSettingInfoBiFunction), true);
162164
registerUtil.register(Version.v1_16_R1, Version.v1_16_R1, () -> new MinableGenerator_v1_16_R1(infoFunction, oreSettingInfoBiFunction), true);
165+
registerUtil.register(Version.v1_16_R2, Version.v1_16_R2, () -> new MinableGenerator_v1_16_R2(infoFunction, oreSettingInfoBiFunction), true);
163166
}
164167

165168
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -193,6 +196,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
193196

194197
private void initWorldHandler() {
195198
switch (Version.getCurrent()) {
199+
case v1_16_R2:
200+
new WorldHandler_v1_16_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
201+
return;
196202
case v1_16_R1:
197203
new WorldHandler_v1_16_R1(this, CustomOreGeneratorServiceSupplier.INSTANCE);
198204
return;

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/BiomeGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.bukkit.block.Biome;
3636
import org.bukkit.event.inventory.InventoryClickEvent;
3737
import org.bukkit.inventory.ItemStack;
38-
import org.bukkit.plugin.java.JavaPlugin;
38+
import org.bukkit.plugin.Plugin;
3939
import org.jetbrains.annotations.NotNull;
4040

4141
import java.util.function.Consumer;
@@ -48,7 +48,7 @@ public class BiomeGui extends PageGui<Biome> {
4848
@NotNull
4949
private final OreConfigFactory oreConfigFactory;
5050

51-
public BiomeGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
51+
public BiomeGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
5252
super(plugin, checkSettings(plugin));
5353

5454
Validate.notNull(oreConfigFactory, "OreConfigFactory can not be null");
@@ -66,9 +66,9 @@ public BiomeGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<Custom
6666
addItem(biomeGuiSettings.getNextSlot(), MessageUtil.replaceItemStack(plugin, biomeGuiSettings.getNextItemStack()), inventoryClickEvent -> consumer.accept(oreConfigFactory));
6767
}
6868

69-
private static BiomeGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
69+
private static BiomeGuiSettings checkSettings(@NotNull final Plugin plugin) {
7070
if (biomeGuiSettings == null) {
71-
biomeGuiSettings = new BiomeGuiSettings(javaPlugin, "data/factory/gui/biome-gui.yml", true);
71+
biomeGuiSettings = new BiomeGuiSettings(plugin, "data/factory/gui/biome-gui.yml", true);
7272
}
7373

7474
return biomeGuiSettings;

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/BlockSelectorGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import de.derfrzocker.spigot.utils.message.MessageUtil;
3434
import de.derfrzocker.spigot.utils.message.MessageValue;
3535
import org.bukkit.inventory.ItemStack;
36-
import org.bukkit.plugin.java.JavaPlugin;
36+
import org.bukkit.plugin.Plugin;
3737
import org.jetbrains.annotations.NotNull;
3838

3939
import java.util.function.Consumer;
@@ -43,7 +43,7 @@ public class BlockSelectorGui extends PageGui<BlockSelector> {
4343

4444
private static BlockSelectorGuiSettings blockSelectorGuiSettings;
4545

46-
public BlockSelectorGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
46+
public BlockSelectorGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
4747
super(plugin, checkSettings(plugin));
4848

4949

@@ -74,9 +74,9 @@ public BlockSelectorGui(@NotNull final JavaPlugin plugin, @NotNull final Supplie
7474

7575
}
7676

77-
private static BlockSelectorGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
77+
private static BlockSelectorGuiSettings checkSettings(@NotNull final Plugin plugin) {
7878
if (blockSelectorGuiSettings == null)
79-
blockSelectorGuiSettings = new BlockSelectorGuiSettings(javaPlugin, "data/factory/gui/block-selector-gui.yml", true);
79+
blockSelectorGuiSettings = new BlockSelectorGuiSettings(plugin, "data/factory/gui/block-selector-gui.yml", true);
8080

8181
return blockSelectorGuiSettings;
8282
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/CustomDataGui.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import de.derfrzocker.spigot.utils.message.MessageValue;
4141
import org.bukkit.conversations.*;
4242
import org.bukkit.entity.Player;
43-
import org.bukkit.plugin.java.JavaPlugin;
43+
import org.bukkit.plugin.Plugin;
4444
import org.jetbrains.annotations.NotNull;
4545
import org.jetbrains.annotations.Nullable;
4646

@@ -62,7 +62,7 @@ public class CustomDataGui extends BasicGui {
6262
@NotNull
6363
private final CustomData customData;
6464

65-
public CustomDataGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer, @NotNull final CustomData customData) {
65+
public CustomDataGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer, @NotNull final CustomData customData) {
6666
super(plugin, checkSettings(plugin));
6767

6868
this.serviceSupplier = serviceSupplier;
@@ -124,12 +124,12 @@ public CustomDataGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<C
124124
});
125125
}
126126

127-
private static CustomDataGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
127+
private static CustomDataGuiSettings checkSettings(@NotNull final Plugin plugin) {
128128
if (customDataGuiSettings == null)
129-
customDataGuiSettings = new CustomDataGuiSettings(javaPlugin, "data/factory/gui/custom-data-gui.yml", true);
129+
customDataGuiSettings = new CustomDataGuiSettings(plugin, "data/factory/gui/custom-data-gui.yml", true);
130130

131131
if (booleanGuiSettings == null)
132-
booleanGuiSettings = new BooleanGuiSettings(javaPlugin, "data/factory/gui/boolean-gui.yml", true);
132+
booleanGuiSettings = new BooleanGuiSettings(plugin, "data/factory/gui/boolean-gui.yml", true);
133133

134134
return customDataGuiSettings;
135135
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/CustomDatasGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import de.derfrzocker.spigot.utils.message.MessageUtil;
3434
import de.derfrzocker.spigot.utils.message.MessageValue;
3535
import org.bukkit.inventory.ItemStack;
36-
import org.bukkit.plugin.java.JavaPlugin;
36+
import org.bukkit.plugin.Plugin;
3737
import org.jetbrains.annotations.NotNull;
3838

3939
import java.util.LinkedHashSet;
@@ -46,7 +46,7 @@ public class CustomDatasGui extends PageGui<CustomData> {
4646

4747
private static CustomDatasGuiSettings customDatasGuiSettings;
4848

49-
public CustomDatasGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
49+
public CustomDatasGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
5050
super(plugin, checkSettings(plugin));
5151

5252
final Map<CustomData, Object> customDatas = oreConfigFactory.getOreConfigBuilder().customDatas();
@@ -86,9 +86,9 @@ public CustomDatasGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<
8686

8787
}
8888

89-
private static CustomDatasGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
89+
private static CustomDatasGuiSettings checkSettings(@NotNull final Plugin plugin) {
9090
if (customDatasGuiSettings == null)
91-
customDatasGuiSettings = new CustomDatasGuiSettings(javaPlugin, "data/factory/gui/custom-datas-gui.yml", true);
91+
customDatasGuiSettings = new CustomDatasGuiSettings(plugin, "data/factory/gui/custom-datas-gui.yml", true);
9292

9393
return customDatasGuiSettings;
9494
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/MenuGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.bukkit.World;
3939
import org.bukkit.block.Biome;
4040
import org.bukkit.inventory.ItemStack;
41-
import org.bukkit.plugin.java.JavaPlugin;
41+
import org.bukkit.plugin.Plugin;
4242
import org.jetbrains.annotations.NotNull;
4343

4444
import java.util.LinkedHashSet;
@@ -51,7 +51,7 @@ public class MenuGui extends BasicGui {
5151
private static MenuGuiSettings menuGuiSettings;
5252
private boolean ready = true;
5353

54-
public MenuGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory) {
54+
public MenuGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory) {
5555
super(plugin, checkSettings(plugin));
5656

5757
addDecorations();
@@ -384,9 +384,9 @@ public MenuGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomO
384384
addItem(menuGuiSettings.getAbortSlot(), MessageUtil.replaceItemStack(plugin, menuGuiSettings.getAbortItemStack()), inventoryClickEvent -> closeSync(inventoryClickEvent.getWhoClicked()));
385385
}
386386

387-
private static MenuGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
387+
private static MenuGuiSettings checkSettings(@NotNull final Plugin plugin) {
388388
if (menuGuiSettings == null)
389-
menuGuiSettings = new MenuGuiSettings(javaPlugin, "data/factory/gui/menu-gui.yml", true);
389+
menuGuiSettings = new MenuGuiSettings(plugin, "data/factory/gui/menu-gui.yml", true);
390390

391391
return menuGuiSettings;
392392
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/OreGeneratorGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import de.derfrzocker.spigot.utils.message.MessageUtil;
3434
import de.derfrzocker.spigot.utils.message.MessageValue;
3535
import org.bukkit.inventory.ItemStack;
36-
import org.bukkit.plugin.java.JavaPlugin;
36+
import org.bukkit.plugin.Plugin;
3737
import org.jetbrains.annotations.NotNull;
3838

3939
import java.util.function.Consumer;
@@ -43,7 +43,7 @@ public class OreGeneratorGui extends PageGui<OreGenerator> {
4343

4444
private static OreGeneratorGuiSettings oreGeneratorGuiSettings;
4545

46-
public OreGeneratorGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
46+
public OreGeneratorGui(@NotNull final Plugin plugin, @NotNull final Supplier<CustomOreGeneratorService> serviceSupplier, @NotNull final OreConfigFactory oreConfigFactory, @NotNull final Consumer<OreConfigFactory> consumer) {
4747
super(plugin, checkSettings(plugin));
4848

4949
final CustomOreGeneratorService service = serviceSupplier.get();
@@ -74,9 +74,9 @@ public OreGeneratorGui(@NotNull final JavaPlugin plugin, @NotNull final Supplier
7474
}
7575
}
7676

77-
private static OreGeneratorGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
77+
private static OreGeneratorGuiSettings checkSettings(@NotNull final Plugin plugin) {
7878
if (oreGeneratorGuiSettings == null)
79-
oreGeneratorGuiSettings = new OreGeneratorGuiSettings(javaPlugin, "data/factory/gui/ore-generator-gui.yml", true);
79+
oreGeneratorGuiSettings = new OreGeneratorGuiSettings(plugin, "data/factory/gui/ore-generator-gui.yml", true);
8080

8181
return oreGeneratorGuiSettings;
8282
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/OreSettingGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import de.derfrzocker.spigot.utils.message.MessageValue;
3838
import org.bukkit.event.inventory.InventoryClickEvent;
3939
import org.bukkit.inventory.ItemStack;
40-
import org.bukkit.plugin.java.JavaPlugin;
40+
import org.bukkit.plugin.Plugin;
4141
import org.jetbrains.annotations.NotNull;
4242

4343
import java.util.Locale;
@@ -54,7 +54,7 @@ public class OreSettingGui extends BasicGui {
5454
private final OreSettingContainer oreSettingContainer;
5555
private final int oreSettingSlot;
5656

57-
public OreSettingGui(@NotNull final JavaPlugin plugin,
57+
public OreSettingGui(@NotNull final Plugin plugin,
5858
@NotNull final Supplier<CustomOreGeneratorService> serviceSupplier,
5959
@NotNull final OreConfigFactory oreConfigFactory,
6060
@NotNull final Consumer<OreConfigFactory> consumer,
@@ -84,9 +84,9 @@ public OreSettingGui(@NotNull final JavaPlugin plugin,
8484
oreSettingGuiSettings.getItemStackValues().forEach(value -> addItem(value.getSlot(), value.getItemStack(), new SettingConsumer(value.getValue())));
8585
}
8686

87-
private static OreSettingGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
87+
private static OreSettingGuiSettings checkSettings(@NotNull final Plugin plugin) {
8888
if (oreSettingGuiSettings == null)
89-
oreSettingGuiSettings = new OreSettingGuiSettings(javaPlugin, "data/factory/gui/ore-setting-gui.yml", true);
89+
oreSettingGuiSettings = new OreSettingGuiSettings(plugin, "data/factory/gui/ore-setting-gui.yml", true);
9090

9191
return oreSettingGuiSettings;
9292
}

‎custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/factory/gui/OreSettingsGui.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import de.derfrzocker.spigot.utils.message.MessageUtil;
3434
import de.derfrzocker.spigot.utils.message.MessageValue;
3535
import org.bukkit.inventory.ItemStack;
36-
import org.bukkit.plugin.java.JavaPlugin;
36+
import org.bukkit.plugin.Plugin;
3737
import org.jetbrains.annotations.NotNull;
3838

3939
import java.util.Set;
@@ -47,7 +47,7 @@ public class OreSettingsGui extends PageGui<OreSetting> {
4747
@NotNull
4848
private final OreSettingsAble oreSettingsAble;
4949

50-
public OreSettingsGui(@NotNull final JavaPlugin plugin,
50+
public OreSettingsGui(@NotNull final Plugin plugin,
5151
@NotNull final Supplier<CustomOreGeneratorService> serviceSupplier,
5252
@NotNull final OreConfigFactory oreConfigFactory,
5353
@NotNull final Consumer<OreConfigFactory> consumer,
@@ -81,9 +81,9 @@ public OreSettingsGui(@NotNull final JavaPlugin plugin,
8181

8282
}
8383

84-
private static OreSettingsGuiSettings checkSettings(@NotNull final JavaPlugin javaPlugin) {
84+
private static OreSettingsGuiSettings checkSettings(@NotNull final Plugin plugin) {
8585
if (oreSettingsGuiSettings == null)
86-
oreSettingsGuiSettings = new OreSettingsGuiSettings(javaPlugin, "data/factory/gui/ore-settings-gui.yml", true);
86+
oreSettingsGuiSettings = new OreSettingsGuiSettings(plugin, "data/factory/gui/ore-settings-gui.yml", true);
8787

8888
return oreSettingsGuiSettings;
8989
}

0 commit comments

Comments
 (0)