Merge pull request #75 from StanleyDudek/boost

Boost blocking

Author: StanleyDudek

Resources/Client/CEI.zip

@@ -2,7 +2,7 @@
 
 local M = {}
 
-local CEI_VERSION = "0.8.6"
+local CEI_VERSION = "0.8.7"
 local logTag = "CEI"
 local gui_module = require("ge/extensions/editor/api/gui")
 local gui = {setupEditorGuiTheme = nop}
@@ -23,6 +23,7 @@ local isFrozen = {}
 local resetsBlockedInputActions = {}
 local allResetsBlockedInputActions = {}
 local editorBlocked = {}
+local boostBlocked = { "funBoost", "funBoostBackwards", "funFling", "funFlingDownward" }
 local descriptions = {}
 local environmentValsSet = false
 local environmentVals = {}
@@ -65,6 +66,11 @@ local syncRequested = false
 local environmentDefaults = {}
 local environmentPause = false
 
+local b
+local bb
+local fu
+local fd
+
 local function getObject(className, preferredObjName)
     if envObjectIdCache[className] then
         return scenetree.findObjectById(envObjectIdCache[className])
@@ -199,6 +205,21 @@ local function rxConfigData(data)
     extensions.core_input_actionFilter.setGroup('cei2', editorBlocked)
     extensions.core_input_actionFilter.addAction(0, 'cei2', true)
 
+    if config.restrictions.boost == true then
+        core_funstuff.boost = function() end
+        core_funstuff.boostBackwards = function() end
+        core_funstuff.flingUpward = function() end
+        core_funstuff.flingDownward = function() end
+    else
+        core_funstuff.boost = b
+        core_funstuff.boostBackwards = bb
+        core_funstuff.flingUpward = fu
+        core_funstuff.flingDownward = fd
+    end
+
+    extensions.core_input_actionFilter.setGroup('boost', boostBlocked)
+    extensions.core_input_actionFilter.addAction(0, 'boost', config.restrictions.boost)
+
     if configValsSet == false then
         configVals.server = {}
         configVals.cobalt = {}
@@ -2998,6 +3019,42 @@ local function drawCEI()
                                 log('W', logTag, "CEISetRestrictions Called: " .. data)
                             end
                         end
+
+                        if im.TreeNode1("Boost") then
+                            im.SameLine()
+                            if im.SmallButton("Reset##boost") then
+                                local data = jsonEncode( { "boost", "default", "boost" } )
+                                TriggerServerEvent("CEISetRestrictions", data)
+                                log('W', logTag, "CEISetRestrictions Called: " .. data)
+                            end
+                            im.Indent()
+                            im.Text("Boost: ")
+                            if config.restrictions.boost then
+                                im.SameLine()
+                                if im.SmallButton("Blocked##boost") then
+                                    local data = jsonEncode( { "boost", false, "boost" } )
+                                    TriggerServerEvent("CEISetRestrictions", data)
+                                    log('W', logTag, "CEISetRestrictions Called: " .. data)
+                                end
+                            else
+                                im.SameLine()
+                                if im.SmallButton("Allowed##boost") then
+                                    local data = jsonEncode( { "boost", true, "boost" } )
+                                    TriggerServerEvent("CEISetRestrictions", data)
+                                    log('W', logTag, "CEISetRestrictions Called: " .. data)
+                                end
+                            end
+                            im.TreePop()
+                            im.Unindent()
+                        else
+                            im.SameLine()
+                            if im.SmallButton("Reset##boost") then
+                                local data = jsonEncode( { "boost", "default", "boost" } )
+                                TriggerServerEvent("CEISetRestrictions", data)
+                                log('W', logTag, "CEISetRestrictions Called: " .. data)
+                            end
+                        end
+
                         im.Unindent()
                     end
                 end
@@ -5795,6 +5852,12 @@ local function onWorldReadyState(state)
                 syncRequested = true
             end
         end
+        if core_funstuff then
+            b = core_funstuff.boost
+            bb = core_funstuff.boostBackwards
+            fu = core_funstuff.flingUpward
+            fd = core_funstuff.flingDownward
+        end
     end
 end
 

Resources/Client/CEI/lua/ge/extensions/CEI.lua

@@ -4,7 +4,7 @@ local M = {}
 
 M.COBALT_VERSION = "1.7.6"
 
-local CEI_VERSION = "0.8.6"
+local CEI_VERSION = "0.8.7"
 
 utils.setLogType("CEI",93)
 
@@ -110,6 +110,7 @@ config.restrictions.CEN.editorToggle_default = false
 config.restrictions.CEN.editorSafeModeToggle_default = false
 config.restrictions.CEN.objectEditorToggle_default = false
 config.restrictions.CEN.nodegrabberRender_default = false
+config.restrictions.boost_default = false
 config.restrictions.voteKick = {}
 config.restrictions.voteKick.voteKick_enabled_default = true
 
@@ -482,6 +483,8 @@ local defaultRestrictions = {
     objectEditorToggle =        {value = config.restrictions.CEN.objectEditorToggle_default},
     nodegrabberRender =         {value = config.restrictions.CEN.nodegrabberRender_default},
 
+    boost =                     {value = config.restrictions.boost_default},
+
     voteKick_enabled =          {value = config.restrictions.voteKick.voteKick_enabled_default}
 }
 
@@ -899,6 +902,8 @@ local function onInit()
     config.restrictions.CEN.objectEditorToggle =          CobaltDB.query("restrictions", "objectEditorToggle", "value")
     config.restrictions.CEN.nodegrabberRender =           CobaltDB.query("restrictions", "nodegrabberRender", "value")
 
+    config.restrictions.boost =                           CobaltDB.query("restrictions", "boost", "value")
+
     config.restrictions.voteKick.voteKick_enabled =       CobaltDB.query("restrictions", "voteKick_enabled", "value")
 
     config.nametags.settings.blockingEnabled =            CobaltDB.query("nametags", "blockingEnabled", "value")
@@ -1501,6 +1506,15 @@ function CEISetRestrictions(senderID, data)
                 CobaltDB.set("restrictions", key, "value", value)
             end
         end
+        if tag == "boost" then
+            if value == "default" then
+                config.restrictions[key] = config.restrictions[key .. "_default"]
+                CobaltDB.set("restrictions", key, "value", config.restrictions[key .. "_default"])
+            else
+                config.restrictions.boost = value
+                CobaltDB.set("restrictions", key, "value", value)
+            end
+        end
         if tag == "voteKick" then
             config.restrictions.voteKick["voteKick_enabled"] = value
             CobaltDB.set("restrictions", key, "value", value)