From e843aa7c3dc8f2170ad75ab33af4c1d7b0c20171 Mon Sep 17 00:00:00 2001 From: TheWii <67249660+TheWii@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:02:08 -0300 Subject: [PATCH 1/3] Changed loading system - Implemented LanternMC Load; - Removed previous load method; --- datapack/data/load/functions/__init.mcfunction | 13 +++++++++++++ datapack/data/load/tags/functions/__init.json | 8 ++++++++ .../tags/functions/load.json} | 0 datapack/data/load/tags/functions/post_load.json | 3 +++ datapack/data/load/tags/functions/standard.json | 5 +++++ datapack/data/minecraft/tags/functions/load.json | 2 +- datapack/data/vplib/functions/load/init.mcfunction | 2 +- .../vplib/functions/math/v1/load/check.mcfunction | 2 +- .../functions/math/v1/load/enumerate.mcfunction | 2 ++ .../vplib/functions/math/v1/load/resolve.mcfunction | 2 ++ datapack/data/vplib/tags/functions/load/init.json | 6 ++++-- .../data/vplib/tags/functions/load/library.json | 8 -------- 12 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 datapack/data/load/functions/__init.mcfunction create mode 100644 datapack/data/load/tags/functions/__init.json rename datapack/data/{vplib/tags/functions/load/dependents.json => load/tags/functions/load.json} (100%) create mode 100644 datapack/data/load/tags/functions/post_load.json create mode 100644 datapack/data/load/tags/functions/standard.json delete mode 100644 datapack/data/vplib/tags/functions/load/library.json diff --git a/datapack/data/load/functions/__init.mcfunction b/datapack/data/load/functions/__init.mcfunction new file mode 100644 index 0000000..2627d46 --- /dev/null +++ b/datapack/data/load/functions/__init.mcfunction @@ -0,0 +1,13 @@ +# If you are a user of this library, do not modify this function, or you risk +# causing compatibility issues with other data packs. If you have a good reason +# to *add* something, feel free to make an issue on the GitHub for this project: +# https://github.com/LanternMC/Load + +# Add the common objective to be used for version resolution. +scoreboard objectives add load dummy + +# Reset all scores on this objective to allow for version resolution on reload. +scoreboard players reset * load + +# Call a nonexistent function to allow for this data pack to be extended later. +function load:__init2 \ No newline at end of file diff --git a/datapack/data/load/tags/functions/__init.json b/datapack/data/load/tags/functions/__init.json new file mode 100644 index 0000000..10cae07 --- /dev/null +++ b/datapack/data/load/tags/functions/__init.json @@ -0,0 +1,8 @@ +{ + "values": [ + "load:__init", + "#load:standard", + "#load:load", + "#load:post_load" + ] +} \ No newline at end of file diff --git a/datapack/data/vplib/tags/functions/load/dependents.json b/datapack/data/load/tags/functions/load.json similarity index 100% rename from datapack/data/vplib/tags/functions/load/dependents.json rename to datapack/data/load/tags/functions/load.json diff --git a/datapack/data/load/tags/functions/post_load.json b/datapack/data/load/tags/functions/post_load.json new file mode 100644 index 0000000..ee98a1b --- /dev/null +++ b/datapack/data/load/tags/functions/post_load.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/datapack/data/load/tags/functions/standard.json b/datapack/data/load/tags/functions/standard.json new file mode 100644 index 0000000..c790176 --- /dev/null +++ b/datapack/data/load/tags/functions/standard.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#vplib:load/init" + ] +} \ No newline at end of file diff --git a/datapack/data/minecraft/tags/functions/load.json b/datapack/data/minecraft/tags/functions/load.json index c790176..7bf2928 100644 --- a/datapack/data/minecraft/tags/functions/load.json +++ b/datapack/data/minecraft/tags/functions/load.json @@ -1,5 +1,5 @@ { "values": [ - "#vplib:load/init" + "#load:__init" ] } \ No newline at end of file diff --git a/datapack/data/vplib/functions/load/init.mcfunction b/datapack/data/vplib/functions/load/init.mcfunction index bdc04cc..6ee638c 100644 --- a/datapack/data/vplib/functions/load/init.mcfunction +++ b/datapack/data/vplib/functions/load/init.mcfunction @@ -1,6 +1,6 @@ #> vplib:load/init # Description: Initialize versioning objective and load core module. -# From: '#vplib:core/load/init(#minecraft:load)' +# From: '#vplib:core/load/init(#load:standard)' # Add Objective scoreboard objectives add vplib.load dummy diff --git a/datapack/data/vplib/functions/math/v1/load/check.mcfunction b/datapack/data/vplib/functions/math/v1/load/check.mcfunction index 4b58499..9bb4dd8 100644 --- a/datapack/data/vplib/functions/math/v1/load/check.mcfunction +++ b/datapack/data/vplib/functions/math/v1/load/check.mcfunction @@ -4,7 +4,7 @@ scoreboard players set #load vplib.load 1 ## Missing core -scoreboard players set #expected.vplib.core vplib.load 1 +scoreboard players set #expected.vplib.core vplib.load 2 execute unless score #vplib.core.current vplib.load >= #expected.vplib.core vplib.load run scoreboard players set #load vplib.load -1 execute if score #vplib.core.breaking vplib.load > #expected.vplib.core vplib.load run scoreboard players set #load vplib.load -2 diff --git a/datapack/data/vplib/functions/math/v1/load/enumerate.mcfunction b/datapack/data/vplib/functions/math/v1/load/enumerate.mcfunction index 5ee2619..0a9a784 100644 --- a/datapack/data/vplib/functions/math/v1/load/enumerate.mcfunction +++ b/datapack/data/vplib/functions/math/v1/load/enumerate.mcfunction @@ -1,4 +1,6 @@ #> vplib:math/v1/load/enumerate +# DEBUG +tellraw @a[tag=vplib.debug+] [{"text":"[Debug]: ","color":"yellow","bold":true},{"text":"Enumerated Vanilla+ Library: Math __ver","color":"white","bold":false}] # Set current version execute unless score #vplib.math.current vplib.load matches 1.. run scoreboard players set #vplib.math.current vplib.load 1 diff --git a/datapack/data/vplib/functions/math/v1/load/resolve.mcfunction b/datapack/data/vplib/functions/math/v1/load/resolve.mcfunction index b28bcb0..77763af 100644 --- a/datapack/data/vplib/functions/math/v1/load/resolve.mcfunction +++ b/datapack/data/vplib/functions/math/v1/load/resolve.mcfunction @@ -1,4 +1,6 @@ #> vplib:math/v1/load/resolve +# DEBUG +execute unless score #vplib.math.current vplib.load matches 1 run tellraw @a[tag=vplib.debug+] [{"text":"[Debug]: ","color":"yellow","bold":true},{"text":"Failed to resolve Vanilla+ Library: Math __ver","color":"white","bold":false}] # Load if lib version matches execute if score #vplib.math.current vplib.load matches 1 run function vplib:math/v1/load/check \ No newline at end of file diff --git a/datapack/data/vplib/tags/functions/load/init.json b/datapack/data/vplib/tags/functions/load/init.json index 7bd7756..8de2513 100644 --- a/datapack/data/vplib/tags/functions/load/init.json +++ b/datapack/data/vplib/tags/functions/load/init.json @@ -1,6 +1,8 @@ { "values": [ - "#vplib:load/library", - "#vplib:load/dependents" + "vplib:load/init", + "#vplib:load/enumerate", + "#vplib:load/resolve", + "#vplib:load/post" ] } \ No newline at end of file diff --git a/datapack/data/vplib/tags/functions/load/library.json b/datapack/data/vplib/tags/functions/load/library.json deleted file mode 100644 index 8de2513..0000000 --- a/datapack/data/vplib/tags/functions/load/library.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "vplib:load/init", - "#vplib:load/enumerate", - "#vplib:load/resolve", - "#vplib:load/post" - ] -} \ No newline at end of file From 7dd5028d2bed27f3ca3f84826ebd41a915309aab Mon Sep 17 00:00:00 2001 From: TheWii <67249660+TheWii@users.noreply.github.com> Date: Sun, 3 Jan 2021 20:41:17 -0300 Subject: [PATCH 2/3] Rearranged API and tweaked constants load function - Removed API function files, they were completely useless and added an extra function call layer to slowdown runtime instead of running the function tag directly. Now API description is inserted into the function tags; - The constants are loaded by Core module, Math only needs to load lcg now; --- .../math/api/color/hsv_to_rgb.mcfunction | 16 ---- .../functions/math/api/lcg/ranged.mcfunction | 10 --- .../math/api/lcg/reset_seed.mcfunction | 3 - .../math/api/lcg/simplified.mcfunction | 6 -- .../functions/math/api/power/solve.mcfunction | 11 --- .../math/api/quadratic/solve.mcfunction | 12 --- .../functions/math/api/sqrt/solve.mcfunction | 11 --- .../functions/math/api/uninstall.mcfunction | 3 - .../math/v1/api/sqrt/solve.mcfunction | 4 +- .../math/v1/core/constants.mcfunction | 73 +------------------ .../math/v1/lcg/reset_seed.mcfunction | 16 ++-- .../functions/math/v1/power/solve.mcfunction | 6 +- .../functions/math/api/color/hsv_to_rgb.json | 17 +++++ .../tags/functions/math/api/lcg/ranged.json | 11 +++ .../functions/math/api/lcg/reset_seed.json | 4 + .../functions/math/api/lcg/simplified.json | 7 ++ .../tags/functions/math/api/power/solve.json | 12 +++ .../functions/math/api/quadratic/solve.json | 13 ++++ .../tags/functions/math/api/sqrt/solve.json | 11 +++ 19 files changed, 88 insertions(+), 158 deletions(-) delete mode 100644 datapack/data/vplib/functions/math/api/color/hsv_to_rgb.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/lcg/ranged.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/lcg/reset_seed.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/lcg/simplified.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/power/solve.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/quadratic/solve.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/sqrt/solve.mcfunction delete mode 100644 datapack/data/vplib/functions/math/api/uninstall.mcfunction diff --git a/datapack/data/vplib/functions/math/api/color/hsv_to_rgb.mcfunction b/datapack/data/vplib/functions/math/api/color/hsv_to_rgb.mcfunction deleted file mode 100644 index 339f0a7..0000000 --- a/datapack/data/vplib/functions/math/api/color/hsv_to_rgb.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Description: Converts HSV(Hue, Saturation, Value) to RGB(Red, Green, Blue) color format. - -# INPUTS: -# #hsv.h vplib.math (0-100%/0-360º with scale factor = 100) -# #hsv.s vplib.math (0-100% percentage with scale factor = 100) -# #hsv.v vplib.math (0-100% percentage with scale factor = 100) -# #scale_factor vplib.math (Corresponds to the amount of decimals used in the inputs) -# #hsv.h_degrees vplib.math (0 = Hue is a 0-100 percentage, 1 = Hue is in 0-360 degrees) - -# OUTPUTS: -# #rgb.r vplib.math -# #rgb.g vplib.math -# #rgb.b vplib.math -# #rgb.int vplib.math (Ready to store in leather armor) - -function #vplib:math/api/color/hsv_to_rgb \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/lcg/ranged.mcfunction b/datapack/data/vplib/functions/math/api/lcg/ranged.mcfunction deleted file mode 100644 index 5db3a00..0000000 --- a/datapack/data/vplib/functions/math/api/lcg/ranged.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# Description: Generate a random number within a range. - -# Inputs: -# #min vplib.math -# #max vplib.math - -# Output: -# #output vplib.math - -function #vplib:math/api/lcg/ranged \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/lcg/reset_seed.mcfunction b/datapack/data/vplib/functions/math/api/lcg/reset_seed.mcfunction deleted file mode 100644 index a694be5..0000000 --- a/datapack/data/vplib/functions/math/api/lcg/reset_seed.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# Description: Reset LCG seed. - -function #vplib:math/api/lcg/reset_seed \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/lcg/simplified.mcfunction b/datapack/data/vplib/functions/math/api/lcg/simplified.mcfunction deleted file mode 100644 index f271568..0000000 --- a/datapack/data/vplib/functions/math/api/lcg/simplified.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Generate a random integer(-2146473648..2146473647). - -# Output: -# #output vplib.math - -function #vplib:math/api/lcg/simplified \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/power/solve.mcfunction b/datapack/data/vplib/functions/math/api/power/solve.mcfunction deleted file mode 100644 index 6d1a038..0000000 --- a/datapack/data/vplib/functions/math/api/power/solve.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Description: Solve power. Accepts both positive and negative exponents. - -# Inputs: -# #input vplib.math -# #exponent vplib.math -# #scale_factor vplib.math (only required with negative exponents) - -# Output: -# #output vplib.math - -function #vplib:math/api/power/solve \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/quadratic/solve.mcfunction b/datapack/data/vplib/functions/math/api/quadratic/solve.mcfunction deleted file mode 100644 index 8a432f5..0000000 --- a/datapack/data/vplib/functions/math/api/quadratic/solve.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# Description: Solve a quadratic equation(ax**2 + bx + c = 0) - -# Inputs: -# #input.a vplib.math (ax**2) -# #input.b vplib.math (bx) -# #input.c vplib.math (c) - -# Output: -# #sol1 vplib.math -# #sol2 vplib.math - -function #vplib:math/api/quadratic/solve \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/sqrt/solve.mcfunction b/datapack/data/vplib/functions/math/api/sqrt/solve.mcfunction deleted file mode 100644 index 862959f..0000000 --- a/datapack/data/vplib/functions/math/api/sqrt/solve.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Description: Compute square root. - -# Inputs: -# #input vplib.math -# #scale_factor vplib.math - -# Output: -# #output vplib.math - - -function #vplib:math/api/sqrt/solve \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/api/uninstall.mcfunction b/datapack/data/vplib/functions/math/api/uninstall.mcfunction deleted file mode 100644 index 3cc852f..0000000 --- a/datapack/data/vplib/functions/math/api/uninstall.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# Description: Uninstall module. - -function #vplib:math/api/uninstall \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/v1/api/sqrt/solve.mcfunction b/datapack/data/vplib/functions/math/v1/api/sqrt/solve.mcfunction index 96660ed..e9a080a 100644 --- a/datapack/data/vplib/functions/math/v1/api/sqrt/solve.mcfunction +++ b/datapack/data/vplib/functions/math/v1/api/sqrt/solve.mcfunction @@ -2,6 +2,4 @@ # From: #vplib:math/api/quadratic/solve # Run function if lib version matches -execute if score #vplib.math.current vplib.load matches 1 run function vplib:math/v1/sqrt/solve - -function vplib:math/api/sqrt/solve \ No newline at end of file +execute if score #vplib.math.current vplib.load matches 1 run function vplib:math/v1/sqrt/solve \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/v1/core/constants.mcfunction b/datapack/data/vplib/functions/math/v1/core/constants.mcfunction index 0ea67ea..a70c0dc 100644 --- a/datapack/data/vplib/functions/math/v1/core/constants.mcfunction +++ b/datapack/data/vplib/functions/math/v1/core/constants.mcfunction @@ -1,75 +1,4 @@ #> vplib:math/v1/core/constants -scoreboard players set #-1 vplib.math -1 -scoreboard players set #1 vplib.math 1 -scoreboard players set #2 vplib.math 2 -scoreboard players set #3 vplib.math 3 -scoreboard players set #4 vplib.math 4 -scoreboard players set #5 vplib.math 5 -scoreboard players set #6 vplib.math 6 -scoreboard players set #7 vplib.math 7 -scoreboard players set #8 vplib.math 8 -scoreboard players set #9 vplib.math 9 -scoreboard players set #10 vplib.math 10 -scoreboard players set #11 vplib.math 11 -scoreboard players set #12 vplib.math 12 -scoreboard players set #13 vplib.math 13 -scoreboard players set #14 vplib.math 14 -scoreboard players set #15 vplib.math 15 -scoreboard players set #16 vplib.math 16 -scoreboard players set #17 vplib.math 17 -scoreboard players set #18 vplib.math 18 -scoreboard players set #19 vplib.math 19 -scoreboard players set #20 vplib.math 20 -scoreboard players set #25 vplib.math 25 -scoreboard players set #30 vplib.math 30 -scoreboard players set #35 vplib.math 35 -scoreboard players set #32 vplib.math 32 -scoreboard players set #40 vplib.math 40 -scoreboard players set #45 vplib.math 45 -scoreboard players set #50 vplib.math 50 -scoreboard players set #55 vplib.math 55 -scoreboard players set #60 vplib.math 60 -scoreboard players set #64 vplib.math 64 -scoreboard players set #65 vplib.math 65 -scoreboard players set #70 vplib.math 70 -scoreboard players set #75 vplib.math 75 -scoreboard players set #80 vplib.math 80 -scoreboard players set #85 vplib.math 85 -scoreboard players set #90 vplib.math 90 -scoreboard players set #95 vplib.math 95 -scoreboard players set #100 vplib.math 100 -scoreboard players set #128 vplib.math 128 -scoreboard players set #256 vplib.math 256 -scoreboard players set #512 vplib.math 512 -scoreboard players set #1000 vplib.math 1000 -scoreboard players set #1024 vplib.math 1024 -scoreboard players set #2048 vplib.math 2048 -scoreboard players set #4096 vplib.math 4096 -scoreboard players set #8192 vplib.math 8192 -scoreboard players set #8192 vplib.math 8192 -scoreboard players set #10000 vplib.math 10000 -scoreboard players set #16384 vplib.math 16384 -scoreboard players set #32768 vplib.math 32768 -scoreboard players set #65536 vplib.math 65546 -scoreboard players set #100000 vplib.math 100000 -scoreboard players set #131072 vplib.math 131072 -scoreboard players set #262144 vplib.math 262144 -scoreboard players set #524288 vplib.math 524288 -scoreboard players set #1000000 vplib.math 1000000 -scoreboard players set #1048576 vplib.math 1048576 -scoreboard players set #2097152 vplib.math 2097152 -scoreboard players set #4194304 vplib.math 4194304 -scoreboard players set #8388608 vplib.math 8388608 -scoreboard players set #10000000 vplib.math 10000000 -scoreboard players set #16777216 vplib.math 16777216 -scoreboard players set #33554432 vplib.math 33554432 -scoreboard players set #67108864 vplib.math 67108864 -scoreboard players set #100000000 vplib.math 100000000 -scoreboard players set #134217728 vplib.math 134217728 -scoreboard players set #268435456 vplib.math 268435456 -scoreboard players set #536870912 vplib.math 536870912 -scoreboard players set #1000000000 vplib.math 1000000000 -scoreboard players set #1073741824 vplib.math 1073741824 - +# LCG scoreboard players set #lcg.multiplier vplib.math 1630111353 \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/v1/lcg/reset_seed.mcfunction b/datapack/data/vplib/functions/math/v1/lcg/reset_seed.mcfunction index 9f6be78..7b9d9a1 100644 --- a/datapack/data/vplib/functions/math/v1/lcg/reset_seed.mcfunction +++ b/datapack/data/vplib/functions/math/v1/lcg/reset_seed.mcfunction @@ -1,13 +1,13 @@ #> vplib:math/v1/lcg/reset_seed -# Summon AEC -execute at @e[limit=1] run summon minecraft:area_effect_cloud ~ ~ ~ {Duration:1,Tags:["vplib.uuid"]} +# Get starting seed from a temp AEC UUID +execute positioned -30000000 0 4320 run summon minecraft:area_effect_cloud ~ ~ ~ {Duration:1, UUID:[I; 43, 0, 0, 1], Tags:["vplib.uuid"]} +execute store result score #lcg.seed vplib.math run data get entity 2b-0-0-0-1 UUID[0] +kill 2b-0-0-0-1 -# Store UUID -execute store result score #lcg vplib.math run data get entity @e[type=area_effect_cloud,tag=vplib.uuid,limit=1] UUID[0] -# Kill AEC -kill @e[type=area_effect_cloud,tag=vplib.uuid,limit=1] +# Invert seed if negative +execute if score #lcg.seed vplib.math matches ..-1 run scoreboard players operation #lcg.seed vplib.math *= #-1 vplib.math -# Invert if negative -execute if score #lcg vplib.math matches ..-1 run scoreboard players operation #lcg vplib.math *= #-1 vplib.math \ No newline at end of file +# Init lcg score +scoreboard players operation #lcg vplib.math = #lcg.seed vplib.math \ No newline at end of file diff --git a/datapack/data/vplib/functions/math/v1/power/solve.mcfunction b/datapack/data/vplib/functions/math/v1/power/solve.mcfunction index 5d6d7a1..99eb686 100644 --- a/datapack/data/vplib/functions/math/v1/power/solve.mcfunction +++ b/datapack/data/vplib/functions/math/v1/power/solve.mcfunction @@ -1,13 +1,13 @@ #> vplib:math/v1/power/solve -# Set output +# Init output scoreboard players set #output vplib.math 1 -# Set loop +# Get loop length from exponent(always positive) scoreboard players operation #loop vplib.temp = #exponent vplib.math execute if score #loop vplib.temp matches ..-1 run scoreboard players operation #loop vplib.temp *= #-1 vplib.math -# Scale factor if exponent is negative +# Set default scale factor if exponent is negative execute unless score #scale_factor vplib.math matches 1.. run scoreboard players set #scale_factor vplib.math 1000 execute if score #exponent vplib.math matches ..-1 run scoreboard players operation #output vplib.math *= #scale_factor vplib.math diff --git a/datapack/data/vplib/tags/functions/math/api/color/hsv_to_rgb.json b/datapack/data/vplib/tags/functions/math/api/color/hsv_to_rgb.json index 3345a00..18ed0d8 100644 --- a/datapack/data/vplib/tags/functions/math/api/color/hsv_to_rgb.json +++ b/datapack/data/vplib/tags/functions/math/api/color/hsv_to_rgb.json @@ -1,4 +1,21 @@ { + "description": [ + " Converts HSV(Hue, Saturation, Value) to RGB(Red, Green, Blue) color format. ", + " ", + " INPUTS: ", + " #hsv.h vplib.math (0-100%/0-360º with scale factor = 100) ", + " #hsv.s vplib.math (0-100% percentage with scale factor = 100) ", + " #hsv.v vplib.math (0-100% percentage with scale factor = 100) ", + " #scale_factor vplib.math (Corresponds to the amount of decimals used in the inputs) ", + " #hsv.h_degrees vplib.math (0 = Hue is a 0-100 percentage, 1 = Hue is in 0-360 degrees) ", + " ", + " OUTPUTS: ", + " #rgb.r vplib.math ", + " #rgb.g vplib.math ", + " #rgb.b vplib.math ", + " #rgb.int vplib.math (Ready to store in leather armor) " + ], + "values": [ "vplib:math/v1/api/color/hsv_to_rgb" ] diff --git a/datapack/data/vplib/tags/functions/math/api/lcg/ranged.json b/datapack/data/vplib/tags/functions/math/api/lcg/ranged.json index be8337d..0a32b29 100644 --- a/datapack/data/vplib/tags/functions/math/api/lcg/ranged.json +++ b/datapack/data/vplib/tags/functions/math/api/lcg/ranged.json @@ -1,4 +1,15 @@ { + "description": [ + " Generate a random number within a range. ", + " ", + " INPUTS: ", + " #min vplib.math ", + " #max vplib.math ", + " ", + " OUTPUTS: ", + " #output vplib.math " + ], + "values": [ "vplib:math/v1/api/lcg/ranged" ] diff --git a/datapack/data/vplib/tags/functions/math/api/lcg/reset_seed.json b/datapack/data/vplib/tags/functions/math/api/lcg/reset_seed.json index 911a2c5..f49e48f 100644 --- a/datapack/data/vplib/tags/functions/math/api/lcg/reset_seed.json +++ b/datapack/data/vplib/tags/functions/math/api/lcg/reset_seed.json @@ -1,4 +1,8 @@ { + "description": [ + " Reset LCG seed. " + ], + "values": [ "vplib:math/v1/api/lcg/reset_seed" ] diff --git a/datapack/data/vplib/tags/functions/math/api/lcg/simplified.json b/datapack/data/vplib/tags/functions/math/api/lcg/simplified.json index 77bb61b..63d132c 100644 --- a/datapack/data/vplib/tags/functions/math/api/lcg/simplified.json +++ b/datapack/data/vplib/tags/functions/math/api/lcg/simplified.json @@ -1,4 +1,11 @@ { + "description": [ + " Generate a random integer(-2146473648..2146473647) ", + " ", + " OUTPUTS: ", + " #output vplib.math " + ], + "values": [ "vplib:math/v1/api/lcg/simplified" ] diff --git a/datapack/data/vplib/tags/functions/math/api/power/solve.json b/datapack/data/vplib/tags/functions/math/api/power/solve.json index a0711bc..e2b2e72 100644 --- a/datapack/data/vplib/tags/functions/math/api/power/solve.json +++ b/datapack/data/vplib/tags/functions/math/api/power/solve.json @@ -1,4 +1,16 @@ { + "description": [ + " Evaluate power. ", + " ", + " INPUTS: ", + " #input vplib.math ", + " #exponent vplib.math ", + " #scale_factor vplib.math (only required with negative exponents) ", + " ", + " OUTPUTS: ", + " #output vplib.math " + ], + "values": [ "vplib:math/v1/api/power/solve" ] diff --git a/datapack/data/vplib/tags/functions/math/api/quadratic/solve.json b/datapack/data/vplib/tags/functions/math/api/quadratic/solve.json index 07d0ee2..ab16d8e 100644 --- a/datapack/data/vplib/tags/functions/math/api/quadratic/solve.json +++ b/datapack/data/vplib/tags/functions/math/api/quadratic/solve.json @@ -1,4 +1,17 @@ { + "description": [ + " Solve the quadratic equation (Ax**2 + Bx + C = 0) ", + " ", + " INPUTS: ", + " #input.a vplib.math (Ax**2) ", + " #input.b vplib.math (Bx) ", + " #input.c vplib.math (C) ", + " ", + " OUTPUTS: ", + " #sol1 vplib.math ", + " #sol2 vplib.math " + ], + "values": [ "vplib:math/v1/api/quadratic/solve" ] diff --git a/datapack/data/vplib/tags/functions/math/api/sqrt/solve.json b/datapack/data/vplib/tags/functions/math/api/sqrt/solve.json index 596d0f9..d067e4a 100644 --- a/datapack/data/vplib/tags/functions/math/api/sqrt/solve.json +++ b/datapack/data/vplib/tags/functions/math/api/sqrt/solve.json @@ -1,4 +1,15 @@ { + "description": [ + " Compute square root. ", + " ", + " INPUTS: ", + " #input vplib.math ", + " #scale_factor vplib.math ", + " ", + " OUTPUTS: ", + " #output vplib.math " + + ], "values": [ "vplib:math/v1/api/sqrt/solve" ] From d947b6412209df6e9c06c45c94908bba222da312 Mon Sep 17 00:00:00 2001 From: TheWii <67249660+TheWii@users.noreply.github.com> Date: Mon, 14 Feb 2022 20:54:43 -0300 Subject: [PATCH 3/3] Update item command syntax to 1.17 --- .../functions/math/v1/color/hsv_to_rgb/armor.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datapack/data/vplib/functions/math/v1/color/hsv_to_rgb/armor.mcfunction b/datapack/data/vplib/functions/math/v1/color/hsv_to_rgb/armor.mcfunction index c4484cf..d6f2b02 100644 --- a/datapack/data/vplib/functions/math/v1/color/hsv_to_rgb/armor.mcfunction +++ b/datapack/data/vplib/functions/math/v1/color/hsv_to_rgb/armor.mcfunction @@ -4,10 +4,10 @@ data remove block -30000000 0 4320 Items # Set armor -replaceitem block -30000000 0 4320 container.0 minecraft:leather_boots{display:{color:0}} -replaceitem block -30000000 0 4320 container.1 minecraft:leather_leggings{display:{color:0}} -replaceitem block -30000000 0 4320 container.2 minecraft:leather_chestplate{display:{color:0}} -replaceitem block -30000000 0 4320 container.3 minecraft:leather_helmet{display:{color:0}} +item replace block -30000000 0 4320 container.0 with minecraft:leather_boots{display: {color: 0}} +item replace block -30000000 0 4320 container.1 with minecraft:leather_leggings{display: {color: 0}} +item replace block -30000000 0 4320 container.2 with minecraft:leather_chestplate{display: {color: 0}} +item replace block -30000000 0 4320 container.3 with minecraft:leather_helmet{display: {color: 0}} # Loop color scoreboard players operation $color vplib.math += $color_rate vplib.math