Skip to content

Commit be83c79

Browse files
committed
update to Minecraft Version 1.16.4
Took 18 minutes
1 parent a1dee0d commit be83c79

28 files changed

+2323
-0
lines changed

custom-ore-generator/pom.xml

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

150156
<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
@@ -59,6 +59,8 @@
5959
import de.derfrzocker.custom.ore.generator.impl.v1_16_R1.oregenerator.MinableGenerator_v1_16_R1;
6060
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.WorldHandler_v1_16_R2;
6161
import de.derfrzocker.custom.ore.generator.impl.v1_16_R2.oregenerator.MinableGenerator_v1_16_R2;
62+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.WorldHandler_v1_16_R3;
63+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.oregenerator.MinableGenerator_v1_16_R3;
6264
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.CustomOreBlockPopulator_v1_8_R1;
6365
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.oregenerator.MinableGenerator_v1_8_R1;
6466
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.CustomOreBlockPopulator_v1_8_R2;
@@ -166,6 +168,7 @@ private void registerStandardOreGenerators(@NotNull final RegisterUtil registerU
166168
registerUtil.register(Version.v1_15_R1, Version.v1_15_R1, () -> new MinableGenerator_v1_15_R1(infoFunction, oreSettingInfoBiFunction), true);
167169
registerUtil.register(Version.v1_16_R1, Version.v1_16_R1, () -> new MinableGenerator_v1_16_R1(infoFunction, oreSettingInfoBiFunction), true);
168170
registerUtil.register(Version.v1_16_R2, Version.v1_16_R2, () -> new MinableGenerator_v1_16_R2(infoFunction, oreSettingInfoBiFunction), true);
171+
registerUtil.register(Version.v1_16_R3, Version.v1_16_R3, () -> new MinableGenerator_v1_16_R3(infoFunction, oreSettingInfoBiFunction), true);
169172
}
170173

