Skip to content

Commit b29cf43

Browse files
datatagsdatatags
committed
Cleanup; replaced refs to v1_8_R1 with ServerVersion.earliest()
1 parent 37e564e commit b29cf43

25 files changed

Lines changed: 157 additions & 164 deletions

‎core/src/main/java/be/isach/ultracosmetics/UltraCosmetics.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private void registerListeners() {
307307
pluginManager.registerEvents(new MainListener(), this);
308308
pluginManager.registerEvents(new EntitySpawningManager(), this);
309309

310-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_9_R1) >= 0) {
310+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_9_R1)) {
311311
pluginManager.registerEvents(new PlayerSwapItemListener(this), this);
312312
}
313313

‎core/src/main/java/be/isach/ultracosmetics/UltraCosmeticsData.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ boolean checkServerVersion() {
143143
String mcVersion;
144144
try {
145145
mcVersion = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
146-
} catch (ArrayIndexOutOfBoundsException ignored) {
146+
} catch (ArrayIndexOutOfBoundsException e) {
147147
// TODO: maybe just disable the plugin if this happens? I'm not sure why selecting
148-
// the 1.8.0 module when version can't be determined is a good outcome
148+
// the earliest available module when version can't be determined is a good option
149149
ultraCosmetics.getSmartLogger().write(LogLevel.WARNING, "Unable to determine server version. Please report this error.");
150-
ultraCosmetics.getSmartLogger().write(LogLevel.WARNING, "UC will attempt to continue using NMS v1_8_R1, but you will probably experience issues.");
151-
setServerVersion(ServerVersion.v1_8_R1);
150+
ultraCosmetics.getSmartLogger().write(LogLevel.WARNING, "UC will attempt to continue using NMS " + ServerVersion.earliest().getName() + ", but you will probably experience issues.");
151+
setServerVersion(ServerVersion.earliest());
152152
return true;
153153
}
154154

@@ -158,9 +158,7 @@ boolean checkServerVersion() {
158158
serverVersion = ServerVersion.valueOf(mcVersion);
159159
} catch (IllegalArgumentException exc) {
160160
ultraCosmetics.getSmartLogger().write("This NMS version isn't supported. (" + mcVersion + ")!");
161-
String minVersion = ServerVersion.values()[0].getName();
162-
String maxVersion = ServerVersion.values()[ServerVersion.values().length - 1].getName();
163-
System.out.println("----------------------------\n\nULTRACOSMETICS CAN ONLY RUN ON " + minVersion + " through " + maxVersion + "!\n\n----------------------------");
161+
System.out.println("----------------------------\n\nULTRACOSMETICS CAN ONLY RUN ON " + ServerVersion.earliest().getName() + " through " + ServerVersion.latest().getName() + "!\n\n----------------------------");
164162
Bukkit.getPluginManager().disablePlugin(ultraCosmetics);
165163
return false;
166164
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/Gadget.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ public void onPlayerInteract(final PlayerInteractEvent event) {
370370
return;
371371
if (event.getAction() == Action.PHYSICAL)
372372
return;
373-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_9_R1) >= 0) {
373+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_9_R1)) {
374374
if (event.getHand() != null && event.getHand() == EquipmentSlot.OFF_HAND) {
375375
return;
376376
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetChickenator.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,7 @@ public static FireworkEffect getRandomFireworkEffect() {
7676
public void spawnRandomFirework(Location location) {
7777
final ArrayList<Firework> fireworks = new ArrayList<>();
7878
for (int i = 0; i < 4; i++) {
79-
Firework f;
80-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_16_R1) >= 0) {
81-
f = getPlayer().getWorld().spawn(location, Firework.class);
82-
} else {
83-
f = getPlayer().getWorld().spawn(location, Firework.class);
84-
}
85-
79+
Firework f = getPlayer().getWorld().spawn(location, Firework.class);
8680
FireworkMeta fm = f.getFireworkMeta();
8781
fm.addEffect(getRandomFireworkEffect());
8882
fm.setDisplayName("uc_firework");

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetPartyPopper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void onRightClick() {
2929
Vector rand = new Vector(Math.random() - 0.5D,
3030
Math.random() - 0.5D, Math.random() - 0.5D);
3131

32-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_14_R1) >= 0) {
32+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_14_R1)) {
3333
ItemStack randomDye = UCMaterial.DYES.get(MathUtils.random(0, 14)).parseItem();
3434
Vector v = getPlayer().getEyeLocation().getDirection().add(rand.multiply(0.2)).multiply(3.2);
3535
getPlayer().getWorld().spawnParticle(Particle.ITEM_CRACK, getPlayer().getEyeLocation(), 10, v.getX(), v.getY(), v.getZ(),

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetSmashDown.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void onBlockChangeState(EntityChangeBlockEvent event) {
157157
event.setCancelled(true);
158158
fallingBlocks.remove(event.getEntity());
159159
FallingBlock fb = (FallingBlock) event.getEntity();
160-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_16_R1) >= 0) {
160+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_16_R1)) {
161161
BlockData data = fb.getBlockData();
162162
fb.getWorld().spawnParticle(Particle.BLOCK_CRACK, fb.getLocation(), 50, 0, 0, 0, 0.4d, data);
163163
} else {

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/morphs/MorphChicken.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
5656
public void run() {
5757
chickens = new ArrayList<>();
5858
for (Item i : items) {
59-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_14_R1) >= 0) {
59+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_14_R1)) {
6060
i.getWorld().spawnParticle(Particle.BLOCK_CRACK, i.getLocation(), 0, 0, 0, 0, 0, UCMaterial.WHITE_TERRACOTTA.parseMaterial().createBlockData());
6161
} else {
6262
Particles.BLOCK_CRACK.display(new Particles.BlockData(BlockUtils.getOldMaterial("STAINED_CLAY"), (byte) 0), 0, 0, 0, 0.3f, 50, i.getLocation(), 128);

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/particleeffects/ParticleEffect.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ && getType() != ParticleEffectType.valueOf("enderaura")) {
6767
}
6868
}
6969
} else if (getType().getEffect() == Particles.ITEM_CRACK) {
70-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_14_R1) >= 0) {
70+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_14_R1)) {
7171
for (int i = 0; i < getModifiedAmount(15); i++) {
7272
getPlayer().getLocation().getWorld().spawnParticle(Particle.ITEM_CRACK, getPlayer().getLocation(), 1, 0.2, 0.2, 0.2, 0, UCMaterial.DYES.get(MathUtils.random(0, 14)).parseItem());
7373
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/particleeffects/ParticleEffectCrushedCandyCane.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void onUpdate() {
3838
double x = Math.cos(angle) * 1.1f;
3939
double z = Math.sin(angle) * 1.1f;
4040
center.add(x, 0, z);
41-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_14_R1) >= 0) {
41+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_14_R1)) {
4242
for (int i = 0; i < 15; i++) {
4343
ItemStack randomDye = UCMaterial.DYES.get(MathUtils.random(0, 14)).parseItem();
4444
getPlayer().getWorld().spawnParticle(Particle.ITEM_CRACK, getPlayer().getEyeLocation(), 1, 0.2d, 0.2d, 0.2d,

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/particleeffects/ParticleEffectFrozenWalk.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void onUpdate() {
3232
Location locationRight = getPlayer().getLocation().add(vectorRight);
3333
locationLeft.setY(getPlayer().getLocation().getY());
3434
locationRight.setY(getPlayer().getLocation().getY());
35-
if (UltraCosmeticsData.get().getServerVersion().compareTo(ServerVersion.v1_14_R1) >= 0) {
35+
if (UltraCosmeticsData.get().getServerVersion().isAtLeast(ServerVersion.v1_14_R1)) {
3636
locationLeft.getWorld().spawnParticle(Particle.ITEM_CRACK, locationLeft, 0, 0, 0, 0, 0, UCMaterial.SNOW.parseItem());
3737
locationLeft.getWorld().spawnParticle(Particle.ITEM_CRACK, locationRight, 0, 0, 0, 0, 0, UCMaterial.SNOW.parseItem());
3838
} else {

0 commit comments

Comments
 (0)