Add setting for Foxes spawning with Glow Berries

openana · Jul 21, 2021 · 66d6287 · 66d6287
1 parent 83da516
commit 66d6287
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/datapack/data/skyblock/functions/enable_features.mcfunction b/datapack/data/skyblock/functions/enable_features.mcfunction
@@ -7,5 +7,6 @@ skyblock setDefault renewableDragonHeads true
 skyblock setDefault shulkerSpawning true
 skyblock setDefault renewableDiamonds true
 skyblock setDefault rammingWart true
+skyblock setDefault foxesSpawnWithGlowBerries true
 carpet setDefault desertShrubs true
 carpet setDefault renewableSponges true
diff --git a/src/main/java/com/jsorrell/skyblock/SkyBlockSettings.java b/src/main/java/com/jsorrell/skyblock/SkyBlockSettings.java
@@ -67,6 +67,12 @@ public class SkyBlockSettings {
       category = {SKYBLOCK, FEATURE})
   public static boolean rammingWart = false;
 
+  /* Foxes Spawn With Glow Berries */
+  @Rule(
+      desc = "A spawned fox has a chance to hold glow berries",
+      category = {SKYBLOCK, FEATURE})
+  public static boolean foxesSpawnWithGlowBerries = false;
+
   /* Useful Composters */
   public static boolean doUsefulComposters = false;
   public static boolean usefulCompostersNeedRedstone = false;

diff --git a/src/main/java/com/jsorrell/skyblock/mixin/FoxEntityMixin.java b/src/main/java/com/jsorrell/skyblock/mixin/FoxEntityMixin.java
@@ -14,6 +14,8 @@
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.World;
 
+import com.jsorrell.skyblock.SkyBlockSettings;
+
 @Mixin(FoxEntity.class)
 public abstract class FoxEntityMixin extends Entity {
   private FoxEntityMixin(EntityType<?> type, World world) {
@@ -28,12 +30,14 @@ private FoxEntityMixin(EntityType<?> type, World world) {
       cancellable = true,
       at = @At(value = "INVOKE", target = "Ljava/util/Random;nextFloat()F", ordinal = 1))
   private void addFoxHeldItem(LocalDifficulty difficulty, CallbackInfo ci) {
-    float f = this.random.nextFloat();
-    ItemStack equippedItem;
-    if (f < GLOW_BERRY_CHANCE) {
-      equippedItem = new ItemStack(Items.GLOW_BERRIES);
-      this.equipStack(EquipmentSlot.MAINHAND, equippedItem);
-      ci.cancel();
+    if (SkyBlockSettings.foxesSpawnWithGlowBerries) {
+      float f = this.random.nextFloat();
+      ItemStack equippedItem;
+      if (f < GLOW_BERRY_CHANCE) {
+        equippedItem = new ItemStack(Items.GLOW_BERRIES);
+        this.equipStack(EquipmentSlot.MAINHAND, equippedItem);
+        ci.cancel();
+      }
     }
   }
 }