ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Halloween API

Browse source
This commit is contained in:
SoSeDiK 2024-05-01 16:37:13 +03:00
parent b8c454c2ba
commit 3923c2ec3f
2 changed files with 225 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
patches/api/0475-Add-Halloween-API.patch Normal file
View file

@ -0,0 +1,116 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SoSeDiK <mrsosedik@gmail.com>
Date: Wed, 1 May 2024 16:26:13 +0300
Subject: [PATCH] Add Halloween API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..5820c0b6f0d95c197c0d9e4beb1bb9130cd53c7e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2903,6 +2903,55 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
+ // Paper start - Add Halloween API
+ /**
+ * Checks whether it's Halloween season
+ * (between October 20 and November 3).
+ * <br>
+ * During Halloween season, bats can spawn
+ * at a light level of 6 or less instead of
+ * the normal light level 3 or less.
+ *
+ * @return whether it's Halloween season
+ */
+ public static boolean isHalloweenSeason() {
+ return server.isHalloweenSeason();
+ }
+
+ /**
+ * Checks whether it's Halloween day
+ * (October 31).
+ * <br>
+ * On Halloween day, some mobs have a chance
+ * to spawn wearing a pumpkin or jack o'lantern.
+ *
+ * @return whether it's Halloween day
+ */
+ public static boolean isHalloweenDay() {
+ return server.isHalloweenDay();
+ }
+
+ /**
+ * Sets Halloween season into a forced state
+ *
+ * @param state state
+ * @see #isHalloweenSeason()
+ */
+ public static void setHalloweenSeason(@NotNull net.kyori.adventure.util.TriState state) {
+ server.setHalloweenSeason(state);
+ }
+
+ /**
+ * Sets Halloween day into a forced state
+ *
+ * @param state state
+ * @see #isHalloweenDay()
+ */
+ public static void setHalloweenDay(@NotNull net.kyori.adventure.util.TriState state) {
+ server.setHalloweenDay(state);
+ }
+ // Paper end - Add Halloween API
+
@NotNull
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 27084402cf0e46dcd171074629b7c4156e48aa44..4dd5751ab97110a232a17bccb385fb6267a2b7d2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2537,4 +2537,45 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API
+
+ // Paper start - Add Halloween API
+ /**
+ * Checks whether it's Halloween season
+ * (between October 20 and November 3).
+ * <br>
+ * During Halloween season, bats can spawn
+ * at a light level of 6 or less instead of
+ * the normal light level 3 or less.
+ *
+ * @return whether it's Halloween season
+ */
+ boolean isHalloweenSeason();
+
+ /**
+ * Checks whether it's Halloween day
+ * (October 31).
+ * <br>
+ * On Halloween day, some mobs have a chance
+ * to spawn wearing a pumpkin or jack o'lantern.
+ *
+ * @return whether it's Halloween day
+ */
+ boolean isHalloweenDay();
+
+ /**
+ * Sets Halloween season into a forced state
+ *
+ * @param state state
+ * @see #isHalloweenSeason()
+ */
+ void setHalloweenSeason(@NotNull net.kyori.adventure.util.TriState state);
+
+ /**
+ * Sets Halloween day into a forced state
+ *
+ * @param state state
+ * @see #isHalloweenDay()
+ */
+ void setHalloweenDay(@NotNull net.kyori.adventure.util.TriState state);
+ // Paper end - Add Halloween API
}

109
patches/server/1045-Add-Halloween-API.patch Normal file
View file

@ -0,0 +1,109 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SoSeDiK <mrsosedik@gmail.com>
Date: Wed, 1 May 2024 16:26:13 +0300
Subject: [PATCH] Add Halloween API
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index dc27ddf5131e7398a5390a5187261d4c7fb6ccaa..8eef60c1a3e6376955fde95a75a888b0b2028d77 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -240,11 +240,7 @@ public class Bat extends AmbientCreature {
}
private static boolean isHalloween() {
- LocalDate localdate = LocalDate.now();
- int i = localdate.get(ChronoField.DAY_OF_MONTH);
- int j = localdate.get(ChronoField.MONTH_OF_YEAR);
-
- return j == 10 && i >= 20 || j == 11 && i <= 3;
+ return org.bukkit.Bukkit.isHalloweenSeason(); // Paper - Add Halloween API
}
private void setupAnimationStates() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
index 0c5fe46d2da113beff3e220843593d616e37d4ca..f370aaff2e7f6cba19ede5cc624b351f6dcc338a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
@@ -153,11 +153,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
this.reassessWeaponGoal();
this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot
if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
- LocalDate localdate = LocalDate.now();
- int i = localdate.get(ChronoField.DAY_OF_MONTH);
- int j = localdate.get(ChronoField.MONTH_OF_YEAR);
-
- if (j == 10 && i == 31 && randomsource.nextFloat() < 0.25F) {
+ if (org.bukkit.Bukkit.isHalloweenDay() && randomsource.nextFloat() < 0.25F) { // Paper - Add Halloween API
this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(randomsource.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN));
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index e42dfc62bb179be1ab01b0096c05c6549d38abbc..9bb42bee96cd4853a03230556b9ed35eb5eab8b4 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -541,11 +541,7 @@ public class Zombie extends Monster {
}
if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
- LocalDate localdate = LocalDate.now();
- int i = localdate.get(ChronoField.DAY_OF_MONTH);
- int j = localdate.get(ChronoField.MONTH_OF_YEAR);
-
- if (j == 10 && i == 31 && randomsource.nextFloat() < 0.25F) {
+ if (org.bukkit.Bukkit.isHalloweenDay() && randomsource.nextFloat() < 0.25F) { // Paper - Add Halloween API
this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(randomsource.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN));
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 05e304f9fc8d0291fa779da589bd060ef4165b49..2c0bc756e11be0130a8a90a4b6124bcc38cf449d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -309,6 +309,8 @@ public final class CraftServer implements Server {
public static Exception excessiveVelEx; // Paper - Velocity warnings
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
+ private net.kyori.adventure.util.TriState halloweenSeason = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Add Halloween API
+ private net.kyori.adventure.util.TriState halloweenDay = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Add Halloween API
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3278,4 +3280,38 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end
+
+ // Paper start - Add Halloween API
+ @Override
+ public boolean isHalloweenSeason() {
+ if (this.halloweenSeason != net.kyori.adventure.util.TriState.NOT_SET) {
+ return this.halloweenSeason.toBooleanOrElse(false);
+ }
+ java.time.LocalDate localdate = java.time.LocalDate.now();
+ int day = localdate.getDayOfMonth();
+ int month = localdate.getMonthValue();
+ return month == 10 && day >= 20 || month == 11 && day <= 3;
+ }
+
+ @Override
+ public boolean isHalloweenDay() {
+ if (this.halloweenDay != net.kyori.adventure.util.TriState.NOT_SET) {
+ return this.halloweenDay.toBooleanOrElse(false);
+ }
+ java.time.LocalDate localdate = java.time.LocalDate.now();
+ return localdate.getMonthValue() == 10 && localdate.getDayOfMonth() == 31;
+ }
+
+ @Override
+ public void setHalloweenSeason(net.kyori.adventure.util.TriState state) {
+ java.util.Objects.requireNonNull(state, "state may not be null");
+ this.halloweenSeason = state;
+ }
+
+ @Override
+ public void setHalloweenDay(net.kyori.adventure.util.TriState state) {
+ java.util.Objects.requireNonNull(state, "state may not be null");
+ this.halloweenDay = state;
+ }
+ // Paper end - Add Halloween API
}