😔

CleanroomMC · Mar 6, 2024 · fbbde53 · fbbde53
1 parent 34c9311
commit fbbde53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/src/main/java/com/cleanroommc/bogosorter/BogoSorter.java b/src/main/java/com/cleanroommc/bogosorter/BogoSorter.java
@@ -32,6 +32,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.time.LocalDate;
+import java.time.Month;
 
 @Mod(modid = BogoSorter.ID,
         name = BogoSorter.NAME,
@@ -159,6 +160,6 @@ public static boolean isExpandableInventoryLoaded() {
 
     public static boolean isAprilFools() {
         LocalDate date = LocalDate.now();
-        return date.getMonthValue() == 4 && date.getDayOfMonth() == 1;
+        return date.getMonth() == Month.APRIL && date.getDayOfMonth() == 1;
     }
 }
diff --git a/src/main/java/com/cleanroommc/bogosorter/common/config/BogoSorterConfig.java b/src/main/java/com/cleanroommc/bogosorter/common/config/BogoSorterConfig.java
@@ -33,7 +33,6 @@ public class BogoSorterConfig {
     public static final List<String> ORE_PREFIXES_LIST = new ArrayList<>();
 
     public static int buttonColor = 0xFFFFFFFF;
-    public static float baseBogoChance = 0.01f;
 
     @SideOnly(Side.CLIENT)
     public static void save(JsonObject json) {
@@ -45,7 +44,6 @@ public static void save(JsonObject json) {
         general.addProperty("sortSound", SortHandler.sortSound.getSoundName().toString());
         general.addProperty("buttonColor", "#" + Integer.toHexString(buttonColor));
         general.addProperty("_comment", "By setting the chance below to 0 you agree to have no humor and that you are boring.");
-        general.addProperty("baseBogoChance", baseBogoChance);
 
         json.add("General", general);
 
@@ -86,7 +84,6 @@ public static void load(JsonObject json) {
                 SortHandler.sortSound = SoundEvents.UI_BUTTON_CLICK;
             }
             buttonColor = JsonHelper.getColor(general, 0xFFFFFFFF, "buttonColor");
-            baseBogoChance = MathHelper.clamp(JsonHelper.getFloat(general, 0.01f, "baseBogoChance"), 0f, 1f);
         }
         sortRules.clear();
         if (json.has("ItemSortRules")) {

diff --git a/src/main/java/com/cleanroommc/bogosorter/common/sort/SortHandler.java b/src/main/java/com/cleanroommc/bogosorter/common/sort/SortHandler.java
@@ -41,14 +41,6 @@ public static void playSortSound() {
         Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(sound, 1f));
     }
 
-    private static float getBogoChance() {
-        float f = BogoSorterConfig.baseBogoChance;
-        if (BogoSorter.isAprilFools()) {
-            return f < 0.01 ? 0.2f : Math.min(f * 20, 1f);
-        }
-        return f;
-    }
-
     private final EntityPlayer player;
     private final Container container;
     private final GuiSortingContext context;
@@ -91,8 +83,7 @@ public void sort(int slotId, boolean sync) {
 
     public void sort(SlotGroup slotGroup, boolean sync) {
         if (slotGroup != null) {
-            float chance = getBogoChance();
-            if (chance > 0 && BogoSorter.RND.nextFloat() < getBogoChance()) {
+            if (BogoSorter.isAprilFools() && BogoSorter.RND.nextFloat() < 0.01f) {
                 sortBogo(slotGroup);
                 this.player.sendMessage(new TextComponentString("Get Bogo'd!"));
             } else {