171174
private void registerStandardBlockSelector(@NotNull final RegisterUtil registerUtil) {
@@ -200,6 +203,9 @@ private void registerStandardCustomDatas(@NotNull final RegisterUtil registerUti
200203

201204
private void initWorldHandler() {
202205
switch (version) {
206+
case v1_16_R3:
207+
new WorldHandler_v1_16_R3(this, CustomOreGeneratorServiceSupplier.INSTANCE);
208+
return;
203209
case v1_16_R2:
204210
new WorldHandler_v1_16_R2(this, CustomOreGeneratorServiceSupplier.INSTANCE);
205211
return;

custom-ore-generator/src/main/java/de/derfrzocker/custom/ore/generator/impl/customdata/AutoCustomData.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_15_R1.customdata.AutoApplier_v1_15_R1;
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;
39+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.AutoApplier_v1_16_R3;
3940
import de.derfrzocker.custom.ore.generator.impl.v1_9_R1.customdata.AutoApplier_v1_9_R1;
4041
import de.derfrzocker.custom.ore.generator.impl.v_1_9_R2.customdata.AutoApplier_v1_9_R2;
4142
import de.derfrzocker.spigot.utils.Version;
@@ -97,6 +98,8 @@ public boolean hasCustomData(@NotNull final BlockState blockState) {
9798
@Override
9899
protected AutoApplier getCustomDataApplier0() {
99100
switch (Version.getServerVersion(Bukkit.getServer())) {
101+
case v1_16_R3:
102+
return new AutoApplier_v1_16_R3(this);
100103
case v1_16_R2:
101104
return new AutoApplier_v1_16_R2(this);
102105
case v1_16_R1:

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
@@ -36,6 +36,7 @@
3636
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.BlockStateApplier_v1_15_R1;
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;
39+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.BlockStateApplier_v1_16_R3;
3940
import de.derfrzocker.spigot.utils.Version;
4041
import org.apache.commons.lang.Validate;
4142
import org.bukkit.Bukkit;
@@ -61,6 +62,8 @@ public BlockStateCustomData(@NotNull final Supplier<CustomOreGeneratorService> s
6162
@Override
6263
protected AbstractBlockStateCustomData.BlockStateApplier getCustomDataApplier0() {
6364
switch (Version.getServerVersion(Bukkit.getServer())) {
65+
case v1_16_R3:
66+
return new BlockStateApplier_v1_16_R3(this.serviceSupplier, this);
6467
case v1_16_R2:
6568
return new BlockStateApplier_v1_16_R2(this.serviceSupplier, this);
6669
case v1_16_R1:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.CommandApplier_v1_15_R1;
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;
41+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.CommandApplier_v1_16_R3;
4142
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.CommandApplier_v1_8_R1;
4243
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.CommandApplier_v1_8_R2;
4344
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.CommandApplier_v1_8_R3;
@@ -127,6 +128,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
127128
@Override
128129
protected CustomDataApplier getCustomDataApplier0() {
129130
switch (Version.getServerVersion(Bukkit.getServer())) {
131+
case v1_16_R3:
132+
return new CommandApplier_v1_16_R3(this);
130133
case v1_16_R2:
131134
return new CommandApplier_v1_16_R2(this);
132135
case v1_16_R1:

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
@@ -36,6 +36,7 @@
3636
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.DirectionApplier_v1_15_R1;
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;
39+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.DirectionApplier_v1_16_R3;
3940
import de.derfrzocker.spigot.utils.Version;
4041
import org.apache.commons.lang.Validate;
4142
import org.bukkit.Bukkit;
@@ -118,6 +119,8 @@ public Boolean getCustomData(@NotNull final BlockState blockState) {
118119
@Override
119120
protected CustomDataApplier getCustomDataApplier0() {
120121
switch (Version.getServerVersion(Bukkit.getServer())) {
122+
case v1_16_R3:
123+
return new DirectionApplier_v1_16_R3(this, blockFace);
121124
case v1_16_R2:
122125
return new DirectionApplier_v1_16_R2(this, blockFace);
123126
case v1_16_R1:

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
@@ -36,6 +36,7 @@
3636
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.FacingApplier_v1_15_R1;
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;
39+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.FacingApplier_v1_16_R3;
3940
import de.derfrzocker.spigot.utils.Version;
4041
import org.apache.commons.lang.Validate;
4142
import org.bukkit.Bukkit;
@@ -103,6 +104,8 @@ public BlockFace getCustomData(@NotNull final BlockState blockState) {
103104
@Override
104105
protected CustomDataApplier getCustomDataApplier0() {
105106
switch (Version.getServerVersion(Bukkit.getServer())) {
107+
case v1_16_R3:
108+
return new FacingApplier_v1_16_R3(this);
106109
case v1_16_R2:
107110
return new FacingApplier_v1_16_R2(this);
108111
case v1_16_R1:

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
@@ -38,6 +38,7 @@
3838
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.ItemModsApplier_v1_15_R1;
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;
41+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.ItemModsApplier_v1_16_R3;
4142
import de.derfrzocker.spigot.utils.Version;
4243
import org.apache.commons.lang.Validate;
4344
import org.bukkit.Bukkit;
@@ -106,6 +107,8 @@ public String getCustomData(@NotNull final BlockState blockState) {
106107
@Override
107108
protected CustomDataApplier getCustomDataApplier0() {
108109
switch (Version.getServerVersion(Bukkit.getServer())) {
110+
case v1_16_R3:
111+
return new ItemModsApplier_v1_16_R3(this);
109112
case v1_16_R2:
110113
return new ItemModsApplier_v1_16_R2(this);
111114
case v1_16_R1:

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
@@ -35,6 +35,7 @@
3535
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.NBTTagApplier_v1_15_R1;
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;
38+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.NBTTagApplier_v1_16_R3;
3839
import de.derfrzocker.custom.ore.generator.impl.v1_8_R1.customdata.NBTTagApplier_v1_8_R1;
3940
import de.derfrzocker.custom.ore.generator.impl.v1_8_R2.customdata.NBTTagApplier_v1_8_R2;
4041
import de.derfrzocker.custom.ore.generator.impl.v1_8_R3.customdata.NBTTagApplier_v1_8_R3;
@@ -57,6 +58,8 @@ public NBTTagCustomData(@NotNull final Function<String, Info> infoFunction, @Not
5758
@Override
5859
protected NBTTagApplier getCustomDataApplier0() {
5960
switch (Version.getServerVersion(Bukkit.getServer())) {
61+
case v1_16_R3:
62+
return new NBTTagApplier_v1_16_R3(this);
6063
case v1_16_R2:
6164
return new NBTTagApplier_v1_16_R2(this);
6265
case v1_16_R1:

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
@@ -33,6 +33,7 @@
3333
import de.derfrzocker.custom.ore.generator.impl.v1_15_R1.customdata.OraxenApplier_v1_15_R1;
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;
36+
import de.derfrzocker.custom.ore.generator.impl.v1_16_R3.customdata.OraxenApplier_v1_16_R3;
3637
import de.derfrzocker.spigot.utils.Version;
3738
import io.th0rgal.oraxen.items.OraxenItems;
3839
import io.th0rgal.oraxen.mechanics.provided.block.BlockMechanic;
@@ -106,6 +107,8 @@ public Object getCustomData(@NotNull BlockState blockState) {
106107
@Override
107108
protected CustomDataApplier getCustomDataApplier0() {
108109
switch (Version.getServerVersion(Bukkit.getServer())) {
110+
case v1_16_R3:
111+
return new OraxenApplier_v1_16_R3(this);
109112
case v1_16_R2:
110113
return new OraxenApplier_v1_16_R2(this);
111114
case v1_16_R1:

0 commit comments

Comments
 (0)