Skip to content

Commit 0de1d52

Browse files
LoweredgamesLoweredgames
authored
Merge pull request #439 from Loweredgames/port-26.1-new
Port 26.1 (Su Main)
2 parents 78b7e55 + 709c1e1 commit 0de1d52

File tree

1,074 files changed

+197
-18569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,074 files changed

+197
-18569
lines changed

‎Resources Pack/pack.mcmeta‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"pack": {
3-
"pack_format": 75,
4-
"min_format": [65, 0],
5-
"max_format": [75, 0],
6-
"supported_formats": {
7-
"min_inclusive": 65, "max_inclusive": 75 },
3+
"min_format": [76, 0],
4+
"max_format": [76, 0],
85
"description": "Voidblock By Lorenzo Giannini"
96
},
107
"language": {

‎datapacks/Voidblock datapacks/data/voidblock/function/setup_global.mcfunction‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,4 @@ function voidblock:structures/wall_texts_sign
1818

1919
##SCOREBOARD PID VERSIONS RESET LOOP (AGGIUNGERE IL LOOP)
2020
execute as @a[scores={PID_1_mctest=2000000..}] run scoreboard players set @a PID_1_mctest 10000
21-
execute as @a[scores={PID_1_mc121=2000000..}] run scoreboard players set @a PID_1_mc121 10000
22-
execute as @a[scores={PID_1_mc1212=2000000..}] run scoreboard players set @a PID_1_mc1212 10000
23-
execute as @a[scores={PID_1_mc1214=2000000..}] run scoreboard players set @a PID_1_mc1214 10000
24-
execute as @a[scores={PID_1_mc1215=2000000..}] run scoreboard players set @a PID_1_mc1215 10000
25-
execute as @a[scores={PID_1_mc1216=2000000..}] run scoreboard players set @a PID_1_mc1216 10000
26-
execute as @a[scores={PID_1_mc12110=2000000..}] run scoreboard players set @a PID_1_mc12110 10000
27-
execute as @a[scores={PID_1_mc12111=2000000..}] run scoreboard players set @a PID_1_mc12111 10000
21+
execute as @a[scores={PID_0_mc261=2000000..}] run scoreboard players set @a PID_0_mc261 10000

‎datapacks/Voidblock datapacks/data/voidblock/function/versions/changelog/building.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ bossbar set minecraft:building max 100
1717

1818

1919
##BUILDING VERSION NUMBER (NUMERO DELLA VERSIONE VISTO IN ALTRO, SOLO NELLE VERSIONI DI SVILUPPO)
20-
bossbar set building name {"text":"JE-1.21>1.21.11-7.2.X-Voidblock:RELEASE_CANDIDATE-1_LTS","color":"white","bold":true}
20+
bossbar set building name {"text":"JE-26.1-7.3.0-Voidblock:RELEASE_CANDIDATE-1","color":"white","bold":true}
2121

2222

2323
##MAP PROGRESS (I PROGRESSI DELLA MAPPA, E UN NUMERO APROSSIMATO)
24-
bossbar set minecraft:building value 100
24+
bossbar set minecraft:building value 90
2525

2626

2727
###BOSSBAR: IN QUESTA CUSTOM MAP LA BOSSBAR E LOCALE CHE GLOBALE. DA ABBILITARE SU VERSION_PVN. DA TENERE DISABILITATO QUI

‎datapacks/Voidblock datapacks/data/voidblock/function/versions/changelog/building_version.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
"Edition": "JAVA EDITION",
55

6-
"Release Versions": "7.2.0 LTS [Rebranding Update]",
6+
"Release Versions": "7.3.0 [Rebranding Update]",
77

8-
"Release Building": "JE-1.21>1.21.11-7.2.X-Voidblock:RELEASE_CANDIDATE-1_LTS",
8+
"Release Building": "JE-26.1-7.3.0-Voidblock:RELEASE_CANDIDATE-1",
99

10-
"Nightly Building": "JE-1.21>1.21.11-7.2.X-Voidblock:NIGHTLY_BUILDING_30.12.2025.41615a_[main]",
10+
"Nightly Building": "JE-26.1-7.3.0-Voidblock:NIGHTLY_BUILDING_31.12.2025.21558a_[main]",
1111

1212
"Data_pack": "TRUE",
1313

@@ -17,13 +17,13 @@
1717

1818
"Custom Structures World": "4.1.1",
1919

20-
"Protocol Version": "PVN_0_mc12111a",
20+
"Protocol Version": "PVN_0_mc261a",
2121

22-
"Protocol Identifier Data": "PID_1_mc12111",
22+
"Protocol Identifier Data": "PID_0_mc261",
2323

24-
"Sub Protocol Identifier Data": "SUBPID_1_mc12111",
24+
"Sub Protocol Identifier Data": "SUBPID_0_mc261",
2525

26-
"Github_Tag": "1.21.11_JE-0a",
26+
"Github_Tag": "26.1_JE-0a",
2727

2828
"Github":"https://github.com/Loweredgames/Voidblock",
2929

‎datapacks/Voidblock datapacks/data/voidblock/function/versions/pid_remove.mcfunction‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,19 @@
99

1010

1111
##26.1 - FUTURA (PROSSIMA VERSIONE)
12+
#scoreboard objectives remove PID_0_mc261
1213

1314

14-
##1.21/1.21.1/1.21.2/1.21.3/1.21.4/1.21.5/1.21.6/1.21.7/1.21.8/1.21.9/1.21.10 - STABILE <-- QUI (DA DISABILITARE)
15+
##1.21/1.21.1/1.21.2/1.21.3/1.21.4/1.21.5/1.21.6/1.21.7/1.21.8/1.21.9/1.21.10/1.21.11 - STABILE <-- QUI (DA DISABILITARE)
1516
#scoreboard objectives remove PID_1_mc12111
1617
#scoreboard objectives remove PID_1_mc12110
17-
#scoreboard objectives remove PID_1_mc12110
18+
#scoreboard objectives remove PID_1_mc1219
1819
#scoreboard objectives remove PID_1_mc1216
1920
#scoreboard objectives remove PID_1_mc1215
2021
#scoreboard objectives remove PID_1_mc1214
2122
#scoreboard objectives remove PID_1_mc1212
2223
#scoreboard objectives remove PID_1_mc121
2324
#scoreboard objectives remove PID_1_mctest
24-
25-
26-
##1.21/1.21.1/1.21.2/1.21.3/1.21.4/1.21.5/1.21.6/1.21.7/1.21.8/1.21.9 - VECCHIA STABILE (PRONTI PER IL PID_OLD, DA DISABILITARE)
2725
#scoreboard objectives remove PID_0_mctest
2826
#scoreboard objectives remove PID_0_mc1219
2927
#scoreboard objectives remove PID_0_mc1216

‎datapacks/Voidblock datapacks/data/voidblock/function/versions/pvn_remove.mcfunction‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212

1313

1414
##26.1 - STABILE <-- QUI
15+
#scoreboard objectives remove PVN_0_mc261a
1516

1617

1718
##1.21/1.21.1/1.21.2/1.21.3/1.21.4/1.21.5/1.21.6/1.21.7/1.21.8/1.21.9/1.21.10/1.21.11 - LTS STABILE
18-
#scoreboard objectives remove PVN_0_mc12111a
19+
scoreboard objectives remove PVN_0_mc12111a
1920
scoreboard objectives remove PVN_0_mc12110
2021
scoreboard objectives remove PVN_0_mc1219
2122
scoreboard objectives remove PVN_0_mc1219e
@@ -45,7 +46,7 @@ scoreboard objectives remove 1.21_PVN_0a
4546

4647

4748
##1.20.6 - LTS STABILE
48-
#scoreboard objectives remove 1.20.6_PVN_0 (da aggiungere nella ???)
49+
scoreboard objectives remove 1.20.6_PVN_0
4950
scoreboard objectives remove 1.20.6_PVN_0d
5051
scoreboard objectives remove 1.20.6_PVN_0c
5152
scoreboard objectives remove 1.20.6_PVN_0b

generated-DELETED/IT_MUST_BE_REMOVED renamed to datapacks/Voidblock datapacks/legacy_voidblock/data/voidblock_legacy/function/legacy_remove/_

File renamed without changes.

‎datapacks/Voidblock datapacks/legacy_voidblock/data/voidblock_legacy/function/legacy_remove/multiplayer_legacy.mcfunction‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎datapacks/Voidblock datapacks/legacy_voidblock/data/voidblock_legacy/function/legacy_remove/nightly_building.mcfunction‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎datapacks/Voidblock datapacks/legacy_voidblock/data/voidblock_legacy/function/legacy_remove/refactoring_scoreboard.mcfunction‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)