Skip to content

Switch to letter format #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aunncodes merged 1 commit into from
Aug 14, 2025
Merged

Switch to letter format #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 114 additions & 114 deletions data/code/function/jei/barrels.mcfunction
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions data/code/function/shop_pages.mcfunction
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/numeral/function/format/format.1.2.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ scoreboard players operation #A numeral /= #0m numeral
scoreboard players operation #frac numeral = #A numeral
scoreboard players operation #frac numeral %= #10 numeral
scoreboard players operation #A numeral /= #10 numeral
data modify storage numeral:temp number.mul set value "e15"
data modify storage numeral:temp number.mul set value "Qa"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.2.0.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
execute store result score #frac numeral run data get storage numeral:io A[1]
scoreboard players operation #frac numeral /= #0b numeral
scoreboard players operation #frac numeral %= #10 numeral
data modify storage numeral:temp number.mul set value "e18"
data modify storage numeral:temp number.mul set value "Qu"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.2.1.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ scoreboard players operation #A numeral /= #0k numeral
scoreboard players operation #frac numeral = #A numeral
scoreboard players operation #frac numeral %= #10 numeral
scoreboard players operation #A numeral /= #10 numeral
data modify storage numeral:temp number.mul set value "e21"
data modify storage numeral:temp number.mul set value "Sx"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.2.2.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ scoreboard players operation #A numeral /= #0m numeral
scoreboard players operation #frac numeral = #A numeral
scoreboard players operation #frac numeral %= #10 numeral
scoreboard players operation #A numeral /= #10 numeral
data modify storage numeral:temp number.mul set value "e24"
data modify storage numeral:temp number.mul set value "Sp"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.3.0.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
execute store result score #frac numeral run data get storage numeral:io A[2]
scoreboard players operation #frac numeral /= #0b numeral
scoreboard players operation #frac numeral %= #10 numeral
data modify storage numeral:temp number.mul set value "e27"
data modify storage numeral:temp number.mul set value "Oc"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.3.1.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ scoreboard players operation #A numeral /= #0k numeral
scoreboard players operation #frac numeral = #A numeral
scoreboard players operation #frac numeral %= #10 numeral
scoreboard players operation #A numeral /= #10 numeral
data modify storage numeral:temp number.mul set value "e30"
data modify storage numeral:temp number.mul set value "No"
function numeral:format/gen
2 changes: 1 addition & 1 deletion data/numeral/function/format/format.3.2.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ scoreboard players operation #A numeral /= #0m numeral
scoreboard players operation #frac numeral = #A numeral
scoreboard players operation #frac numeral %= #10 numeral
scoreboard players operation #A numeral /= #10 numeral
data modify storage numeral:temp number.mul set value "e33"
data modify storage numeral:temp number.mul set value "Dc"
function numeral:format/gen
2 changes: 1 addition & 1 deletion generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ def number_to_numeral(n):
def number_to_human(n):
if n < 1000:
return str(n)
mul = ["","k","M","B","T","e15","e18","e21","e24","e27","e30","e33"]
mul = ["","k","M","B","T","Qa","Qu","Sx","Sp","Oc","No","Dc"]
i = 0
while n >= 1000:
n = n / 1000
Expand Down