Skip to content

Commit adcb4c4

Browse files
NincodedoNincodedo
authored
Update to Minecraft 1.20.4 (#170)
* Update pack format to 16 * Replace rng calls with `random` command * Updates to Minecraft 1.20.2 * Datapack updates for 1.20.3 * Update to Minecraft 1.20.4 * Fix server MOTD * Update mods Inventory Sorting hasn't been updated to 1.20.4 yet * Add Inventory Sorting mod it is now updated :D * Update resource pack * Remove cool colors from sheep farm map Might be a bug in 1.20.4? Not sure, but it don't work anymore. Closes #169 * Update to latest Bedrock Bonemeal
1 parent 60eaa7a commit adcb4c4

12 files changed

Lines changed: 33 additions & 86 deletions

File tree

‎Dockerfile-mc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
FROM debian:stable-slim AS build
33

4-
ARG bedrock_bone_meal_version=1.2.0+1.20
4+
ARG bedrock_bone_meal_version=1.2.1+1.20
55

66
RUN apt-get update \
77
&& apt-get install zip wget ca-certificates -y --no-install-recommends \
@@ -23,7 +23,7 @@ RUN wget -O /datapacks/bedrock-bone-meal.zip https://github.com/Nincodedo/mc-jav
2323

2424
FROM itzg/minecraft-server:2024.4.1
2525

26-
ENV MODRINTH_PROJECTS=fabric-api,cloth-config,lithium,ferrite-core,starlight,fastback,chunky,no-chat-reports,disableinsecurechattoast,inventory-sorting,jamlib,rightclickharvest,jade,rei,memoryleakfix,mc-server-description
26+
ENV MODRINTH_PROJECTS=fabric-api,cloth-config,lithium,ferrite-core,starlight,fastback,chunky,no-chat-reports,disableinsecurechattoast,inventory-sorting,jamlib,architectury-api,rightclickharvest,jade,rei,memoryleakfix,mc-server-description
2727

2828
ENV DATAPACKS=/datapacks/ocw-stuff.zip,/datapacks/who-did-this.zip,/datapacks/bedrock-bone-meal.zip,/datapacks/custom-compostables.zip
2929
RUN mkdir -p /datapacks

‎datapacks/custom-compostables/pack.mcmeta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"pack": {
3-
"pack_format": 15,
3+
"pack_format": 26,
44
"description": "Custom Compostables v0.1.0 by Nincodedo"
55
}
66
}

‎datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_map.json‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -137,43 +137,10 @@
137137
{
138138
"function": "minecraft:set_name",
139139
"entity": "this",
140-
"name": [
141-
{
142-
"text": "Anci",
143-
"color": "red",
144-
"italic": false,
145-
"extra": [
146-
{
147-
"text": "ent ",
148-
"color": "orange",
149-
"extra": [
150-
{
151-
"text": "OCW ",
152-
"color": "yellow",
153-
"extra": [
154-
{
155-
"text": "Stru",
156-
"color": "green",
157-
"extra": [
158-
{
159-
"text": "ctur",
160-
"color": "blue",
161-
"extra": [
162-
{
163-
"text": "e Map",
164-
"color": "purple"
165-
}
166-
]
167-
}
168-
]
169-
}
170-
]
171-
}
172-
]
173-
}
174-
]
175-
}
176-
]
140+
"name": {
141+
"text": "Ancient OCW Structure Map",
142+
"italic": false
143+
}
177144
}
178145
]
179146
},

‎datapacks/ocw-stuff/data/nincodedo/tags/blocks/any_grass.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"values": [
33
"minecraft:tall_grass",
4-
"minecraft:grass",
4+
"minecraft:short_grass",
55
"minecraft:dead_bush",
66
"minecraft:fern",
77
"minecraft:large_fern"

‎datapacks/ocw-stuff/data/nincodedo/tags/blocks/cannot_place_torch_on_side_of.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"minecraft:air",
44
"minecraft:cave_air",
55
"minecraft:void_air",
6-
"minecraft:grass",
6+
"minecraft:short_grass",
77
"minecraft:tall_grass",
88
"minecraft:dead_bush",
99
"minecraft:fern",

‎datapacks/ocw-stuff/data/nincodedo/tags/blocks/cannot_place_torch_on_top_of.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"minecraft:air",
44
"minecraft:cave_air",
55
"minecraft:void_air",
6-
"minecraft:grass",
6+
"minecraft:short_grass",
77
"minecraft:tall_grass",
88
"minecraft:dead_bush",
99
"minecraft:fern",

‎datapacks/ocw-stuff/pack.mcmeta‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
"pack": {
3-
"pack_format": 15,
3+
"pack_format": 26,
44
"description": "OCW Stuff"
55
},
66
"features": {
77
"enabled": [
88
"vanilla",
9-
"bundle"
9+
"bundle",
10+
"trade_rebalance",
11+
"update_1_21"
1012
]
1113
}
1214
}

‎datapacks/who-did-this/data/youdidthis/functions/random_text.mcfunction‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
execute store result score text_rng rhcdata run loot spawn ~ ~ ~ loot youdidthis:rng
1+
execute store result score text_rng rhcdata run random value 1..4
22
execute if score text_rng_prev rhcdata = text_rng rhcdata run scoreboard players add text_rng rhcdata 1
33
execute if score text_rng rhcdata matches 5.. run scoreboard players set text_rng rhcdata 1
4-
execute if score text_rng rhcdata matches 1 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"how could you","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "tl_text"],interpolation_duration:20}
5-
execute if score text_rng rhcdata matches 2 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"wow","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "tr_text"],interpolation_duration:20}
6-
execute if score text_rng rhcdata matches 3 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"nice one","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "br_text"],interpolation_duration:20}
7-
execute if score text_rng rhcdata matches 4 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"wau","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "bl_text"],interpolation_duration:0}
4+
execute if score text_rng rhcdata matches 1 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"how could you","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "tl_text"],interpolation_duration:20,teleport_duration:1}
5+
execute if score text_rng rhcdata matches 2 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"wow","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "tr_text"],interpolation_duration:20,teleport_duration:1}
6+
execute if score text_rng rhcdata matches 3 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"nice one","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "br_text"],interpolation_duration:20,teleport_duration:1}
7+
execute if score text_rng rhcdata matches 4 anchored eyes run summon text_display ^-2 ^ ^ {width:0.5f,billboard:"center",line_width:50,text:'{"text":"wau","color":"red"}',background:16777215,shadow:1b,Tags:["youdidthistext", "bl_text"],interpolation_duration:0,teleport_duration:1}
88
execute if score text_rng rhcdata matches 4 run data merge entity @e[tag=bl_text,sort=nearest,limit=1] {transformation:{right_rotation:[0f,0f,-0.25f,1f]},start_interpolation:-1}
99
execute if score text_rng rhcdata matches 4 run data merge entity @e[tag=bl_text,sort=nearest,limit=1] {interpolation_duration:20}
1010
playsound minecraft:entity.wither.hurt master @s ~ ~ ~ .75 .2

‎datapacks/who-did-this/data/youdidthis/loot_tables/rng.json‎

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

‎datapacks/who-did-this/pack.mcmeta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"pack": {
3-
"pack_format": 15,
3+
"pack_format": 26,
44
"description": "Who Did This?"
55
}
66
}

0 commit comments

Comments
 (0)