bump version + refactor NextFreeOffset a bit

changelog.md

@@ -1,4 +1,8 @@
 
+## v6.3.0
+
+ * Add Next Free Offset for Group IDs
+
 ## v6.2.1
 
  * Fix crash on mobile when typing in layer number

src/features/NextFreeOffset.cpp

@@ -7,6 +7,9 @@ using namespace geode::prelude;
 struct GroupIDAllocator {
     using ValueType = short;
 
+    static constexpr short MIN_VALUE = 1;
+    static constexpr short MAX_VALUE = 9999;
+
     static void init(std::span<GameObject*> const& objs, short upTo) {
         for (short v = 0; v < (upTo - 1); v += 1) {
             auto obj = objs[v / 10];
@@ -27,12 +30,6 @@ struct GroupIDAllocator {
         // https://stackoverflow.com/questions/2745074/fast-ceiling-of-an-integer-division-in-c-c
         return upTo / 10 + (upTo % 10 != 0);
     }
-    static short getMaxValue() {
-        return 9999;
-    }
-    static short getMinValue() {
-        return 1;
-    }
 };
 
 class $modify(SetGroupIDLayer) {

src/utils/NextFreeOffsetInput.hpp

@@ -10,8 +10,8 @@ concept NextFreeAllocator = requires(std::span<GameObject*> const& objs, C::Valu
     { C::init(objs, upTo) } -> std::same_as<void>;
     { C::uninit(objs, upTo) } -> std::same_as<void>;
     { C::getObjectCountToAllocate(upTo) } -> std::same_as<size_t>;
-    { C::getMinValue() } -> std::same_as<typename C::ValueType>;
-    { C::getMaxValue() } -> std::same_as<typename C::ValueType>;
+    { C::MIN_VALUE } -> std::convertible_to<typename C::ValueType>;
+    { C::MAX_VALUE } -> std::convertible_to<typename C::ValueType>;
 };
 
 class NextFreeOffsetInput : public CCNode, public TextInputDelegate {
@@ -26,10 +26,10 @@ class NextFreeOffsetInput : public CCNode, public TextInputDelegate {
     template <NextFreeAllocator Allocator>
     Allocator::ValueType getValue() const {
         if (auto value = numFromString<typename Allocator::ValueType>(m_input->getInput()->getString())) {
-            return clamp(value.unwrap(), Allocator::getMinValue(), Allocator::getMaxValue());
+            return clamp(value.unwrap(), Allocator::MIN_VALUE, Allocator::MAX_VALUE);
         }
         else {
-            return Allocator::getMinValue();
+            return Allocator::MIN_VALUE;
         }
     }
 };
@@ -117,7 +117,7 @@ FakeObjectsForNextFree<Allocator> addFakeObjects(NextFreeOffsetInput* input) {
     }
     auto upTo = input->template getValue<Allocator>();
     // Det krävs inte offsettera om vi räknar upp till det minsta
-    if (upTo == Allocator::getMinValue()) {
+    if (upTo == Allocator::MIN_VALUE) {
         return FakeObjectsForNextFree<Allocator>();
     }
     return FakeObjectsForNextFree<Allocator>(upTo);