diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/breach.png b/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/breach.png deleted file mode 100644 index 17672de3f..000000000 Binary files a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/breach.png and /dev/null differ diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/stoness.png b/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/stoness.png deleted file mode 100644 index c269bf391..000000000 Binary files a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/stoness.png and /dev/null differ diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/waves.png b/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/waves.png deleted file mode 100644 index c456d8eed..000000000 Binary files a/src/main/resources/contents/omc_animations/assets/omc_animations/textures/entity/player/waves.png and /dev/null differ diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/.player_advanced_animations b/src/main/resources/contents/omc_animations/models/entity/player/.player_advanced_animations similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/.player_advanced_animations rename to src/main/resources/contents/omc_animations/models/entity/player/.player_advanced_animations diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/.uuid b/src/main/resources/contents/omc_animations/models/entity/player/.uuid similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/.uuid rename to src/main/resources/contents/omc_animations/models/entity/player/.uuid diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_0.111-0.143-0.152.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_0.111-0.143-0.152.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_0.111-0.143-0.152.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_0.111-0.143-0.152.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_0.843-1.616-1.718.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_0.843-1.616-1.718.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_0.843-1.616-1.718.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_0.843-1.616-1.718.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_1.877-2.155-2.291.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_1.877-2.155-2.291.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_1.877-2.155-2.291.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_1.877-2.155-2.291.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.416-2.345-2.492.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.416-2.345-2.492.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.416-2.345-2.492.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.416-2.345-2.492.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.55-2.4-2.55.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.55-2.4-2.55.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.55-2.4-2.55.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.55-2.4-2.55.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.571-2.406-2.584.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.571-2.406-2.584.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.571-2.406-2.584.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.571-2.406-2.584.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.829-2.244-2.816.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.829-2.244-2.816.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.829-2.244-2.816.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.829-2.244-2.816.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.847-2.264-2.864.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.847-2.264-2.864.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.847-2.264-2.864.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.847-2.264-2.864.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.847-2.266-2.866.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.847-2.266-2.866.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.847-2.266-2.866.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.847-2.266-2.866.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.258-2.858.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.258-2.858.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.258-2.858.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.258-2.858.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.263-2.863.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.263-2.863.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.263-2.863.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.263-2.863.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.265-2.865.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.265-2.865.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.265-2.865.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.265-2.865.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.266-2.866.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.266-2.866.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.848-2.266-2.866.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.848-2.266-2.866.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.256-2.856.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.256-2.856.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.256-2.856.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.256-2.856.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.259-2.859.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.259-2.859.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.259-2.859.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.259-2.859.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.26-2.86.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.26-2.86.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.849-2.26-2.86.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.849-2.26-2.86.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-0.3-2.85.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-0.3-2.85.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-0.3-2.85.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-0.3-2.85.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.247-2.847.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.247-2.847.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.247-2.847.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.247-2.847.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.248-2.848.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.248-2.848.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.248-2.848.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.248-2.848.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.25-2.85.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.25-2.85.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.25-2.85.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.25-2.85.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.252-2.852.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.252-2.852.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.252-2.852.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.252-2.852.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.253-2.853.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.253-2.853.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.85-2.253-2.853.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.85-2.253-2.853.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.24-2.84.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.24-2.84.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.24-2.84.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.24-2.84.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.241-2.841.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.241-2.841.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.241-2.841.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.241-2.841.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.244-2.844.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.244-2.844.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.851-2.244-2.844.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.851-2.244-2.844.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.234-2.834.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.234-2.834.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.234-2.834.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.234-2.834.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.235-2.835.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.235-2.835.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.235-2.835.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.235-2.835.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.237-2.837.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.237-2.837.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.237-2.837.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.237-2.837.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.242-2.842.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.242-2.842.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.852-2.242-2.842.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.852-2.242-2.842.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.853-2.234-2.834.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.853-2.234-2.834.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.853-2.234-2.834.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.853-2.234-2.834.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.853-2.236-2.836.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.853-2.236-2.836.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.853-2.236-2.836.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.853-2.236-2.836.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.939-2.23-2.893.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.939-2.23-2.893.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_2.939-2.23-2.893.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_2.939-2.23-2.893.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.179-2.119-3.012.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.179-2.119-3.012.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.179-2.119-3.012.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.179-2.119-3.012.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.508-1.809-3.227.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.508-1.809-3.227.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.508-1.809-3.227.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.508-1.809-3.227.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.804-0.708-3.571.json b/src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.804-0.708-3.571.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/oeuf_3.804-0.708-3.571.json rename to src/main/resources/contents/omc_animations/models/entity/player/oeuf_3.804-0.708-3.571.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/parm_left_3_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/parm_left_3_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/parm_left_3_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/parm_left_3_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/parm_right_4_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/parm_right_4_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/parm_right_4_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/parm_right_4_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pbody_2_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/pbody_2_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pbody_2_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/pbody_2_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/phead_0_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/phead_0_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/phead_0_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/phead_0_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pleg_left_1_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/pleg_left_1_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pleg_left_1_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/pleg_left_1_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pleg_right_5_0-0-0.json b/src/main/resources/contents/omc_animations/models/entity/player/pleg_right_5_0-0-0.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/pleg_right_5_0-0-0.json rename to src/main/resources/contents/omc_animations/models/entity/player/pleg_right_5_0-0-0.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings.json b/src/main/resources/contents/omc_animations/models/entity/player/rings.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.021-0.021-0.021.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.021-0.021-0.021.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.021-0.021-0.021.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.021-0.021-0.021.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.059-0.059-0.059.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.059-0.059-0.059.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.059-0.059-0.059.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.059-0.059-0.059.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.113-0.113-0.113.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.113-0.113-0.113.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.113-0.113-0.113.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.113-0.113-0.113.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.18-0.18-0.18.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.18-0.18-0.18.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.18-0.18-0.18.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.18-0.18-0.18.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.259-0.259-0.259.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.259-0.259-0.259.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.259-0.259-0.259.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.259-0.259-0.259.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.303-0.303-0.303.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.303-0.303-0.303.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.303-0.303-0.303.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.303-0.303-0.303.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.348-0.348-0.348.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.348-0.348-0.348.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.348-0.348-0.348.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.348-0.348-0.348.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.446-0.446-0.446.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.446-0.446-0.446.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.446-0.446-0.446.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.446-0.446-0.446.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.551-0.551-0.551.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.551-0.551-0.551.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.551-0.551-0.551.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.551-0.551-0.551.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.663-0.663-0.663.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.663-0.663-0.663.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.663-0.663-0.663.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.663-0.663-0.663.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.781-0.781-0.781.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.781-0.781-0.781.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.781-0.781-0.781.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.781-0.781-0.781.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.903-0.903-0.903.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_0.903-0.903-0.903.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_0.903-0.903-0.903.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_0.903-0.903-0.903.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.029-1.029-1.029.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.029-1.029-1.029.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.029-1.029-1.029.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.029-1.029-1.029.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.157-1.157-1.157.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.157-1.157-1.157.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.157-1.157-1.157.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.157-1.157-1.157.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.288-1.288-1.288.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.288-1.288-1.288.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.288-1.288-1.288.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.288-1.288-1.288.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.419-1.419-1.419.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.419-1.419-1.419.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.419-1.419-1.419.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.419-1.419-1.419.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.552-1.552-1.552.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.552-1.552-1.552.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.552-1.552-1.552.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.552-1.552-1.552.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.589-1.589-1.589.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.589-1.589-1.589.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.589-1.589-1.589.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.589-1.589-1.589.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.684-1.684-1.684.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.684-1.684-1.684.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.684-1.684-1.684.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.684-1.684-1.684.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.815-1.815-1.815.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.815-1.815-1.815.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.815-1.815-1.815.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.815-1.815-1.815.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.944-1.944-1.944.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_1.944-1.944-1.944.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_1.944-1.944-1.944.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_1.944-1.944-1.944.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.07-2.07-2.07.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.07-2.07-2.07.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.07-2.07-2.07.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.07-2.07-2.07.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.193-2.193-2.193.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.193-2.193-2.193.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.193-2.193-2.193.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.193-2.193-2.193.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.235-2.235-2.235.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.235-2.235-2.235.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.235-2.235-2.235.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.235-2.235-2.235.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.312-2.312-2.312.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.312-2.312-2.312.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.312-2.312-2.312.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.312-2.312-2.312.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.426-2.426-2.426.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.426-2.426-2.426.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.426-2.426-2.426.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.426-2.426-2.426.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.533-2.533-2.533.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.533-2.533-2.533.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.533-2.533-2.533.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.533-2.533-2.533.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.581-2.581-2.581.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.581-2.581-2.581.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.581-2.581-2.581.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.581-2.581-2.581.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.633-2.633-2.633.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.633-2.633-2.633.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.633-2.633-2.633.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.633-2.633-2.633.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.725-2.725-2.725.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.725-2.725-2.725.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.725-2.725-2.725.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.725-2.725-2.725.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.787-2.787-2.787.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.787-2.787-2.787.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.787-2.787-2.787.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.787-2.787-2.787.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.807-2.807-2.807.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.807-2.807-2.807.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.807-2.807-2.807.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.807-2.807-2.807.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.877-2.877-2.877.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.877-2.877-2.877.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.877-2.877-2.877.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.877-2.877-2.877.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.911-2.911-2.911.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.911-2.911-2.911.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.911-2.911-2.911.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.911-2.911-2.911.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.934-2.934-2.934.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.934-2.934-2.934.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.934-2.934-2.934.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.934-2.934-2.934.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.976-2.976-2.976.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.976-2.976-2.976.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.976-2.976-2.976.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.976-2.976-2.976.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.979-2.979-2.979.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_2.979-2.979-2.979.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_2.979-2.979-2.979.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_2.979-2.979-2.979.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_3-3-3.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_3-3-3.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_3-3-3.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_3-3-3.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_3.004-3.004-3.004.json b/src/main/resources/contents/omc_animations/models/entity/player/rings_3.004-3.004-3.004.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rings_3.004-3.004-3.004.json rename to src/main/resources/contents/omc_animations/models/entity/player/rings_3.004-3.004-3.004.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.008-0.008-0.008.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.008-0.008-0.008.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.008-0.008-0.008.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.008-0.008-0.008.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.036-0.036-0.036.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.036-0.036-0.036.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.036-0.036-0.036.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.036-0.036-0.036.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.059-0.059-0.059.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.059-0.059-0.059.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.059-0.059-0.059.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.059-0.059-0.059.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.132-0.132-0.132.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.132-0.132-0.132.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.132-0.132-0.132.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.132-0.132-0.132.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.179-0.179-0.179.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.179-0.179-0.179.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.179-0.179-0.179.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.179-0.179-0.179.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.196-0.196-0.196.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.196-0.196-0.196.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.196-0.196-0.196.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.196-0.196-0.196.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.222-0.222-0.222.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.222-0.222-0.222.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_-0.222-0.222-0.222.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_-0.222-0.222-0.222.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.056-0.056-0.056.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.056-0.056-0.056.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.056-0.056-0.056.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.056-0.056-0.056.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.125-0.125-0.125.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.125-0.125-0.125.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.125-0.125-0.125.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.125-0.125-0.125.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.149-0.149-0.149.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.149-0.149-0.149.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.149-0.149-0.149.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.149-0.149-0.149.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.206-0.206-0.206.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.206-0.206-0.206.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.206-0.206-0.206.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.206-0.206-0.206.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.296-0.296-0.296.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.296-0.296-0.296.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.296-0.296-0.296.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.296-0.296-0.296.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.396-0.396-0.396.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.396-0.396-0.396.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.396-0.396-0.396.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.396-0.396-0.396.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.404-0.404-0.404.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.404-0.404-0.404.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.404-0.404-0.404.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.404-0.404-0.404.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.504-0.504-0.504.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.504-0.504-0.504.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.504-0.504-0.504.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.504-0.504-0.504.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.619-0.619-0.619.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.619-0.619-0.619.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.619-0.619-0.619.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.619-0.619-0.619.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.722-0.722-0.722.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.722-0.722-0.722.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.722-0.722-0.722.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.722-0.722-0.722.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.741-0.741-0.741.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.741-0.741-0.741.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.741-0.741-0.741.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.741-0.741-0.741.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.869-0.868-0.869.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_0.869-0.868-0.869.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_0.869-0.868-0.869.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_0.869-0.868-0.869.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.083-1.083-1.083.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.083-1.083-1.083.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.083-1.083-1.083.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.083-1.083-1.083.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.135-1.135-1.135.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.135-1.135-1.135.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.135-1.135-1.135.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.135-1.135-1.135.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.272-1.272-1.272.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.272-1.272-1.272.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.272-1.272-1.272.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.272-1.272-1.272.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.411-1.411-1.411.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.411-1.411-1.411.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.411-1.411-1.411.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.411-1.411-1.411.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.464-1.464-1.464.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.464-1.464-1.464.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.464-1.464-1.464.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.464-1.464-1.464.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.549-1.549-1.549.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.549-1.549-1.549.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.549-1.549-1.549.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.549-1.549-1.549.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.688-1.688-1.688.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.688-1.688-1.688.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.688-1.688-1.688.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.688-1.688-1.688.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.824-1.824-1.824.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.824-1.824-1.824.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.824-1.824-1.824.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.824-1.824-1.824.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.845-1.845-1.845.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.845-1.845-1.845.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.845-1.845-1.845.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.845-1.845-1.845.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.958-1.958-1.958.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_1.958-1.958-1.958.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_1.958-1.958-1.958.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_1.958-1.958-1.958.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.088-2.088-2.088.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.088-2.088-2.088.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.088-2.088-2.088.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.088-2.088-2.088.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.204-2.204-2.204.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.204-2.204-2.204.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.204-2.204-2.204.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.204-2.204-2.204.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.214-2.214-2.214.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.214-2.214-2.214.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.214-2.214-2.214.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.214-2.214-2.214.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.333-2.333-2.333.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.333-2.333-2.333.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.333-2.333-2.333.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.333-2.333-2.333.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.447-2.447-2.447.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.447-2.447-2.447.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.447-2.447-2.447.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.447-2.447-2.447.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.52-2.52-2.52.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.52-2.52-2.52.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.52-2.52-2.52.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.52-2.52-2.52.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.552-2.552-2.552.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.552-2.552-2.552.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.552-2.552-2.552.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.552-2.552-2.552.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.649-2.649-2.649.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.649-2.649-2.649.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.649-2.649-2.649.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.649-2.649-2.649.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.736-2.736-2.736.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.736-2.736-2.736.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.736-2.736-2.736.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.736-2.736-2.736.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.773-2.773-2.773.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.773-2.773-2.773.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.773-2.773-2.773.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.773-2.773-2.773.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.813-2.813-2.813.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.813-2.813-2.813.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.813-2.813-2.813.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.813-2.813-2.813.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.877-2.877-2.877.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.877-2.877-2.877.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.877-2.877-2.877.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.877-2.877-2.877.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.93-2.93-2.93.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.93-2.93-2.93.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.93-2.93-2.93.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.93-2.93-2.93.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.94-2.94-2.94.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.94-2.94-2.94.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.94-2.94-2.94.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.94-2.94-2.94.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.968-2.968-2.968.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.968-2.968-2.968.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.968-2.968-2.968.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.968-2.968-2.968.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.992-2.992-2.992.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_2.992-2.992-2.992.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_2.992-2.992-2.992.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_2.992-2.992-2.992.json diff --git a/src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_3-3-3.json b/src/main/resources/contents/omc_animations/models/entity/player/rocks_3-3-3.json similarity index 100% rename from src/main/resources/contents/omc_animations/assets/omc_animations/models/entity/player/rocks_3-3-3.json rename to src/main/resources/contents/omc_animations/models/entity/player/rocks_3-3-3.json diff --git a/src/main/resources/contents/omc_animations/textures/entity/player/breach.png b/src/main/resources/contents/omc_animations/textures/entity/player/breach.png new file mode 100644 index 000000000..141cec4af Binary files /dev/null and b/src/main/resources/contents/omc_animations/textures/entity/player/breach.png differ diff --git a/src/main/resources/contents/omc_animations/textures/entity/player/stoness.png b/src/main/resources/contents/omc_animations/textures/entity/player/stoness.png new file mode 100644 index 000000000..ed2bcd0ed Binary files /dev/null and b/src/main/resources/contents/omc_animations/textures/entity/player/stoness.png differ diff --git a/src/main/resources/contents/omc_animations/textures/entity/player/waves.png b/src/main/resources/contents/omc_animations/textures/entity/player/waves.png new file mode 100644 index 000000000..d39dca376 Binary files /dev/null and b/src/main/resources/contents/omc_animations/textures/entity/player/waves.png differ diff --git a/src/main/resources/contents/omc_blocks/blocks.yml b/src/main/resources/contents/omc_blocks/blocks.yml index 9db34411e..d6a6ec171 100644 --- a/src/main/resources/contents/omc_blocks/blocks.yml +++ b/src/main/resources/contents/omc_blocks/blocks.yml @@ -2,15 +2,12 @@ info: namespace: omc_blocks items: aywenite_ore: - display_name: §dMinerais d'Aywenite + name: Minerais d'Aywenite lore: - - "§7Une découverte surprenante" - resource: - generate: true - material: PAPER - textures: - - aywenite_ore.png - specific_properties: + - "Une découverte surprenante" + graphics: + texture: aywenite_ore + behaviours: block: drop_when_mined: false drop_on_silk_touch: true @@ -22,16 +19,6 @@ items: - DIAMOND_PICKAXE - NETHERITE_PICKAXE hardness: 2 - no_explosion: false - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 events: placed_block: break: @@ -45,18 +32,14 @@ items: min_amount: 1 max_amount: 3 deepslate_aywenite_ore: - display_name: §dMinerai d'Aywenite des Abimes + name: Minerai d'Aywenite des Abimes lore: - - "§7Une découverte surprenante" - resource: - generate: true - material: PAPER - textures: - - deepslate_aywenite.png - specific_properties: + - "Une découverte surprenante" + graphics: + texture: deepslate_aywenite + behaviours: block: hardness: 3 - no_explosion: false drop_when_mined: false drop_on_silk_touch: true placed_model: @@ -66,15 +49,6 @@ items: - IRON_PICKAXE - DIAMOND_PICKAXE - NETHERITE_PICKAXE - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 events: placed_block: break: @@ -88,39 +62,24 @@ items: min_amount: 1 max_amount: 3 aywenite_block: - display_name: §dBloc d'Aywenite + name: Bloc d'Aywenite lore: - - "§7Une fusion de cette §dmatière unique" - resource: - generate: true - material: PAPER - textures: - - aywenite_block.png - specific_properties: + - "Une fusion de cette matière unique" + graphics: + texture: aywenite_block + behaviours: block: hardness: 3 - no_explosion: false placed_model: type: REAL_NOTE break_particles: ITEM break_tools_whitelist: - PICKAXE - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 ball_machine: - display_name: "Machine a Boule" + name: "Machine a Boule" permission: blocks.ball_machine - resource: - material: PAPER - generate: false - model_path: items/ball_machin + graphics: + model: items/ball_machin behaviours: furniture: entity: item_display @@ -140,11 +99,9 @@ items: y: 0.50 z: 0 urne: - display_name: "Urne" - resource: - material: PAPER - generate: false - model_path: items/urne + name: "Urne" + graphics: + model: items/urne behaviours: furniture: entity: item_display diff --git a/src/main/resources/contents/omc_blocks/category.yml b/src/main/resources/contents/omc_blocks/category.yml index 0d96f8311..e9d83217d 100644 --- a/src/main/resources/contents/omc_blocks/category.yml +++ b/src/main/resources/contents/omc_blocks/category.yml @@ -3,7 +3,6 @@ info: categories: omc_blocks: enabled: true - skip_if_already: false icon: omc_blocks:aywenite_block name: "OpenMC Blocks" items: diff --git a/src/main/resources/contents/omc_blocks/textures/aywenite_block.png b/src/main/resources/contents/omc_blocks/textures/aywenite_block.png index f6935127d..f640607f8 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/aywenite_block.png and b/src/main/resources/contents/omc_blocks/textures/aywenite_block.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/aywenite_ore.png b/src/main/resources/contents/omc_blocks/textures/aywenite_ore.png index 8be903c09..49405adae 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/aywenite_ore.png and b/src/main/resources/contents/omc_blocks/textures/aywenite_ore.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche1.png index 3d3cc16a3..971457c41 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche2.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche2.png index 8c66de331..c87059a24 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche2.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche3.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche3.png index 49c551360..76e699188 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche3.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche3.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche4.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche4.png index 720d92781..c66d59200 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche4.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche4.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche5.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche5.png index 25f55b9b6..b3c9c68a9 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche5.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouche5.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule1.png index e24d925ca..a7d4db6da 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule2.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule2.png index 3eb78ed72..4c1d2b435 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule2.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule3.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule3.png index 72774125a..320229cdd 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule3.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule3.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule4.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule4.png index 3f770053e..40ff43b2e 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule4.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule4.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule5.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule5.png index 3aa5d4a4f..3e2c40656 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule5.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule5.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule6.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule6.png index 3818740b0..23c7eccea 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule6.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule6.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule7.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule7.png index 9984836cb..a7f51fb83 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/boule7.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/boule7.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouleglob.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouleglob.png index 24557539f..46cfe9239 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/bouleglob.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/bouleglob.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp1.png index acce4a07d..17dbaefea 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp2.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp2.png index 76f34bd3b..93b7f37a7 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp2.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp3.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp3.png index 2426285ca..56c05af01 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/corp3.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/corp3.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/int1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/int1.png index 1e9be6579..0f8bbbc50 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/int1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/int1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/int2.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/int2.png index 83dffb155..247988397 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/int2.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/int2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/oreilles.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/oreilles.png index ded80f062..c8912d932 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/oreilles.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/oreilles.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/tok1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/tok1.png index 46c43e514..3f5295677 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/tok1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/tok1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/tok2.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/tok2.png index 7d8ffa666..c651d9612 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/tok2.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/tok2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1.png index b9b239e3c..1afcfb789 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1total.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1total.png index e9ef6bbc1..7119c51c7 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1total.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev1total.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev2total.png b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev2total.png index 664f4e727..59d4eec93 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev2total.png and b/src/main/resources/contents/omc_blocks/textures/ball_machin/verrev2total.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/deepslate_aywenite.png b/src/main/resources/contents/omc_blocks/textures/deepslate_aywenite.png index 72b38cff3..52e2c1ac1 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/deepslate_aywenite.png and b/src/main/resources/contents/omc_blocks/textures/deepslate_aywenite.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/urne/papertexture.png b/src/main/resources/contents/omc_blocks/textures/urne/papertexture.png index d40bba7fb..657504f15 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/urne/papertexture.png and b/src/main/resources/contents/omc_blocks/textures/urne/papertexture.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/urne/texture1.png b/src/main/resources/contents/omc_blocks/textures/urne/texture1.png index 6ca02d54c..2deece924 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/urne/texture1.png and b/src/main/resources/contents/omc_blocks/textures/urne/texture1.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/urne/texture2.png b/src/main/resources/contents/omc_blocks/textures/urne/texture2.png index efa33d543..cf52cf6b4 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/urne/texture2.png and b/src/main/resources/contents/omc_blocks/textures/urne/texture2.png differ diff --git a/src/main/resources/contents/omc_blocks/textures/urne/texture3.png b/src/main/resources/contents/omc_blocks/textures/urne/texture3.png index 40111f5f0..581a7a260 100644 Binary files a/src/main/resources/contents/omc_blocks/textures/urne/texture3.png and b/src/main/resources/contents/omc_blocks/textures/urne/texture3.png differ diff --git a/src/main/resources/contents/omc_bossbar/minecraft/textures/gui/sprites/boss_bar/red_background.png b/src/main/resources/contents/omc_bossbar/minecraft/textures/gui/sprites/boss_bar/red_background.png new file mode 100644 index 000000000..19d8e6676 Binary files /dev/null and b/src/main/resources/contents/omc_bossbar/minecraft/textures/gui/sprites/boss_bar/red_background.png differ diff --git a/src/main/resources/contents/omc_bossbar/resourcepack/assets/minecraft/textures/gui/sprites/boss_bar/red_background.png b/src/main/resources/contents/omc_bossbar/resourcepack/assets/minecraft/textures/gui/sprites/boss_bar/red_background.png deleted file mode 100644 index 50455c624..000000000 Binary files a/src/main/resources/contents/omc_bossbar/resourcepack/assets/minecraft/textures/gui/sprites/boss_bar/red_background.png and /dev/null differ diff --git a/src/main/resources/contents/omc_company/configs/btn.yml b/src/main/resources/contents/omc_company/configs/btn.yml index ae8df4c2c..d5dde90ce 100644 --- a/src/main/resources/contents/omc_company/configs/btn.yml +++ b/src/main/resources/contents/omc_company/configs/btn.yml @@ -2,17 +2,10 @@ info: namespace: omc_company items: 10_btn: - display_name: 10 - resource: - material: PAPER - generate: true - textures: - - 10_btn - + name: 10 + graphics: + texture: 10_btn company_box: - display_name: "company box" - resource: - material: PAPER - generate: true - textures: - - company_box \ No newline at end of file + name: "company box" + graphics: + texture: company_box diff --git a/src/main/resources/contents/omc_company/configs/caisse.yml b/src/main/resources/contents/omc_company/configs/caisse.yml index 35b496505..4f53a0798 100644 --- a/src/main/resources/contents/omc_company/configs/caisse.yml +++ b/src/main/resources/contents/omc_company/configs/caisse.yml @@ -2,12 +2,10 @@ info: namespace: omc_company items: caisse: - display_name: "§6§lCaisse" + name: "Caisse" permission: company.caisse - resource: - material: PAPER - generate: false - model_path: items/caisse + graphics: + model: items/caisse behaviours: furniture: breakable: false diff --git a/src/main/resources/contents/omc_company/configs/menus.yml b/src/main/resources/contents/omc_company/configs/menus.yml index 37492b831..233aeb888 100644 --- a/src/main/resources/contents/omc_company/configs/menus.yml +++ b/src/main/resources/contents/omc_company/configs/menus.yml @@ -3,37 +3,37 @@ info: font_images: company_baltop_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "company_baltop_menu.png" y_position: 20 company_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "company_menu.png" y_position: 20 paginate_company_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "paginate_company_menu.png" y_position: 20 shop_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "shop_menu.png" y_position: 20 sell_shop_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "sell_shop_menu.png" y_position: 20 large_shop_menu: permission: company.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "large_shop_menu.png" y_position: 20 \ No newline at end of file diff --git a/src/main/resources/contents/omc_company/textures/10_btn.png b/src/main/resources/contents/omc_company/textures/10_btn.png index 302de11e6..025ec3924 100644 Binary files a/src/main/resources/contents/omc_company/textures/10_btn.png and b/src/main/resources/contents/omc_company/textures/10_btn.png differ diff --git a/src/main/resources/contents/omc_company/textures/company_baltop_menu.png b/src/main/resources/contents/omc_company/textures/company_baltop_menu.png index 21a20b8de..a1216cbb8 100644 Binary files a/src/main/resources/contents/omc_company/textures/company_baltop_menu.png and b/src/main/resources/contents/omc_company/textures/company_baltop_menu.png differ diff --git a/src/main/resources/contents/omc_company/textures/company_box.png b/src/main/resources/contents/omc_company/textures/company_box.png index e5189d806..09c7fdb7f 100644 Binary files a/src/main/resources/contents/omc_company/textures/company_box.png and b/src/main/resources/contents/omc_company/textures/company_box.png differ diff --git a/src/main/resources/contents/omc_company/textures/company_menu.png b/src/main/resources/contents/omc_company/textures/company_menu.png index 45e0f37b5..25c64d4af 100644 Binary files a/src/main/resources/contents/omc_company/textures/company_menu.png and b/src/main/resources/contents/omc_company/textures/company_menu.png differ diff --git a/src/main/resources/contents/omc_company/textures/items/texture.png b/src/main/resources/contents/omc_company/textures/items/texture.png index ebcbbde9b..81b79d3f0 100644 Binary files a/src/main/resources/contents/omc_company/textures/items/texture.png and b/src/main/resources/contents/omc_company/textures/items/texture.png differ diff --git a/src/main/resources/contents/omc_company/textures/large_shop_menu.png b/src/main/resources/contents/omc_company/textures/large_shop_menu.png index 26582149b..41ba17362 100644 Binary files a/src/main/resources/contents/omc_company/textures/large_shop_menu.png and b/src/main/resources/contents/omc_company/textures/large_shop_menu.png differ diff --git a/src/main/resources/contents/omc_company/textures/paginate_company_menu.png b/src/main/resources/contents/omc_company/textures/paginate_company_menu.png index d3da188ad..4b75f5243 100644 Binary files a/src/main/resources/contents/omc_company/textures/paginate_company_menu.png and b/src/main/resources/contents/omc_company/textures/paginate_company_menu.png differ diff --git a/src/main/resources/contents/omc_company/textures/sell_shop_menu.png b/src/main/resources/contents/omc_company/textures/sell_shop_menu.png index 6fcdcdce4..a8f7d93f4 100644 Binary files a/src/main/resources/contents/omc_company/textures/sell_shop_menu.png and b/src/main/resources/contents/omc_company/textures/sell_shop_menu.png differ diff --git a/src/main/resources/contents/omc_company/textures/shop_menu.png b/src/main/resources/contents/omc_company/textures/shop_menu.png index 05dbf0292..542a1e26e 100644 Binary files a/src/main/resources/contents/omc_company/textures/shop_menu.png and b/src/main/resources/contents/omc_company/textures/shop_menu.png differ diff --git a/src/main/resources/contents/omc_contest/configs/borne.yml b/src/main/resources/contents/omc_contest/configs/borne.yml index ba358d5b8..9c5ddcf5d 100644 --- a/src/main/resources/contents/omc_contest/configs/borne.yml +++ b/src/main/resources/contents/omc_contest/configs/borne.yml @@ -2,12 +2,10 @@ info: namespace: omc_contest items: borne: - display_name: "Borne" + name: "Borne" permission: contest.borne - resource: - material: PAPER - generate: false - model_path: items/borne + graphics: + model: items/borne behaviours: furniture: entity: item_display diff --git a/src/main/resources/contents/omc_contest/configs/category.yml b/src/main/resources/contents/omc_contest/configs/category.yml index 0a499074a..87152cead 100644 --- a/src/main/resources/contents/omc_contest/configs/category.yml +++ b/src/main/resources/contents/omc_contest/configs/category.yml @@ -3,7 +3,6 @@ info: categories: omc_contest: enabled: true - skip_if_already: false icon: omc_contest:contest_shell name: "OpenMC Contest" items: diff --git a/src/main/resources/contents/omc_contest/configs/menus.yml b/src/main/resources/contents/omc_contest/configs/menus.yml index 310d184d7..91aabf391 100644 --- a/src/main/resources/contents/omc_contest/configs/menus.yml +++ b/src/main/resources/contents/omc_contest/configs/menus.yml @@ -3,7 +3,7 @@ info: font_images: contest_menu: permission: contest.menu - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "contest.png" y_position: 16 \ No newline at end of file diff --git a/src/main/resources/contents/omc_contest/configs/shell.yml b/src/main/resources/contents/omc_contest/configs/shell.yml index 66520c9ec..72f993cfb 100644 --- a/src/main/resources/contents/omc_contest/configs/shell.yml +++ b/src/main/resources/contents/omc_contest/configs/shell.yml @@ -2,13 +2,13 @@ info: namespace: omc_contest items: contest_shell: - display_name: "§bCoquillage de Contest" - resource: - material: NAUTILUS_SHELL - model_path: items/shell + name: "Coquillage de Contest" + material: NAUTILUS_SHELL + graphics: + model: items/shell lore: - - "§7§oun mystérieux coquillage..." - - "§7Déposez le lors d'un Contest" - - "§7Utile si vous voulez faire gagner votre équipe" + - "un mystérieux coquillage..." + - "Déposez le lors d'un Contest" + - "Utile si vous voulez faire gagner votre équipe" - "" - - "§5§lEPIC ITEM" \ No newline at end of file + - "EPIC ITEM" \ No newline at end of file diff --git a/src/main/resources/contents/omc_contest/textures/contest.png b/src/main/resources/contents/omc_contest/textures/contest.png index 489c7f5cd..ec1660488 100644 Binary files a/src/main/resources/contents/omc_contest/textures/contest.png and b/src/main/resources/contents/omc_contest/textures/contest.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texture.png b/src/main/resources/contents/omc_contest/textures/items/texture.png index 4eb591463..91ef189de 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texture.png and b/src/main/resources/contents/omc_contest/textures/items/texture.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texture1.png b/src/main/resources/contents/omc_contest/textures/items/texture1.png index 9860cec6b..f3ddaeada 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texture1.png and b/src/main/resources/contents/omc_contest/textures/items/texture1.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texture3.png b/src/main/resources/contents/omc_contest/textures/items/texture3.png index fa5564c6f..72a660846 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texture3.png and b/src/main/resources/contents/omc_contest/textures/items/texture3.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texture4.png b/src/main/resources/contents/omc_contest/textures/items/texture4.png index 693a799bc..5f9a1a39a 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texture4.png and b/src/main/resources/contents/omc_contest/textures/items/texture4.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/textureborne.png b/src/main/resources/contents/omc_contest/textures/items/textureborne.png index 2769e01ac..99be634a2 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/textureborne.png and b/src/main/resources/contents/omc_contest/textures/items/textureborne.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texturecouleur.png b/src/main/resources/contents/omc_contest/textures/items/texturecouleur.png index 13c8a5836..fb27623a9 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texturecouleur.png and b/src/main/resources/contents/omc_contest/textures/items/texturecouleur.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texturecouleur2.png b/src/main/resources/contents/omc_contest/textures/items/texturecouleur2.png index ca697673e..47bd4c2d3 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texturecouleur2.png and b/src/main/resources/contents/omc_contest/textures/items/texturecouleur2.png differ diff --git a/src/main/resources/contents/omc_contest/textures/items/texturetabledeborne.png b/src/main/resources/contents/omc_contest/textures/items/texturetabledeborne.png index 71ba71965..4685971a9 100644 Binary files a/src/main/resources/contents/omc_contest/textures/items/texturetabledeborne.png and b/src/main/resources/contents/omc_contest/textures/items/texturetabledeborne.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture.png b/src/main/resources/contents/omc_contest/textures/models/texture.png index d7560b636..163617c13 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture.png and b/src/main/resources/contents/omc_contest/textures/models/texture.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture2.png b/src/main/resources/contents/omc_contest/textures/models/texture2.png index 77ed4d1a0..a548235dc 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture2.png and b/src/main/resources/contents/omc_contest/textures/models/texture2.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture3.png b/src/main/resources/contents/omc_contest/textures/models/texture3.png index d74ec906d..8c6339d2e 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture3.png and b/src/main/resources/contents/omc_contest/textures/models/texture3.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture4.png b/src/main/resources/contents/omc_contest/textures/models/texture4.png index de85c7ccc..9a347d49d 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture4.png and b/src/main/resources/contents/omc_contest/textures/models/texture4.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture5.png b/src/main/resources/contents/omc_contest/textures/models/texture5.png index e8bf76aa0..8dfe9ebd9 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture5.png and b/src/main/resources/contents/omc_contest/textures/models/texture5.png differ diff --git a/src/main/resources/contents/omc_contest/textures/models/texture6.png b/src/main/resources/contents/omc_contest/textures/models/texture6.png index e70c4fff8..25a1d96bd 100644 Binary files a/src/main/resources/contents/omc_contest/textures/models/texture6.png and b/src/main/resources/contents/omc_contest/textures/models/texture6.png differ diff --git a/src/main/resources/contents/omc_daily_events/blocks.yml b/src/main/resources/contents/omc_daily_events/blocks.yml index 7ef63999e..32cfe52d9 100644 --- a/src/main/resources/contents/omc_daily_events/blocks.yml +++ b/src/main/resources/contents/omc_daily_events/blocks.yml @@ -2,7 +2,7 @@ info: namespace: omc_daily_events items: obese_potato: - display_name: Patate obèse + name: Patate obèse graphics: textures: north: obese_crops/potato/obese_potato_side @@ -19,7 +19,7 @@ items: up_block: omc_daily_events:obese_potato_stem obese_potato_stem: - display_name: Tige de patate obèse + name: Tige de patate obèse graphics: icon: obese_crops/potato/obese_potato_stem parent: block/cross diff --git a/src/main/resources/contents/omc_daily_events/category.yml b/src/main/resources/contents/omc_daily_events/category.yml index a3b4e3055..348b00a78 100644 --- a/src/main/resources/contents/omc_daily_events/category.yml +++ b/src/main/resources/contents/omc_daily_events/category.yml @@ -3,7 +3,6 @@ info: categories: omc_daily_events: enabled: true - skip_if_already: false icon: omc_daily_events:aywenite_block name: "OpenMC Daily Events" items: diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_bottom.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_bottom.png index b0c3942e2..50719107e 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_bottom.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_bottom.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_side.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_side.png index 2a51f6442..c1652817e 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_side.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_side.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_stem.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_stem.png index 72249d3cf..b1381b0a8 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_stem.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_stem.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_top.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_top.png index 0b4cc0c51..98badaee1 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_top.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/beetroot/obese_beetroot_top.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_bottom.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_bottom.png index 31201fb71..7b4a654f7 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_bottom.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_bottom.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_side.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_side.png index 4f8439d93..ec9fb9d8a 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_side.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_side.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_stem.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_stem.png index cdb63b1ae..10ae40d91 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_stem.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_stem.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_top.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_top.png index c6a7ba2dd..ca591e99b 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_top.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/carrot/obese_carrot_top.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_bottom.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_bottom.png index 3f97f00fd..260314ac8 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_bottom.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_bottom.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_side.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_side.png index bc767c625..13a3e79a7 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_side.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_side.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_top.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_top.png index 41195e80a..c8e496bd6 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_top.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/poissonous_potato/obese_poisonous_potato_top.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_bottom.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_bottom.png index b1f738ead..abd2f1c6a 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_bottom.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_bottom.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_side.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_side.png index b618da9b9..cd65d179b 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_side.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_side.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_stem.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_stem.png index a0f262829..2deb7e3b4 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_stem.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_stem.png differ diff --git a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_top.png b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_top.png index 423e2bc0e..e172da733 100644 Binary files a/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_top.png and b/src/main/resources/contents/omc_daily_events/textures/obese_crops/potato/obese_potato_top.png differ diff --git a/src/main/resources/contents/omc_dream/armor.yml b/src/main/resources/contents/omc_dream/armor.yml index 7c7dd5e45..2aa8a7624 100644 --- a/src/main/resources/contents/omc_dream/armor.yml +++ b/src/main/resources/contents/omc_dream/armor.yml @@ -52,14 +52,12 @@ legacy_armor_renderings: layer_2: armor/pyjama/pyjama_layer_2 items: old_creaking_helmet: - display_name: "{dream_item_name:old_creaking_helmet}" - resource: - generate: true - textures: - - armor/old_creaking/creaking_helmet - material: {dream_item_material:old_creaking_helmet} + name: "{dream_item_name:old_creaking_helmet}" + material: {dream_item_material:old_creaking_helmet} + graphics: + texture: armor/old_creaking/creaking_helmet lore: - - "§7§oUne armure aussi étrange que cet environnement" + - "Une armure aussi étrange que cet environnement" durability: unbreakable: true equipment: @@ -70,14 +68,12 @@ items: tooltip_style: "{dream_rarity:old_creaking_helmet}" old_creaking_chestplate: - display_name: "{dream_item_name:old_creaking_chestplate}" - resource: - generate: true - textures: - - armor/old_creaking/creaking_chestplate - material: {dream_item_material:old_creaking_chestplate} + name: "{dream_item_name:old_creaking_chestplate}" + material: {dream_item_material:old_creaking_chestplate} + graphics: + texture: armor/old_creaking/creaking_chestplate lore: - - "§7§oUne armure aussi étrange que cet environnement" + - "Une armure aussi étrange que cet environnement" durability: unbreakable: true equipment: @@ -88,14 +84,12 @@ items: tooltip_style: "{dream_rarity:old_creaking_chestplate}" old_creaking_leggings: - display_name: "{dream_item_name:old_creaking_leggings}" - resource: - generate: true - textures: - - armor/old_creaking/creaking_leggings - material: {dream_item_material:old_creaking_leggings} + name: "{dream_item_name:old_creaking_leggings}" + material: {dream_item_material:old_creaking_leggings} + graphics: + texture: armor/old_creaking/creaking_leggings lore: - - "§7§oUne armure aussi étrange que cet environnement" + - "Une armure aussi étrange que cet environnement" durability: unbreakable: true equipment: @@ -106,14 +100,12 @@ items: tooltip_style: "{dream_rarity:old_creaking_leggings}" old_creaking_boots: - display_name: "{dream_item_name:old_creaking_boots}" - resource: - generate: true - textures: - - armor/old_creaking/creaking_boots - material: {dream_item_material:old_creaking_boots} + name: "{dream_item_name:old_creaking_boots}" + material: {dream_item_material:old_creaking_boots} + graphics: + texture: armor/old_creaking/creaking_boots lore: - - "§7§oUne armure aussi étrange que cet environnement" + - "Une armure aussi étrange que cet environnement" durability: unbreakable: true equipment: @@ -124,11 +116,10 @@ items: tooltip_style: "{dream_rarity:old_creaking_boots}" soul_helmet: - display_name: "{dream_item_name:soul_helmet}" - resource: - material: {dream_item_material:soul_helmet} - generate: false - model_path: armor/soul/soul_helmet + name: "{dream_item_name:soul_helmet}" + material: {dream_item_material:soul_helmet} + graphics: + model: armor/soul/soul_helmet durability: unbreakable: true equipment: @@ -137,12 +128,10 @@ items: tooltip_style: "{dream_rarity:soul_helmet}" soul_chestplate: - display_name: "{dream_item_name:soul_chestplate}" - resource: - generate: true - textures: - - armor/soul/soul_chestplate - material: {dream_item_material:soul_chestplate} + name: "{dream_item_name:soul_chestplate}" + material: {dream_item_material:soul_chestplate} + graphics: + texture: armor/soul/soul_chestplate durability: unbreakable: true equipment: @@ -153,12 +142,10 @@ items: tooltip_style: "{dream_rarity:soul_chestplate}" soul_leggings: - display_name: "{dream_item_name:soul_leggings}" - resource: - generate: true - textures: - - armor/soul/soul_leggings - material: {dream_item_material:soul_leggings} + name: "{dream_item_name:soul_leggings}" + material: {dream_item_material:soul_leggings} + graphics: + texture: armor/soul/soul_leggings durability: unbreakable: true equipment: @@ -169,12 +156,10 @@ items: tooltip_style: "{dream_rarity:soul_leggings}" soul_boots: - display_name: "{dream_item_name:soul_boots}" - resource: - generate: true - textures: - - armor/soul/soul_boots - material: {dream_item_material:soul_boots} + name: "{dream_item_name:soul_boots}" + material: {dream_item_material:soul_boots} + graphics: + texture: armor/soul/soul_boots durability: unbreakable: true equipment: @@ -185,12 +170,10 @@ items: tooltip_style: "{dream_rarity:soul_boots}" cloud_helmet: - display_name: "{dream_item_name:cloud_helmet}" - resource: - material: {dream_item_material:cloud_helmet} - generate: true - textures: - - armor/cloud/cloud_helmet + name: "{dream_item_name:cloud_helmet}" + material: {dream_item_material:cloud_helmet} + graphics: + texture: armor/cloud/cloud_helmet durability: unbreakable: true equipment: @@ -201,12 +184,10 @@ items: tooltip_style: "{dream_rarity:cloud_helmet}" cloud_chestplate: - display_name: "{dream_item_name:cloud_chestplate}" - resource: - generate: true - textures: - - armor/cloud/cloud_chestplate - material: {dream_item_material:cloud_chestplate} + name: "{dream_item_name:cloud_chestplate}" + material: {dream_item_material:cloud_chestplate} + graphics: + texture: armor/cloud/cloud_chestplate durability: unbreakable: true equipment: @@ -217,12 +198,10 @@ items: tooltip_style: "{dream_rarity:cloud_chestplate}" cloud_leggings: - display_name: "{dream_item_name:cloud_leggings}" - resource: - generate: true - textures: - - armor/cloud/cloud_leggings - material: {dream_item_material:cloud_leggings} + name: "{dream_item_name:cloud_leggings}" + material: {dream_item_material:cloud_leggings} + graphics: + texture: armor/cloud/cloud_leggings durability: unbreakable: true equipment: @@ -233,12 +212,10 @@ items: tooltip_style: "{dream_rarity:cloud_leggings}" cloud_boots: - display_name: "{dream_item_name:cloud_boots}" - resource: - generate: true - textures: - - armor/cloud/cloud_boots - material: {dream_item_material:cloud_boots} + name: "{dream_item_name:cloud_boots}" + material: {dream_item_material:cloud_boots} + graphics: + texture: armor/cloud/cloud_boots durability: unbreakable: true equipment: @@ -249,12 +226,10 @@ items: tooltip_style: "{dream_rarity:cloud_boots}" cold_helmet: - display_name: "{dream_item_name:cold_helmet}" - resource: - material: {dream_item_material:cold_helmet} - generate: true - textures: - - armor/cold/cold_helmet + name: "{dream_item_name:cold_helmet}" + material: {dream_item_material:cold_helmet} + graphics: + texture: armor/cold/cold_helmet durability: unbreakable: true equipment: @@ -265,12 +240,10 @@ items: tooltip_style: "{dream_rarity:cold_helmet}" cold_chestplate: - display_name: "{dream_item_name:cold_chestplate}" - resource: - generate: true - textures: - - armor/cold/cold_chestplate - material: {dream_item_material:cold_chestplate} + name: "{dream_item_name:cold_chestplate}" + material: {dream_item_material:cold_chestplate} + graphics: + texture: armor/cold/cold_chestplate durability: unbreakable: true equipment: @@ -281,12 +254,10 @@ items: tooltip_style: "{dream_rarity:cold_chestplate}" cold_leggings: - display_name: "{dream_item_name:cold_leggings}" - resource: - generate: true - textures: - - armor/cold/cold_leggings - material: {dream_item_material:cold_leggings} + name: "{dream_item_name:cold_leggings}" + material: {dream_item_material:cold_leggings} + graphics: + texture: armor/cold/cold_leggings durability: unbreakable: true equipment: @@ -297,12 +268,10 @@ items: tooltip_style: "{dream_rarity:cold_leggings}" cold_boots: - display_name: "{dream_item_name:cold_boots}" - resource: - generate: true - textures: - - armor/cold/cold_boots - material: {dream_item_material:cold_boots} + name: "{dream_item_name:cold_boots}" + material: {dream_item_material:cold_boots} + graphics: + texture: armor/cold/cold_boots durability: unbreakable: true equipment: @@ -313,15 +282,13 @@ items: tooltip_style: "{dream_rarity:cold_boots}" dream_helmet: - display_name: "{dream_item_name:dream_helmet}" + name: "{dream_item_name:dream_helmet}" lore: - - "§7§oUne armure aussi étrange que cet environnement" - - "§7§oPeut-être est-elle liée aux rêves..." - resource: - material: {dream_item_material:dream_helmet} - generate: true - textures: - - armor/dream/dream_helmet + - "Une armure aussi étrange que cet environnement" + - "Peut-être est-elle liée aux rêves..." + material: {dream_item_material:dream_helmet} + graphics: + texture: armor/dream/dream_helmet durability: unbreakable: true equipment: @@ -332,15 +299,13 @@ items: tooltip_style: "{dream_rarity:dream_helmet}" dream_chestplate: - display_name: "{dream_item_name:dream_chestplate}" + name: "{dream_item_name:dream_chestplate}" lore: - - "§7§oUne armure aussi étrange que cet environnement" - - "§7§o..., les rêves se réalisent ..." - resource: - generate: true - textures: - - armor/dream/dream_chestplate - material: {dream_item_material:dream_chestplate} + - "Une armure aussi étrange que cet environnement" + - "..., les rêves se réalisent ..." + material: {dream_item_material:dream_chestplate} + graphics: + texture: armor/dream/dream_chestplate durability: unbreakable: true equipment: @@ -351,15 +316,13 @@ items: tooltip_style: "{dream_rarity:dream_chestplate}" dream_leggings: - display_name: "{dream_item_name:dream_leggings}" + name: "{dream_item_name:dream_leggings}" lore: - - "§7§oUne armure aussi étrange que cet environnement" - - "§7§o... toujours, en espérant que ... " - resource: - generate: true - textures: - - armor/dream/dream_leggings - material: {dream_item_material:dream_leggings} + - "Une armure aussi étrange que cet environnement" + - "... toujours, en espérant que ... " + material: {dream_item_material:dream_leggings} + graphics: + texture: armor/dream/dream_leggings durability: unbreakable: true equipment: @@ -370,15 +333,13 @@ items: tooltip_style: "{dream_rarity:dream_leggings}" dream_boots: - display_name: "{dream_item_name:dream_boots}" + name: "{dream_item_name:dream_boots}" lore: - - "§7§oUne armure aussi étrange que cet environnement" - - "§7§o... celui là ne se réalisera pas." - resource: - generate: true - textures: - - armor/dream/dream_boots - material: {dream_item_material:dream_boots} + - "Une armure aussi étrange que cet environnement" + - "... celui là ne se réalisera pas." + material: {dream_item_material:dream_boots} + graphics: + texture: armor/dream/dream_boots durability: unbreakable: true equipment: @@ -389,10 +350,9 @@ items: tooltip_style: "{dream_rarity:dream_boots}" pyjama_helmet: - display_name: "{dream_item_name:pyjama_helmet}" - resource: - material: {dream_item_material:pyjama_helmet} - generate: true + name: "{dream_item_name:pyjama_helmet}" + material: {dream_item_material:pyjama_helmet} + graphics: durability: unbreakable: true equipment: @@ -403,10 +363,9 @@ items: tooltip_style: "{dream_rarity:pyjama_helmet}" pyjama_chestplate: - display_name: "{dream_item_name:pyjama_chestplate}" - resource: - generate: true - material: {dream_item_material:pyjama_chestplate} + name: "{dream_item_name:pyjama_chestplate}" + material: {dream_item_material:pyjama_chestplate} + graphics: durability: unbreakable: true equipment: @@ -417,10 +376,9 @@ items: tooltip_style: "{dream_rarity:pyjama_chestplate}" pyjama_leggings: - display_name: "{dream_item_name:pyjama_leggings}" - resource: - generate: true - material: {dream_item_material:pyjama_leggings} + name: "{dream_item_name:pyjama_leggings}" + material: {dream_item_material:pyjama_leggings} + graphics: durability: unbreakable: true equipment: @@ -431,10 +389,9 @@ items: tooltip_style: "{dream_rarity:pyjama_leggings}" pyjama_boots: - display_name: "{dream_item_name:pyjama_boots}" - resource: - generate: true - material: {dream_item_material:pyjama_boots} + name: "{dream_item_name:pyjama_boots}" + material: {dream_item_material:pyjama_boots} + graphics: durability: unbreakable: true equipment: diff --git a/src/main/resources/contents/omc_dream/blocks.yml b/src/main/resources/contents/omc_dream/blocks.yml index cda1c2388..868a33561 100644 --- a/src/main/resources/contents/omc_dream/blocks.yml +++ b/src/main/resources/contents/omc_dream/blocks.yml @@ -2,12 +2,10 @@ info: namespace: omc_dream items: vegetation_1: - display_name: "Sculk Végétation 1" - resource: - material: PAPER - generate: false - model_path: blocks/vegetation_1 - specific_properties: + name: "Sculk Végétation 1" + graphics: + model: blocks/vegetation_1 + behaviours: block: placed_model: type: REAL_WIRE @@ -16,15 +14,12 @@ items: roty: 0 light_level: 6 ewenite_ore: - display_name: §dMinerais d'Ewenite + name: Minerais d'Ewenite lore: - - "§7Une découverte pas surprenante" - resource: - generate: true - material: PAPER - textures: - - blocks/ewenite_ore.png - specific_properties: + - "Une découverte pas surprenante" + graphics: + texture: blocks/ewenite_ore + behaviours: block: drop_when_mined: false drop_on_silk_touch: true @@ -37,16 +32,6 @@ items: - DIAMOND_PICKAXE - NETHERITE_PICKAXE hardness: 2 - no_explosion: false - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 events: placed_block: break: @@ -60,18 +45,14 @@ items: min_amount: 1 max_amount: 3 deepslate_ewenite_ore: - display_name: §dMinerai d'Ewenite des Abimes + name: Minerai d'Ewenite des Abimes lore: - - "§7Une découverte pas surprenante" - resource: - generate: true - material: PAPER - textures: - - blocks/deepslate_ewenite_ore.png - specific_properties: + - "Une découverte pas surprenante" + graphics: + texture: blocks/deepslate_ewenite_ore + behaviours: block: hardness: 3 - no_explosion: false drop_when_mined: false drop_on_silk_touch: true light_level: 12 @@ -82,15 +63,6 @@ items: - IRON_PICKAXE - DIAMOND_PICKAXE - NETHERITE_PICKAXE - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 events: placed_block: break: @@ -104,29 +76,16 @@ items: min_amount: 1 max_amount: 3 ewenite_block: - display_name: §dBloc d'Ewenite + name: Bloc d'Ewenite lore: - - "§7Une fusion de débilité." - resource: - generate: true - material: PAPER - textures: - - blocks/ewenite_block.png - specific_properties: + - "Une fusion de débilité." + graphics: + texture: blocks/ewenite_block + behaviours: block: hardness: 3 - no_explosion: false placed_model: type: REAL_NOTE break_particles: ITEM break_tools_whitelist: - PICKAXE - sound: - break: - name: BLOCK_STONE_BREAK - volume: 1 - pitch: 1 - place: - name: BLOCK_STONE_PLACE - volume: 1 - pitch: 1 \ No newline at end of file diff --git a/src/main/resources/contents/omc_dream/category.yml b/src/main/resources/contents/omc_dream/category.yml index 473399770..264a03ea5 100644 --- a/src/main/resources/contents/omc_dream/category.yml +++ b/src/main/resources/contents/omc_dream/category.yml @@ -3,7 +3,6 @@ info: categories: omc_dream: enabled: true - skip_if_already: false icon: omc_dream:glacite_orb name: "Dimension des Reves" items: diff --git a/src/main/resources/contents/omc_dream/foods.yml b/src/main/resources/contents/omc_dream/foods.yml index b0b2621f7..c76a615d2 100644 --- a/src/main/resources/contents/omc_dream/foods.yml +++ b/src/main/resources/contents/omc_dream/foods.yml @@ -2,173 +2,156 @@ info: namespace: omc_dream items: moon_fish: - display_name: "{dream_item_name:moon_fish}" + name: "{dream_item_name:moon_fish}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:moon_fish} - generate: true - textures: - - fishes/moon_fish.png + material: {dream_item_material:moon_fish} + graphics: + texture: fishes/moon_fish consumable: nutrition: 2 saturation: 0.4 tooltip_style: "{dream_rarity:moon_fish}" sun_fish: - display_name: "{dream_item_name:sun_fish}" + name: "{dream_item_name:sun_fish}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:sun_fish} - generate: true - textures: - - fishes/sun_fish.png + material: {dream_item_material:sun_fish} + graphics: + texture: fishes/sun_fish lore: - - '§7Attention! Vous risquez' - - '§7de vous brulez!' + - 'Attention! Vous risquez' + - 'de vous brulez!' consumable: nutrition: 6 saturation: 9.6 tooltip_style: "{dream_rarity:sun_fish}" poissonion: - display_name: "{dream_item_name:poissonion}" + name: "{dream_item_name:poissonion}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:poissonion} - generate: true - textures: - - fishes/poissonion.png + material: {dream_item_material:poissonion} + graphics: + texture: fishes/poissonion lore: - - '§7On dirait un onion...' + - 'On dirait un onion...' consumable: nutrition: 2 saturation: 0.4 tooltip_style: "{dream_rarity:poissonion}" cooked_poissonion: - display_name: "{dream_item_name:cooked_poissonion}" + name: "{dream_item_name:cooked_poissonion}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:cooked_poissonion} - generate: true - textures: - - fishes/cooked_poissonion.png + material: {dream_item_material:cooked_poissonion} + graphics: + texture: fishes/cooked_poissonion lore: - - '§7Mot du dev:' - - '§7Il est plus beau cru' + - 'Mot du dev:' + - 'Il est plus beau cru' consumable: nutrition: 5 saturation: 6 tooltip_style: "{dream_rarity:cooked_poissonion}" dockerfish: - display_name: "{dream_item_name:dockerfish}" + name: "{dream_item_name:dockerfish}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:dockerfish} - generate: true - textures: - - fishes/dockerfish.png + material: {dream_item_material:dockerfish} + graphics: + texture: fishes/dockerfish consumable: nutrition: 2 saturation: 0.4 tooltip_style: "{dream_rarity:dockerfish}" chips_aywen: - display_name: "{dream_item_name:chips_aywen}" + name: "{dream_item_name:chips_aywen}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_aywen} - generate: false - model_path: consumable/chips_aywen + material: {dream_item_material:chips_aywen} + graphics: + model: consumable/chips_aywen lore: - - '§7Les joueurs aiment tellement Aywen' - - "§7malgré qu'il ait joué meme pas 1h30" + - 'Les joueurs aiment tellement Aywen' + - "malgré qu'il ait joué meme pas 1h30" consumable: nutrition: 15 saturation: 3 tooltip_style: "{dream_rarity:chips_aywen}" chips_dihydrogene: - display_name: "{dream_item_name:chips_dihydrogene}" + name: "{dream_item_name:chips_dihydrogene}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_dihydrogene} - generate: false - model_path: consumable/chips_dihydrogene + material: {dream_item_material:chips_dihydrogene} + graphics: + model: consumable/chips_dihydrogene lore: - - '§7Attention explosif!' + - 'Attention explosif!' consumable: nutrition: 15 saturation: 3 tooltip_style: "{dream_rarity:chips_dihydrogene}" chips_jimmy: - display_name: "{dream_item_name:chips_jimmy}" + name: "{dream_item_name:chips_jimmy}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_jimmy} - generate: false - model_path: consumable/chips_jimmy + material: {dream_item_material:chips_jimmy} + graphics: + model: consumable/chips_jimmy lore: - - '§7R.I.P Jimmy' - - '§7Root est son successeur' + - 'R.I.P Jimmy' + - 'Root est son successeur' consumable: nutrition: 15 saturation: 3 tooltip_style: "{dream_rarity:chips_jimmy}" chips_lait_2_margouta: - display_name: "{dream_item_name:chips_lait_2_margouta}" + name: "{dream_item_name:chips_lait_2_margouta}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_lait_2_margouta} - generate: false - model_path: consumable/chips_lait_2_margouta + material: {dream_item_material:chips_lait_2_margouta} + graphics: + model: consumable/chips_lait_2_margouta lore: - - '§7Miam' + - 'Miam' consumable: nutrition: 20 saturation: 3 tooltip_style: "{dream_rarity:chips_lait_2_margouta}" chips_nature: - display_name: "{dream_item_name:chips_nature}" + name: "{dream_item_name:chips_nature}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_nature} - generate: false - model_path: consumable/chips_nature + material: {dream_item_material:chips_nature} + graphics: + model: consumable/chips_nature lore: - - '§7Basique, simple' + - 'Basique, simple' consumable: nutrition: 10 saturation: 3 tooltip_style: "{dream_rarity:chips_nature}" chips_sans_plomb: - display_name: "{dream_item_name:chips_sans_plomb}" + name: "{dream_item_name:chips_sans_plomb}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_sans_plomb} - generate: false - model_path: consumable/chips_sans_plomb + material: {dream_item_material:chips_sans_plomb} + graphics: + model: consumable/chips_sans_plomb lore: - - '§7La hausse de prix....' + - 'La hausse de prix....' consumable: nutrition: 15 saturation: 3 tooltip_style: "{dream_rarity:chips_sans_plomb}" chips_terre: - display_name: "{dream_item_name:chips_terre}" + name: "{dream_item_name:chips_terre}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:chips_terre} - generate: false - model_path: consumable/chips_terre + material: {dream_item_material:chips_terre} + graphics: + model: consumable/chips_terre lore: - - '§7pourquoi pas' + - 'pourquoi pas' consumable: nutrition: 15 saturation: 3 diff --git a/src/main/resources/contents/omc_dream/items.yml b/src/main/resources/contents/omc_dream/items.yml index 5bf23cc3c..053fb9e88 100644 --- a/src/main/resources/contents/omc_dream/items.yml +++ b/src/main/resources/contents/omc_dream/items.yml @@ -2,51 +2,44 @@ info: namespace: omc_dream items: corrupted_sculk: - display_name: "{dream_item_name:corrupted_sculk}" - resource: - material: {dream_item_material:corrupted_sculk} - generate: false - model_path: "minecraft:item/sculk" + name: "{dream_item_name:corrupted_sculk}" + material: {dream_item_material:corrupted_sculk} + graphics: + model: "minecraft:item/sculk" lore: - - "§7§oDu sculk qui a vécu..." + - "Du sculk qui a vécu..." tooltip_style: "{dream_rarity:corrupted_sculk}" old_pale_oak: - display_name: "{dream_item_name:old_pale_oak}" - resource: - material: {dream_item_material:old_pale_oak} - generate: false - model_path: "minecraft:block/pale_oak_wood" + name: "{dream_item_name:old_pale_oak}" + material: {dream_item_material:old_pale_oak} + graphics: + model: "minecraft:block/pale_oak_wood" lore: - - "§7§o... et qui a subit des crises." + - "... et qui a subit des crises." tooltip_style: "{dream_rarity:old_pale_oak}" corrupted_string: - display_name: "{dream_item_name:corrupted_string}" - resource: - generate: true - textures: - - minecraft:item/string.png - material: {dream_item_material:corrupted_string} + name: "{dream_item_name:corrupted_string}" + material: {dream_item_material:corrupted_string} + graphics: + texture: minecraft:item/string tooltip_style: "{dream_rarity:corrupted_string}" creaking_heart: - display_name: "{dream_item_name:creaking_heart}" - resource: - generate: true - textures: - - minecraft:item/resin_clump.png - material: {dream_item_material:creaking_heart} + name: "{dream_item_name:creaking_heart}" + material: {dream_item_material:creaking_heart} + graphics: + texture: minecraft:item/resin_clump lore: - - "§7§oun coeur frais." + - "un coeur frais." tooltip_style: "{dream_rarity:creaking_heart}" old_creaking_axe: - display_name: "{dream_item_name:old_creaking_axe}" - resource: - generate: false - material: {dream_item_material:old_creaking_axe} - model_path: tools/creaking_axe + name: "{dream_item_name:old_creaking_axe}" + material: {dream_item_material:old_creaking_axe} + graphics: + model: tools/creaking_axe durability: unbreakable: true attribute_modifiers: @@ -56,11 +49,10 @@ items: tooltip_style: "{dream_rarity:old_creaking_axe}" soul_axe: - display_name: "{dream_item_name:soul_axe}" - resource: - generate: false - material: {dream_item_material:soul_axe} - model_path: tools/soul_axe + name: "{dream_item_name:soul_axe}" + material: {dream_item_material:soul_axe} + graphics: + model: tools/soul_axe durability: unbreakable: true attribute_modifiers: @@ -70,12 +62,10 @@ items: tooltip_style: "{dream_rarity:soul_axe}" soul: - display_name: "{dream_item_name:soul}" - resource: - generate: true - textures: - - others/soul - material: {dream_item_material:soul} + name: "{dream_item_name:soul}" + material: {dream_item_material:soul} + graphics: + texture: others/soul tooltip_style: "{dream_rarity:soul}" cloud_fishing_rod: @@ -92,110 +82,95 @@ items: tooltip_style: "{dream_rarity:cloud_fishing_rod}" meteo_wand: - display_name: "{dream_item_name:meteo_wand}" - resource: - material: {dream_item_material:meteo_wand} - model_path: tools/meteo_wand + name: "{dream_item_name:meteo_wand}" + material: {dream_item_material:meteo_wand} + graphics: + model: tools/meteo_wand tooltip_style: "{dream_rarity:meteo_wand}" cloud_key: - display_name: "{dream_item_name:cloud_key}" - resource: - material: {dream_item_material:cloud_key} - generate: true - textures: - - others/cloud_key + name: "{dream_item_name:cloud_key}" + material: {dream_item_material:cloud_key} + graphics: + texture: others/cloud_key tooltip_style: "{dream_rarity:cloud_key}" somnifere: - display_name: "{dream_item_name:somnifere}" + name: "{dream_item_name:somnifere}" components_nbt_file: "nbt/eatable.json" - resource: - material: {dream_item_material:somnifere} - generate: true - textures: - - others/somnifere - lore: - - '§7Vous allez faire un gros dodo' + material: {dream_item_material:somnifere} + graphics: + texture: others/somnifere + lore: + - 'Vous allez faire un gros dodo' tooltip_style: "{dream_rarity:somnifere}" metal_detector: - display_name: "{dream_item_name:metal_detector}" - resource: - generate: false - material: {dream_item_material:metal_detector} - model_path: tools/metal_detector + name: "{dream_item_name:metal_detector}" + material: {dream_item_material:metal_detector} + graphics: + model: tools/metal_detector tooltip_style: "{dream_rarity:metal_detector}" ewenite: - display_name: "{dream_item_name:ewenite}" + name: "{dream_item_name:ewenite}" lore: - - "§7Un matériau pas ouf" - resource: - generate: true - material: {dream_item_material:ewenite} - textures: - - others/ewenite.png + - "Un matériau pas ouf" + material: {dream_item_material:ewenite} + graphics: + texture: others/ewenite nbt: '{"PublicBukkitValues":{"openmc:to_dream_item": "omc_dream:ewenite"}}' tooltip_style: "{dream_rarity:ewenite}" crystallized_pickaxe: - display_name: "{dream_item_name:crystallized_pickaxe}" - resource: - material: {dream_item_material:crystallized_pickaxe} - generate: true - textures: - - tools/crystalized_pickaxe + name: "{dream_item_name:crystallized_pickaxe}" + material: {dream_item_material:crystallized_pickaxe} + graphics: + texture: tools/crystalized_pickaxe durability: unbreakable: true tooltip_style: "{dream_rarity:crystallized_pickaxe}" mecanic_pickaxe: - display_name: "{dream_item_name:mecanic_pickaxe}" - resource: - material: {dream_item_material:mecanic_pickaxe} - generate: false - model_path: tools/mecanic_pickaxe + name: "{dream_item_name:mecanic_pickaxe}" + material: {dream_item_material:mecanic_pickaxe} + graphics: + model: tools/mecanic_pickaxe durability: unbreakable: true tooltip_style: "{dream_rarity:mecanic_pickaxe}" glacite: - display_name: "{dream_item_name:glacite}" - resource: - material: {dream_item_material:glacite} - generate: false - model_path: "minecraft:block/blue_ice" + name: "{dream_item_name:glacite}" + material: {dream_item_material:glacite} + graphics: + model: "minecraft:block/blue_ice" tooltip_style: "{dream_rarity:glacite}" coal_burn: - display_name: "{dream_item_name:coal_burn}" - resource: - material: {dream_item_material:coal_burn} - generate: false - model_path: "minecraft:item/charcoal" + name: "{dream_item_name:coal_burn}" + material: {dream_item_material:coal_burn} + graphics: + model: "minecraft:item/charcoal" tooltip_style: "{dream_rarity:coal_burn}" hard_stone: - display_name: "{dream_item_name:hard_stone}" - resource: - material: {dream_item_material:hard_stone} - generate: false - model_path: "minecraft:item/deepslate" + name: "{dream_item_name:hard_stone}" + material: {dream_item_material:hard_stone} + graphics: + model: "minecraft:item/deepslate" tooltip_style: "{dream_rarity:hard_stone}" crafting_table: - display_name: "{dream_item_name:crafting_table}" - resource: - material: {dream_item_material:crafting_table} - generate: false - model_path: "minecraft:item/crafting_table" + name: "{dream_item_name:crafting_table}" + material: {dream_item_material:crafting_table} + graphics: + model: "minecraft:item/crafting_table" tooltip_style: "{dream_rarity:crafting_table}" eternal_campfire: - display_name: "{dream_item_name:eternal_campfire}" - resource: - material: {dream_item_material:eternal_campfire} - generate: false - model_path: "minecraft:item/campfire" + name: "{dream_item_name:eternal_campfire}" + material: {dream_item_material:eternal_campfire} + graphics: + model: "minecraft:item/campfire" tooltip_style: "{dream_rarity:eternal_campfire}" diff --git a/src/main/resources/contents/omc_dream/orbs.yml b/src/main/resources/contents/omc_dream/orbs.yml index dd3eeecc6..4993aee94 100644 --- a/src/main/resources/contents/omc_dream/orbs.yml +++ b/src/main/resources/contents/omc_dream/orbs.yml @@ -2,67 +2,61 @@ info: namespace: omc_dream items: domination_orb: - display_name: "{dream_item_name:domination_orb}" - resource: - material: {dream_item_material:domination_orb} - generate: false - model_path: orb/orb_domination + name: "{dream_item_name:domination_orb}" + material: {dream_item_material:domination_orb} + graphics: + model: orb/orb_domination lore: - - "§7§ola boule de détermination..." - - "§7Un des 5 Fragments de la §fSingularité" + - "la boule de détermination..." + - "Un des 5 Fragments de la Singularité" tooltip_style: "{dream_rarity:domination_orb}" ame_orb: - display_name: "{dream_item_name:ame_orb}" - resource: - material: {dream_item_material:ame_orb} - generate: false - model_path: orb/orb_ame + name: "{dream_item_name:ame_orb}" + material: {dream_item_material:ame_orb} + graphics: + model: orb/orb_ame lore: - - "§7§ola boule de la conscience..." - - "§7Un des 5 Fragments de la §fSingularité" + - "la boule de la conscience..." + - "Un des 5 Fragments de la Singularité" tooltip_style: "{dream_rarity:ame_orb}" mud_orb: - display_name: "{dream_item_name:mud_orb}" - resource: - material: {dream_item_material:mud_orb} - generate: false - model_path: orb/orb_mud + name: "{dream_item_name:mud_orb}" + material: {dream_item_material:mud_orb} + graphics: + model: orb/orb_mud lore: - - "§7§ola boule de l'espoir..." - - "§7Un des 5 Fragments de la §fSingularité" + - "la boule de l'espoir..." + - "Un des 5 Fragments de la Singularité" tooltip_style: "{dream_rarity:mud_orb}" cloud_orb: - display_name: "{dream_item_name:cloud_orb}" - resource: - material: {dream_item_material:cloud_orb} - generate: false - model_path: orb/orb_cloud + name: "{dream_item_name:cloud_orb}" + material: {dream_item_material:cloud_orb} + graphics: + model: orb/orb_cloud lore: - - "§7§ola boule du courage..." - - "§7Un des 5 Fragments de la §fSingularité" + - "la boule du courage..." + - "Un des 5 Fragments de la Singularité" tooltip_style: "{dream_rarity:cloud_orb}" glacite_orb: - display_name: "{dream_item_name:glacite_orb}" - resource: - material: {dream_item_material:glacite_orb} - generate: false - model_path: orb/orb_glacite + name: "{dream_item_name:glacite_orb}" + material: {dream_item_material:glacite_orb} + graphics: + model: orb/orb_glacite lore: - - "§7§ola boule de la solitude..." - - "§7Un des 5 Fragments de la §fSingularité" + - "la boule de la solitude..." + - "Un des 5 Fragments de la Singularité" tooltip_style: "{dream_rarity:glacite_orb}" singularity: - display_name: "{dream_item_name:singularity}" - resource: - material: {dream_item_material:singularity} - generate: false - model_path: orb/singularity + name: "{dream_item_name:singularity}" + material: {dream_item_material:singularity} + graphics: + model: orb/singularity lore: - - "§7§ol'acheminement d'un parcours chaotique dans le futur" - - "§7La §fSingularité" + - "l'acheminement d'un parcours chaotique dans le futur" + - "La Singularité" tooltip_style: "{dream_rarity:singularity}" diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_boots.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_boots.png index 013493b2a..73b799e77 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_boots.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_boots.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_chestplate.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_chestplate.png index 4dc0f916c..bd5756c5a 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_chestplate.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_chestplate.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_helmet.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_helmet.png index 093599b76..7d44895ff 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_helmet.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_helmet.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1.png index 4832a5270..c14369e17 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1_e.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1_e.png index f9dbaeb56..b04ceb373 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1_e.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_1_e.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_2.png index 5dc3a2f12..a81f3c6bf 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_leggings.png b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_leggings.png index d4641de2b..dbde31deb 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_leggings.png and b/src/main/resources/contents/omc_dream/textures/armor/cloud/cloud_leggings.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_1.png index 42409a180..303ce0a8e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_2.png index 66a6157a7..e2dd39f0f 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_armor_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_boots.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_boots.png index 680c411ac..6f38af1a5 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_boots.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_boots.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_chestplate.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_chestplate.png index bfb81f30e..0e6b6d72e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_chestplate.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_chestplate.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_helmet.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_helmet.png index ce3c011ab..9d5709d5f 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_helmet.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_helmet.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_leggings.png b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_leggings.png index 2a689eaf5..62030c265 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/cold/cold_leggings.png and b/src/main/resources/contents/omc_dream/textures/armor/cold/cold_leggings.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_1.png index 811e96c67..1327205e0 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_2.png index 496782cff..036f309ef 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_armor_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_boots.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_boots.png index fcea81549..9734d0481 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_boots.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_boots.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_chestplate.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_chestplate.png index 622974a11..5a77aa627 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_chestplate.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_chestplate.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_helmet.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_helmet.png index fa87762bf..cf32a34c8 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_helmet.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_helmet.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_leggings.png b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_leggings.png index 8602d6f35..72250bb9e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/dream/dream_leggings.png and b/src/main/resources/contents/omc_dream/textures/armor/dream/dream_leggings.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_1.png index 89f337b88..f48679c57 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_2.png index 9d54e7249..660e8b039 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_armor_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_boots.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_boots.png index dce8f3de9..51c272881 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_boots.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_boots.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_chestplate.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_chestplate.png index 32f5e3973..adf8b6a32 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_chestplate.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_chestplate.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_helmet.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_helmet.png index d21e07c4a..66173742a 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_helmet.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_helmet.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_leggings.png b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_leggings.png index 75adb8ca9..d0949fc63 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_leggings.png and b/src/main/resources/contents/omc_dream/textures/armor/old_creaking/creaking_leggings.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_1.png index ef63db66a..7cfc309b9 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_2.png index 9805a6833..ad7c60c24 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/pyjama/pyjama_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_1.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_1.png index a042ec043..102fc2cc5 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_1.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_1.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_2.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_2.png index d27c0816d..354331077 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_2.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_armor_layer_2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_boots.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_boots.png index 9f2a3b912..8fda0309f 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_boots.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_boots.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_chestplate.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_chestplate.png index ea82ee07a..906699e16 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_chestplate.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_chestplate.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_helmet.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_helmet.png index 776999372..e0a9f570f 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_helmet.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_helmet.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_leggings.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_leggings.png index 10ce264b0..ba33b7355 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_leggings.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_leggings.png differ diff --git a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_outline.png b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_outline.png index 83c229dd3..e039ea07f 100644 Binary files a/src/main/resources/contents/omc_dream/textures/armor/soul/soul_outline.png and b/src/main/resources/contents/omc_dream/textures/armor/soul/soul_outline.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/deepslate_ewenite_ore.png b/src/main/resources/contents/omc_dream/textures/blocks/deepslate_ewenite_ore.png index 27522f7b8..5176eefdf 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/deepslate_ewenite_ore.png and b/src/main/resources/contents/omc_dream/textures/blocks/deepslate_ewenite_ore.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/ewenite_block.png b/src/main/resources/contents/omc_dream/textures/blocks/ewenite_block.png index b36ca2381..62e55e631 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/ewenite_block.png and b/src/main/resources/contents/omc_dream/textures/blocks/ewenite_block.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/ewenite_ore.png b/src/main/resources/contents/omc_dream/textures/blocks/ewenite_ore.png index 6ec4f5672..d95613895 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/ewenite_ore.png and b/src/main/resources/contents/omc_dream/textures/blocks/ewenite_ore.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/basetete.png b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/basetete.png index 46d64fad5..c15f95e50 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/basetete.png and b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/basetete.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/mandi2.png b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/mandi2.png index f28db1f4f..2b3a600af 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/mandi2.png and b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/mandi2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/orbe.png b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/orbe.png index 778e085a7..d242233c3 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/orbe.png and b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/orbe.png differ diff --git a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/tige.png b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/tige.png index 767735a3d..72c184896 100644 Binary files a/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/tige.png and b/src/main/resources/contents/omc_dream/textures/blocks/vegetation_1/tige.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/10.png b/src/main/resources/contents/omc_dream/textures/consumable/10.png index cedadeca9..ea2bae46d 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/10.png and b/src/main/resources/contents/omc_dream/textures/consumable/10.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/11.png b/src/main/resources/contents/omc_dream/textures/consumable/11.png index 96b8a730b..bfb594e10 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/11.png and b/src/main/resources/contents/omc_dream/textures/consumable/11.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/2.png b/src/main/resources/contents/omc_dream/textures/consumable/2.png index a899c9c59..6b4723505 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/2.png and b/src/main/resources/contents/omc_dream/textures/consumable/2.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/3.png b/src/main/resources/contents/omc_dream/textures/consumable/3.png index 9081fa833..dc959e757 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/3.png and b/src/main/resources/contents/omc_dream/textures/consumable/3.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/4.png b/src/main/resources/contents/omc_dream/textures/consumable/4.png index 8fbd9f059..d7a59be1d 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/4.png and b/src/main/resources/contents/omc_dream/textures/consumable/4.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/5.png b/src/main/resources/contents/omc_dream/textures/consumable/5.png index a899c9c59..6b4723505 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/5.png and b/src/main/resources/contents/omc_dream/textures/consumable/5.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/6.png b/src/main/resources/contents/omc_dream/textures/consumable/6.png index 1501c872b..6d725f81c 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/6.png and b/src/main/resources/contents/omc_dream/textures/consumable/6.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/7.png b/src/main/resources/contents/omc_dream/textures/consumable/7.png index d895ed0cc..c7aa88c74 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/7.png and b/src/main/resources/contents/omc_dream/textures/consumable/7.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/8.png b/src/main/resources/contents/omc_dream/textures/consumable/8.png index 94208ba7d..c814074e5 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/8.png and b/src/main/resources/contents/omc_dream/textures/consumable/8.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/9.png b/src/main/resources/contents/omc_dream/textures/consumable/9.png index a141c5775..8a13dd8dc 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/9.png and b/src/main/resources/contents/omc_dream/textures/consumable/9.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/goutawyen.png b/src/main/resources/contents/omc_dream/textures/consumable/goutawyen.png index caed70076..1371bd209 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/goutawyen.png and b/src/main/resources/contents/omc_dream/textures/consumable/goutawyen.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/nuitriscore.png b/src/main/resources/contents/omc_dream/textures/consumable/nuitriscore.png index 9081fa833..dc959e757 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/nuitriscore.png and b/src/main/resources/contents/omc_dream/textures/consumable/nuitriscore.png differ diff --git a/src/main/resources/contents/omc_dream/textures/consumable/texture.png b/src/main/resources/contents/omc_dream/textures/consumable/texture.png index 87dcd54f4..d43f76e01 100644 Binary files a/src/main/resources/contents/omc_dream/textures/consumable/texture.png and b/src/main/resources/contents/omc_dream/textures/consumable/texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/fishes/cooked_poissonion.png b/src/main/resources/contents/omc_dream/textures/fishes/cooked_poissonion.png index 6cc7343e8..6aafa6dd4 100644 Binary files a/src/main/resources/contents/omc_dream/textures/fishes/cooked_poissonion.png and b/src/main/resources/contents/omc_dream/textures/fishes/cooked_poissonion.png differ diff --git a/src/main/resources/contents/omc_dream/textures/fishes/dockerfish.png b/src/main/resources/contents/omc_dream/textures/fishes/dockerfish.png index 69f538fe7..8da12bfde 100644 Binary files a/src/main/resources/contents/omc_dream/textures/fishes/dockerfish.png and b/src/main/resources/contents/omc_dream/textures/fishes/dockerfish.png differ diff --git a/src/main/resources/contents/omc_dream/textures/fishes/moon_fish.png b/src/main/resources/contents/omc_dream/textures/fishes/moon_fish.png index 6dc97480f..c6d50978b 100644 Binary files a/src/main/resources/contents/omc_dream/textures/fishes/moon_fish.png and b/src/main/resources/contents/omc_dream/textures/fishes/moon_fish.png differ diff --git a/src/main/resources/contents/omc_dream/textures/fishes/poissonion.png b/src/main/resources/contents/omc_dream/textures/fishes/poissonion.png index 1139ee907..6796c4aa5 100644 Binary files a/src/main/resources/contents/omc_dream/textures/fishes/poissonion.png and b/src/main/resources/contents/omc_dream/textures/fishes/poissonion.png differ diff --git a/src/main/resources/contents/omc_dream/textures/fishes/sun_fish.png b/src/main/resources/contents/omc_dream/textures/fishes/sun_fish.png index d6504987d..3e164f4e6 100644 Binary files a/src/main/resources/contents/omc_dream/textures/fishes/sun_fish.png and b/src/main/resources/contents/omc_dream/textures/fishes/sun_fish.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/ame/orb.png b/src/main/resources/contents/omc_dream/textures/orb/ame/orb.png index 49be020a7..a169fe97c 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/ame/orb.png and b/src/main/resources/contents/omc_dream/textures/orb/ame/orb.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/ame/souls.png b/src/main/resources/contents/omc_dream/textures/orb/ame/souls.png index 9b1c82785..3ba68988c 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/ame/souls.png and b/src/main/resources/contents/omc_dream/textures/orb/ame/souls.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/cloud/texture.png b/src/main/resources/contents/omc_dream/textures/orb/cloud/texture.png index 73632c302..41a987f72 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/cloud/texture.png and b/src/main/resources/contents/omc_dream/textures/orb/cloud/texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/domination/aura.png b/src/main/resources/contents/omc_dream/textures/orb/domination/aura.png index 61c39dc36..63c4a926e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/domination/aura.png and b/src/main/resources/contents/omc_dream/textures/orb/domination/aura.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/domination/crown.png b/src/main/resources/contents/omc_dream/textures/orb/domination/crown.png index 9ed1fb5e8..c5e123275 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/domination/crown.png and b/src/main/resources/contents/omc_dream/textures/orb/domination/crown.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/domination/mainorb.png b/src/main/resources/contents/omc_dream/textures/orb/domination/mainorb.png index f57c89a0a..666ef02a8 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/domination/mainorb.png and b/src/main/resources/contents/omc_dream/textures/orb/domination/mainorb.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_outline.png b/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_outline.png index 2ef632fa1..3d16cbd4c 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_outline.png and b/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_outline.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_real_outline.png b/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_real_outline.png index e21cf58a1..079e4fdf6 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_real_outline.png and b/src/main/resources/contents/omc_dream/textures/orb/glacite/orb_real_outline.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/glacite/wind.png b/src/main/resources/contents/omc_dream/textures/orb/glacite/wind.png index 7a34a554e..a103ee575 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/glacite/wind.png and b/src/main/resources/contents/omc_dream/textures/orb/glacite/wind.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/mud/outline.png b/src/main/resources/contents/omc_dream/textures/orb/mud/outline.png index 6bc43e41c..19320d157 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/mud/outline.png and b/src/main/resources/contents/omc_dream/textures/orb/mud/outline.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/mud/outline_setup.png b/src/main/resources/contents/omc_dream/textures/orb/mud/outline_setup.png index 462b6083e..50dd2f281 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/mud/outline_setup.png and b/src/main/resources/contents/omc_dream/textures/orb/mud/outline_setup.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/mud/texture.png b/src/main/resources/contents/omc_dream/textures/orb/mud/texture.png index b35e3c561..d513f7b38 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/mud/texture.png and b/src/main/resources/contents/omc_dream/textures/orb/mud/texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/singularity/texture.png b/src/main/resources/contents/omc_dream/textures/orb/singularity/texture.png index cafa56aaf..25b03ffa7 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/singularity/texture.png and b/src/main/resources/contents/omc_dream/textures/orb/singularity/texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/orb/singularity/texturev3.png b/src/main/resources/contents/omc_dream/textures/orb/singularity/texturev3.png index 4da7a5801..cd83c8370 100644 Binary files a/src/main/resources/contents/omc_dream/textures/orb/singularity/texturev3.png and b/src/main/resources/contents/omc_dream/textures/orb/singularity/texturev3.png differ diff --git a/src/main/resources/contents/omc_dream/textures/others/cloud_key.png b/src/main/resources/contents/omc_dream/textures/others/cloud_key.png index e142e0850..f55893b32 100644 Binary files a/src/main/resources/contents/omc_dream/textures/others/cloud_key.png and b/src/main/resources/contents/omc_dream/textures/others/cloud_key.png differ diff --git a/src/main/resources/contents/omc_dream/textures/others/creaking_heart.png b/src/main/resources/contents/omc_dream/textures/others/creaking_heart.png index 0c5178fdb..34bf91d0a 100644 Binary files a/src/main/resources/contents/omc_dream/textures/others/creaking_heart.png and b/src/main/resources/contents/omc_dream/textures/others/creaking_heart.png differ diff --git a/src/main/resources/contents/omc_dream/textures/others/ewenite.png b/src/main/resources/contents/omc_dream/textures/others/ewenite.png index 61a3a56c6..1cf7a3a84 100644 Binary files a/src/main/resources/contents/omc_dream/textures/others/ewenite.png and b/src/main/resources/contents/omc_dream/textures/others/ewenite.png differ diff --git a/src/main/resources/contents/omc_dream/textures/others/somnifere.png b/src/main/resources/contents/omc_dream/textures/others/somnifere.png index 0efa81b21..5c58cbc5c 100644 Binary files a/src/main/resources/contents/omc_dream/textures/others/somnifere.png and b/src/main/resources/contents/omc_dream/textures/others/somnifere.png differ diff --git a/src/main/resources/contents/omc_dream/textures/others/soul.png b/src/main/resources/contents/omc_dream/textures/others/soul.png index 6eceaadbd..bfaa5ce5b 100644 Binary files a/src/main/resources/contents/omc_dream/textures/others/soul.png and b/src/main/resources/contents/omc_dream/textures/others/soul.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/creaking_axe.png b/src/main/resources/contents/omc_dream/textures/tools/creaking_axe.png index 0a8370003..4a5d6ccf2 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/creaking_axe.png and b/src/main/resources/contents/omc_dream/textures/tools/creaking_axe.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/crystalized_pickaxe.png b/src/main/resources/contents/omc_dream/textures/tools/crystalized_pickaxe.png index 1e16f2dfd..fca854d0a 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/crystalized_pickaxe.png and b/src/main/resources/contents/omc_dream/textures/tools/crystalized_pickaxe.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_01texture.png b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_01texture.png index 923b905de..6e58b5e45 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_01texture.png and b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_01texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_02texture.png b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_02texture.png index 9059435bb..c91cc2e2e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_02texture.png and b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_animation_02texture.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_texture_01.png b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_texture_01.png index 55980e8da..265dc78ad 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_texture_01.png and b/src/main/resources/contents/omc_dream/textures/tools/mecanic_pickaxe/meca_pickaxe_texture_01.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/base.png b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/base.png index ef154025f..7dfb38e2b 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/base.png and b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/base.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/cube.png b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/cube.png index 866955b1f..22b432929 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/cube.png and b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/cube.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/manche.png b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/manche.png index aaeb4435c..094c6cdf1 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/manche.png and b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/manche.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/poigne.png b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/poigne.png index 49acffc02..015bd4c80 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/metal_detector/poigne.png and b/src/main/resources/contents/omc_dream/textures/tools/metal_detector/poigne.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/meteo_wand.png b/src/main/resources/contents/omc_dream/textures/tools/meteo_wand.png index f3b4b8e65..4164614dc 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/meteo_wand.png and b/src/main/resources/contents/omc_dream/textures/tools/meteo_wand.png differ diff --git a/src/main/resources/contents/omc_dream/textures/tools/soul_axe.png b/src/main/resources/contents/omc_dream/textures/tools/soul_axe.png index 18cac7748..28f62101e 100644 Binary files a/src/main/resources/contents/omc_dream/textures/tools/soul_axe.png and b/src/main/resources/contents/omc_dream/textures/tools/soul_axe.png differ diff --git a/src/main/resources/contents/omc_effects/resourcepack/omc_effects/textures/font/tp_effect.png b/src/main/resources/contents/omc_effects/resourcepack/omc_effects/textures/font/tp_effect.png deleted file mode 100644 index 5cf4dce42..000000000 Binary files a/src/main/resources/contents/omc_effects/resourcepack/omc_effects/textures/font/tp_effect.png and /dev/null differ diff --git a/src/main/resources/contents/omc_effects/textures/font/tp_effect.png b/src/main/resources/contents/omc_effects/textures/font/tp_effect.png new file mode 100644 index 000000000..88a54a7b4 Binary files /dev/null and b/src/main/resources/contents/omc_effects/textures/font/tp_effect.png differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/0.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/0.png deleted file mode 100644 index fda88f034..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/0.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/1.png deleted file mode 100644 index 5b77eeb4f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/2.png deleted file mode 100644 index 1615a1dfd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/3.png deleted file mode 100644 index f8cc81515..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/4.png deleted file mode 100644 index ca862e9d1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/5.png deleted file mode 100644 index aa5251772..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/6.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/6.png deleted file mode 100644 index e90498c21..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/6.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/7.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/7.png deleted file mode 100644 index 9a0fd6438..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/7.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/8.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/8.png deleted file mode 100644 index 1e9d40153..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/8.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/9.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/9.png deleted file mode 100644 index 0ff6e1d79..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/9.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alarmclock.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alarmclock.png deleted file mode 100644 index 7056fcfd6..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alarmclock.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alien.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alien.png deleted file mode 100644 index 7b5c15199..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/alien.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry.png deleted file mode 100644 index 3f15bf520..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry1.png deleted file mode 100644 index 1d3c05527..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry2.png deleted file mode 100644 index 33f672dcc..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry3.png deleted file mode 100644 index 59ea220d2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/angry3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/anxious.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/anxious.png deleted file mode 100644 index 2d3a0f5e1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/anxious.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aquarius.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aquarius.png deleted file mode 100644 index c7a5efa71..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aquarius.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aries.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aries.png deleted file mode 100644 index 623a5f96b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/aries.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/asterisk.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/asterisk.png deleted file mode 100644 index 49acc1193..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/asterisk.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/atm.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/atm.png deleted file mode 100644 index b55bbb323..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/atm.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/avocado.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/avocado.png deleted file mode 100644 index 469fb3682..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/avocado.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bacon.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bacon.png deleted file mode 100644 index 8f8c6efe2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bacon.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/baguette.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/baguette.png deleted file mode 100644 index 5ddf12c46..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/baguette.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bandage.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bandage.png deleted file mode 100644 index dd0f10b47..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bandage.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bat.png deleted file mode 100644 index 4c6bad285..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/beluclown.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/beluclown.png deleted file mode 100644 index fe83442ef..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/beluclown.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biceps.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biceps.png deleted file mode 100644 index 13766033b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biceps.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biohazard.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biohazard.png deleted file mode 100644 index 98c39a653..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/biohazard.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blocked.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blocked.png deleted file mode 100644 index c692a092a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blocked.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blood.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blood.png deleted file mode 100644 index 753ac9e3a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blood.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blush.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blush.png deleted file mode 100644 index f4d7edf31..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/blush.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bye.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bye.png deleted file mode 100644 index b590d5e90..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/bye.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/callme.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/callme.png deleted file mode 100644 index e3426d3cd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/callme.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancel.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancel.png deleted file mode 100644 index f82f94ef4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancel.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancer.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancer.png deleted file mode 100644 index 180624143..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cancer.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/capricorn.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/capricorn.png deleted file mode 100644 index a3588c95a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/capricorn.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/carrot.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/carrot.png deleted file mode 100644 index 31def1cbe..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/carrot.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chair.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chair.png deleted file mode 100644 index 9f7d4fe04..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chair.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick.png deleted file mode 100644 index 2fb652f05..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick1.png deleted file mode 100644 index 9b68a9124..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick2.png deleted file mode 100644 index dd750d2aa..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/chick2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/clap.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/clap.png deleted file mode 100644 index c01a2fc6d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/clap.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/coffin.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/coffin.png deleted file mode 100644 index c4bc25801..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/coffin.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cold.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cold.png deleted file mode 100644 index 00e19037e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cold.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confirm.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confirm.png deleted file mode 100644 index 2c4e90560..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confirm.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused.png deleted file mode 100644 index b59beb9cf..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused1.png deleted file mode 100644 index c9c25597c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/confused1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/couple.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/couple.png deleted file mode 100644 index e3e38b14a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/couple.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cowboy.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cowboy.png deleted file mode 100644 index 9583eaaae..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cowboy.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crab.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crab.png deleted file mode 100644 index 0dbd9cb2d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crab.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/croissant.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/croissant.png deleted file mode 100644 index 95e32aa72..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/croissant.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crossedfingers.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crossedfingers.png deleted file mode 100644 index 4638aea7e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crossedfingers.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry.png deleted file mode 100644 index 300e5d61c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry1.png deleted file mode 100644 index af361b89a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cry1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crycat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crycat.png deleted file mode 100644 index 88a70a58e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/crycat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cucumber.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cucumber.png deleted file mode 100644 index b207ac7c1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/cucumber.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead.png deleted file mode 100644 index 8970f9698..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead1.png deleted file mode 100644 index 857a8b7ca..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dead1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doggo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doggo.png deleted file mode 100644 index 9e71f8260..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doggo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dollar.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dollar.png deleted file mode 100644 index 2cd727923..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/dollar.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doubleexclamation.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doubleexclamation.png deleted file mode 100644 index 1ee2663d9..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/doubleexclamation.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/down.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/down.png deleted file mode 100644 index cca365da0..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/down.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drops.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drops.png deleted file mode 100644 index 407bac72f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drops.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drumstick.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drumstick.png deleted file mode 100644 index 72d83f6f8..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/drumstick.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/duck.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/duck.png deleted file mode 100644 index 617e83551..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/duck.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eagle.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eagle.png deleted file mode 100644 index 563d753be..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eagle.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eggplant.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eggplant.png deleted file mode 100644 index 8b0b5ee66..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eggplant.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eject.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eject.png deleted file mode 100644 index b894e7a2d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eject.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/evil.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/evil.png deleted file mode 100644 index 0b509cd09..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/evil.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/explodehead.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/explodehead.png deleted file mode 100644 index 299cceb7c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/explodehead.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eyes.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eyes.png deleted file mode 100644 index 0cb4b714f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/eyes.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/facemask.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/facemask.png deleted file mode 100644 index 629632b82..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/facemask.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastdown.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastdown.png deleted file mode 100644 index b202f0d2b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastdown.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastforward.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastforward.png deleted file mode 100644 index 4396f6540..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastforward.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastreverse.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastreverse.png deleted file mode 100644 index f0aafc313..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastreverse.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastup.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastup.png deleted file mode 100644 index a0d56a6d9..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fastup.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fbowing.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fbowing.png deleted file mode 100644 index 19fda59d1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fbowing.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear.png deleted file mode 100644 index 8b8aba406..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear1.png deleted file mode 100644 index 155f2c676..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear3.png deleted file mode 100644 index 9ff48716e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fear3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/featcat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/featcat.png deleted file mode 100644 index 37a6f1350..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/featcat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ffacepalm.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ffacepalm.png deleted file mode 100644 index 88cbce6bf..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ffacepalm.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fidk.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fidk.png deleted file mode 100644 index b50e3c77c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fidk.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/finger.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/finger.png deleted file mode 100644 index b64e01c51..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/finger.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fire.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fire.png deleted file mode 100644 index 51a3ab308..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fire.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fish.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fish.png deleted file mode 100644 index b9bcdef18..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fish.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/flamingo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/flamingo.png deleted file mode 100644 index 87c91725e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/flamingo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fmage.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fmage.png deleted file mode 100644 index ca33d6696..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fmage.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fno.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fno.png deleted file mode 100644 index 647df960d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fno.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fok.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fok.png deleted file mode 100644 index 2c3a19f56..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/fok.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown.png deleted file mode 100644 index f3e1ca330..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown2.png deleted file mode 100644 index b705b16ef..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown3.png deleted file mode 100644 index 19273167c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown4.png deleted file mode 100644 index c0081b935..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown5.png deleted file mode 100644 index 0fd8b55d4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown6.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown6.png deleted file mode 100644 index 1032207a7..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/frown6.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/gemini.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/gemini.png deleted file mode 100644 index 99e771172..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/gemini.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/giraffe.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/giraffe.png deleted file mode 100644 index 5e3f75888..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/giraffe.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/grocervo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/grocervo.png deleted file mode 100644 index e17fd2927..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/grocervo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/halo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/halo.png deleted file mode 100644 index 4cea625c5..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/halo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hamburger.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hamburger.png deleted file mode 100644 index 914a9983b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hamburger.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/handshake.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/handshake.png deleted file mode 100644 index 9d324438b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/handshake.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hashtag.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hashtag.png deleted file mode 100644 index eef8bb4d9..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hashtag.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart.png deleted file mode 100644 index 7bed380e2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart1.png deleted file mode 100644 index 26a5c6207..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart2.png deleted file mode 100644 index c7aedb984..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart3.png deleted file mode 100644 index 1d22e281f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart4.png deleted file mode 100644 index c9d97d79b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart5.png deleted file mode 100644 index 90f6d50eb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart6.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart6.png deleted file mode 100644 index 02d803815..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/heart6.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hehe.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hehe.png deleted file mode 100644 index 0ac74ca5c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hehe.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hmmm.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hmmm.png deleted file mode 100644 index 8c1889135..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hmmm.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hot.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hot.png deleted file mode 100644 index ce7c0f2f8..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hot.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass.png deleted file mode 100644 index 0c7cee551..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass1.png deleted file mode 100644 index c89e9190e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hourglass1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hug.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hug.png deleted file mode 100644 index 0522b1ccd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/hug.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ice.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ice.png deleted file mode 100644 index 852deadf4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ice.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ill.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ill.png deleted file mode 100644 index bfcb89605..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ill.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove.png deleted file mode 100644 index 352bf424d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove1.png deleted file mode 100644 index b329c198b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlove1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlovecat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlovecat.png deleted file mode 100644 index 53ca0c8eb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/inlovecat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/jackolantern.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/jackolantern.png deleted file mode 100644 index 495491c39..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/jackolantern.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kebab.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kebab.png deleted file mode 100644 index a81c05b20..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kebab.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss.png deleted file mode 100644 index f2c69af85..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss1.png deleted file mode 100644 index a1c5aed11..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss2.png deleted file mode 100644 index 82be9251f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss3.png deleted file mode 100644 index 7d3807958..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/kiss3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lasttrack.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lasttrack.png deleted file mode 100644 index b3127dc39..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lasttrack.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh.png deleted file mode 100644 index cf33ba03c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh2.png deleted file mode 100644 index c8893a853..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh3.png deleted file mode 100644 index 6987b1941..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh4.png deleted file mode 100644 index a30662e76..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laugh4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laughcat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laughcat.png deleted file mode 100644 index b5f5da908..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/laughcat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/left.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/left.png deleted file mode 100644 index c3866107c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/left.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leftcurve.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leftcurve.png deleted file mode 100644 index 6e12d20bb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leftcurve.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leo.png deleted file mode 100644 index 7369443f8..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/leo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lion.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lion.png deleted file mode 100644 index e64e85bdd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lion.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lock.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lock.png deleted file mode 100644 index 9c65ae7af..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lock.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/luck.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/luck.png deleted file mode 100644 index 4a99cfe4f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/luck.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lul.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lul.png deleted file mode 100644 index 5e2bf61aa..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lul.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lying.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lying.png deleted file mode 100644 index ee4a7d6bf..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/lying.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/m.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/m.png deleted file mode 100644 index 101b74336..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/m.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mad.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mad.png deleted file mode 100644 index 0c92c3823..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mad.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mbowing.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mbowing.png deleted file mode 100644 index f25ad954a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mbowing.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/medal.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/medal.png deleted file mode 100644 index 1fb6d7d2c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/medal.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mfacepalm.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mfacepalm.png deleted file mode 100644 index e3e2f3603..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mfacepalm.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/midk.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/midk.png deleted file mode 100644 index 85f57c20d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/midk.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmage.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmage.png deleted file mode 100644 index ce932cfdd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmage.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmh.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmh.png deleted file mode 100644 index 5b70f4393..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mmh.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mno.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mno.png deleted file mode 100644 index a8510e59f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mno.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mok.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mok.png deleted file mode 100644 index 90ecd71af..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/mok.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/money.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/money.png deleted file mode 100644 index 8e26fa70e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/money.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moneyface.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moneyface.png deleted file mode 100644 index 4073edd5a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moneyface.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey1.png deleted file mode 100644 index c97494b7c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey2.png deleted file mode 100644 index 46dfc0e12..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey3.png deleted file mode 100644 index a7f06a2b4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monkey3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monocle.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monocle.png deleted file mode 100644 index 7c7e8d691..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/monocle.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon.png deleted file mode 100644 index d61e7ba0a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon1.png deleted file mode 100644 index 26ab19eeb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon2.png deleted file mode 100644 index bf3bd63f5..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon3.png deleted file mode 100644 index e1359710c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon4.png deleted file mode 100644 index 1026401f4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon5.png deleted file mode 100644 index 651c43318..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/moon5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nausea.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nausea.png deleted file mode 100644 index ec9698a8f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nausea.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nerd.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nerd.png deleted file mode 100644 index 9012375f1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nerd.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/neutral.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/neutral.png deleted file mode 100644 index d44ee66e2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/neutral.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nexttrack.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nexttrack.png deleted file mode 100644 index c28ce7048..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nexttrack.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/no1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/no1.png deleted file mode 100644 index 835bfe987..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/no1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/noexpression.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/noexpression.png deleted file mode 100644 index aed53482a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/noexpression.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nomouth.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nomouth.png deleted file mode 100644 index 49baa8d19..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/nomouth.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok.png deleted file mode 100644 index 3337ff2bb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok1.png deleted file mode 100644 index dd2f83c7a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/ok1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/owl.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/owl.png deleted file mode 100644 index ba14978b9..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/owl.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pan.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pan.png deleted file mode 100644 index 705395ee1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pan.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party.png deleted file mode 100644 index faf1b10c7..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party1.png deleted file mode 100644 index 6176ecb8d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/party1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pause.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pause.png deleted file mode 100644 index 7cbea86d8..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pause.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peace.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peace.png deleted file mode 100644 index 2b3256394..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peace.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peach.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peach.png deleted file mode 100644 index 38b07b7cd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/peach.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pencil.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pencil.png deleted file mode 100644 index 18dc96120..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pencil.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/person.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/person.png deleted file mode 100644 index 96f264142..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/person.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pick.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pick.png deleted file mode 100644 index c1c15ed1c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pick.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pig.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pig.png deleted file mode 100644 index 7c0ddaa72..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pig.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pisces.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pisces.png deleted file mode 100644 index f3a6706d7..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pisces.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pizza.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pizza.png deleted file mode 100644 index 1e4bb2f18..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/pizza.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/play.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/play.png deleted file mode 100644 index ae175c2e2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/play.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/playpause.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/playpause.png deleted file mode 100644 index 015a01e17..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/playpause.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/please.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/please.png deleted file mode 100644 index 17ddb161b..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/please.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/poo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/poo.png deleted file mode 100644 index 0779dd10e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/poo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/potato.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/potato.png deleted file mode 100644 index fac79a462..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/potato.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/puke.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/puke.png deleted file mode 100644 index ab5500a3d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/puke.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/punch.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/punch.png deleted file mode 100644 index dae1fbf1f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/punch.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/question.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/question.png deleted file mode 100644 index d2df68df6..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/question.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/radioactive.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/radioactive.png deleted file mode 100644 index 42dd7b4e5..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/radioactive.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedfist.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedfist.png deleted file mode 100644 index f556c0a08..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedfist.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedhand.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedhand.png deleted file mode 100644 index 56c8bf5b4..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/raisedhand.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/record.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/record.png deleted file mode 100644 index 3fdaa59dc..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/record.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/redcircle.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/redcircle.png deleted file mode 100644 index 916afc76e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/redcircle.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/reverse.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/reverse.png deleted file mode 100644 index e46e65c50..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/reverse.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/riceball.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/riceball.png deleted file mode 100644 index e0e68a4b2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/riceball.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightarrow.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightarrow.png deleted file mode 100644 index 1c59df24e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightarrow.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightcurve.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightcurve.png deleted file mode 100644 index 114bb1314..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rightcurve.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/robot.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/robot.png deleted file mode 100644 index 29d63ba95..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/robot.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rock.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rock.png deleted file mode 100644 index 57a9e5ecc..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rock.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rolling.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rolling.png deleted file mode 100644 index 77d046033..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rolling.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rooster.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rooster.png deleted file mode 100644 index 8b2fb9fbb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/rooster.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sad.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sad.png deleted file mode 100644 index cc98bd69f..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sad.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sagittarius.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sagittarius.png deleted file mode 100644 index ea84aec4c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sagittarius.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salad.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salad.png deleted file mode 100644 index a77762d24..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salad.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salt.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salt.png deleted file mode 100644 index 5cdb15b6c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/salt.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpio.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpio.png deleted file mode 100644 index c077ab022..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpio.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpion.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpion.png deleted file mode 100644 index 30f4d08f5..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/scorpion.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shark.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shark.png deleted file mode 100644 index 4090aa8ba..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shark.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shh.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shh.png deleted file mode 100644 index bd2999cba..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shh.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shrimp.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shrimp.png deleted file mode 100644 index 240a71900..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/shrimp.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleeping.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleeping.png deleted file mode 100644 index 6e198d908..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleeping.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleepy.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleepy.png deleted file mode 100644 index e200e8bda..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sleepy.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/small.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/small.png deleted file mode 100644 index 7db8f544d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/small.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile.png deleted file mode 100644 index 70e182e52..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile2.png deleted file mode 100644 index 0437c53fc..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile3.png deleted file mode 100644 index dfcdc54a1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile4.png deleted file mode 100644 index b8cefddb3..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile5.png deleted file mode 100644 index 9cd578392..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile6.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile6.png deleted file mode 100644 index d97c0b295..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smile6.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smilecat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smilecat.png deleted file mode 100644 index e33a4c2ea..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/smilecat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sneeze.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sneeze.png deleted file mode 100644 index d980b3ca3..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sneeze.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/soccerball.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/soccerball.png deleted file mode 100644 index 3a35f5f1e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/soccerball.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sparkles.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sparkles.png deleted file mode 100644 index aae9c5283..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sparkles.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/squid.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/squid.png deleted file mode 100644 index 02dc5b1a2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/squid.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/star.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/star.png deleted file mode 100644 index 4de0de2bd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/star.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/starcrescent.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/starcrescent.png deleted file mode 100644 index f0e8bbd88..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/starcrescent.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stareyes.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stareyes.png deleted file mode 100644 index 172eb2b0c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stareyes.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stop.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stop.png deleted file mode 100644 index dbd57e2d1..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stop.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stopsign.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stopsign.png deleted file mode 100644 index 5da0b3c4a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/stopsign.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sun.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sun.png deleted file mode 100644 index a2d8a4829..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sun.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sunglasses.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sunglasses.png deleted file mode 100644 index 712f208e2..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sunglasses.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/surprised.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/surprised.png deleted file mode 100644 index e66e1b3cb..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/surprised.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sushi.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sushi.png deleted file mode 100644 index 46057b61d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sushi.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sweat.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sweat.png deleted file mode 100644 index 23d0002fd..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/sweat.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/taurus.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/taurus.png deleted file mode 100644 index 1c4c176ec..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/taurus.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think.png deleted file mode 100644 index d3e1a4171..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think1.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think1.png deleted file mode 100644 index 1820454a7..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think2.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think2.png deleted file mode 100644 index e7a25855e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think3.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think3.png deleted file mode 100644 index 8451a3274..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think3.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think4.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think4.png deleted file mode 100644 index d6b762101..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think4.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think5.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think5.png deleted file mode 100644 index 6827783e6..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think5.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think6.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think6.png deleted file mode 100644 index 6ccde7536..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/think6.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tongue.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tongue.png deleted file mode 100644 index c020cd014..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tongue.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tools.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tools.png deleted file mode 100644 index dd8b6981d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tools.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tree.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tree.png deleted file mode 100644 index 6d5e87907..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/tree.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/trex.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/trex.png deleted file mode 100644 index 05c7beb3d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/trex.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/turkey.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/turkey.png deleted file mode 100644 index 745aa9b55..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/turkey.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/twofingers.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/twofingers.png deleted file mode 100644 index fc5746e7e..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/twofingers.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unamused.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unamused.png deleted file mode 100644 index 5eb339004..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unamused.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unicorn.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unicorn.png deleted file mode 100644 index b55e9ee0d..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unicorn.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unlock.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unlock.png deleted file mode 100644 index a877bea75..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/unlock.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/up.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/up.png deleted file mode 100644 index d5b5e577c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/up.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/upsidedown.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/upsidedown.png deleted file mode 100644 index 6852da461..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/upsidedown.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/virgo.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/virgo.png deleted file mode 100644 index d070bac29..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/virgo.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/voltage.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/voltage.png deleted file mode 100644 index a35af90e0..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/voltage.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/warning.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/warning.png deleted file mode 100644 index 1580696ea..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/warning.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wc.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wc.png deleted file mode 100644 index 2ad92323a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wc.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/what.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/what.png deleted file mode 100644 index 01e6ac696..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/what.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wink.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wink.png deleted file mode 100644 index d83a77d09..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/wink.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/woozy.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/woozy.png deleted file mode 100644 index 49cbb9acf..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/woozy.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/write.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/write.png deleted file mode 100644 index bfb25e778..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/write.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/xd.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/xd.png deleted file mode 100644 index 28209da46..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/xd.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yawn.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yawn.png deleted file mode 100644 index 2c3e40705..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yawn.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yinyang.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yinyang.png deleted file mode 100644 index 3e133057c..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yinyang.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yum.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yum.png deleted file mode 100644 index 385777883..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/yum.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zebra.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zebra.png deleted file mode 100644 index 5064da42a..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zebra.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zip.png b/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zip.png deleted file mode 100644 index 84cde1eef..000000000 Binary files a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/emoji/zip.png and /dev/null differ diff --git a/src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/EMOJI-LICENSE.txt b/src/main/resources/contents/omc_emoji/textures/font/EMOJI-LICENSE.txt similarity index 100% rename from src/main/resources/contents/omc_emoji/resourcepack/omc_emoji/textures/font/EMOJI-LICENSE.txt rename to src/main/resources/contents/omc_emoji/textures/font/EMOJI-LICENSE.txt diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/0.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/0.png new file mode 100644 index 000000000..6d08d2290 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/0.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/1.png new file mode 100644 index 000000000..671fb7d02 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/2.png new file mode 100644 index 000000000..76b6928cd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/3.png new file mode 100644 index 000000000..74fa0fedc Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/4.png new file mode 100644 index 000000000..5125e39fd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/5.png new file mode 100644 index 000000000..3d4a97bec Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/6.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/6.png new file mode 100644 index 000000000..e25031f93 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/6.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/7.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/7.png new file mode 100644 index 000000000..31c804713 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/7.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/8.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/8.png new file mode 100644 index 000000000..003f95f02 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/8.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/9.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/9.png new file mode 100644 index 000000000..720a9f162 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/9.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/alarmclock.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/alarmclock.png new file mode 100644 index 000000000..d7d3a5f5f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/alarmclock.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/alien.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/alien.png new file mode 100644 index 000000000..4c9b6d905 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/alien.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/angry.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry.png new file mode 100644 index 000000000..184e39bd5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/angry1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry1.png new file mode 100644 index 000000000..c0fa0b8b3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/angry2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry2.png new file mode 100644 index 000000000..e17b60ddc Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/angry3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry3.png new file mode 100644 index 000000000..dd255c77e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/angry3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/anxious.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/anxious.png new file mode 100644 index 000000000..eb2621dbe Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/anxious.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/aquarius.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/aquarius.png new file mode 100644 index 000000000..c95508991 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/aquarius.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/aries.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/aries.png new file mode 100644 index 000000000..9e1329bc6 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/aries.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/asterisk.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/asterisk.png new file mode 100644 index 000000000..0942cf179 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/asterisk.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/atm.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/atm.png new file mode 100644 index 000000000..84f3f0dae Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/atm.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/avocado.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/avocado.png new file mode 100644 index 000000000..cf785b9e3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/avocado.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/bacon.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/bacon.png new file mode 100644 index 000000000..6560988a6 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/bacon.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/baguette.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/baguette.png new file mode 100644 index 000000000..947457d7d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/baguette.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/bandage.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/bandage.png new file mode 100644 index 000000000..86a42b0da Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/bandage.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/bat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/bat.png new file mode 100644 index 000000000..5ee5c21ee Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/bat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/beluclown.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/beluclown.png new file mode 100644 index 000000000..a70f90172 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/beluclown.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/biceps.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/biceps.png new file mode 100644 index 000000000..2c9220ad9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/biceps.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/biohazard.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/biohazard.png new file mode 100644 index 000000000..b9e5135a4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/biohazard.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/blocked.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/blocked.png new file mode 100644 index 000000000..9b9d97a40 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/blocked.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/blood.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/blood.png new file mode 100644 index 000000000..cb28926ea Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/blood.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/blush.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/blush.png new file mode 100644 index 000000000..08e860156 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/blush.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/bye.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/bye.png new file mode 100644 index 000000000..0078b50bd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/bye.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/callme.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/callme.png new file mode 100644 index 000000000..7bbdb0c83 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/callme.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cancel.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cancel.png new file mode 100644 index 000000000..68c4a884e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cancel.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cancer.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cancer.png new file mode 100644 index 000000000..ff9f214f0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cancer.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/capricorn.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/capricorn.png new file mode 100644 index 000000000..5b21823b7 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/capricorn.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/carrot.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/carrot.png new file mode 100644 index 000000000..e1bbbbadd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/carrot.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/chair.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/chair.png new file mode 100644 index 000000000..a6cf17af5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/chair.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/chick.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick.png new file mode 100644 index 000000000..1557b464b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/chick1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick1.png new file mode 100644 index 000000000..36bb9f1fe Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/chick2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick2.png new file mode 100644 index 000000000..19fb4e5c3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/chick2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/clap.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/clap.png new file mode 100644 index 000000000..13daff625 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/clap.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/coffin.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/coffin.png new file mode 100644 index 000000000..f6158dff2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/coffin.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cold.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cold.png new file mode 100644 index 000000000..90ab205e3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cold.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/confirm.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/confirm.png new file mode 100644 index 000000000..bbcbe1885 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/confirm.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/confused.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/confused.png new file mode 100644 index 000000000..7aea51c3c Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/confused.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/confused1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/confused1.png new file mode 100644 index 000000000..b41b9d4f9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/confused1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/couple.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/couple.png new file mode 100644 index 000000000..6992e72d5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/couple.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cowboy.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cowboy.png new file mode 100644 index 000000000..24099b770 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cowboy.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/crab.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/crab.png new file mode 100644 index 000000000..945ff08b7 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/crab.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/croissant.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/croissant.png new file mode 100644 index 000000000..652e98a0a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/croissant.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/crossedfingers.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/crossedfingers.png new file mode 100644 index 000000000..0b417a8f2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/crossedfingers.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cry.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cry.png new file mode 100644 index 000000000..7efcbacba Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cry.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cry1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cry1.png new file mode 100644 index 000000000..e341285bc Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cry1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/crycat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/crycat.png new file mode 100644 index 000000000..5d7cc3bd9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/crycat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/cucumber.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/cucumber.png new file mode 100644 index 000000000..58c1fccc5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/cucumber.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/dead.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/dead.png new file mode 100644 index 000000000..827f05752 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/dead.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/dead1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/dead1.png new file mode 100644 index 000000000..8945dd8f0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/dead1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/doggo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/doggo.png new file mode 100644 index 000000000..2206951a8 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/doggo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/dollar.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/dollar.png new file mode 100644 index 000000000..96aaff75a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/dollar.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/doubleexclamation.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/doubleexclamation.png new file mode 100644 index 000000000..729af5542 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/doubleexclamation.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/down.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/down.png new file mode 100644 index 000000000..fed548dc2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/down.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/drops.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/drops.png new file mode 100644 index 000000000..d3a8ef37b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/drops.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/drumstick.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/drumstick.png new file mode 100644 index 000000000..6e0d75645 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/drumstick.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/duck.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/duck.png new file mode 100644 index 000000000..1d3a4b666 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/duck.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/eagle.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/eagle.png new file mode 100644 index 000000000..6f9569a98 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/eagle.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/eggplant.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/eggplant.png new file mode 100644 index 000000000..78b2f1920 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/eggplant.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/eject.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/eject.png new file mode 100644 index 000000000..5fb78b727 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/eject.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/evil.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/evil.png new file mode 100644 index 000000000..5927fd461 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/evil.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/explodehead.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/explodehead.png new file mode 100644 index 000000000..e8e2e0447 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/explodehead.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/eyes.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/eyes.png new file mode 100644 index 000000000..b494f123d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/eyes.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/facemask.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/facemask.png new file mode 100644 index 000000000..c881fa80e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/facemask.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fastdown.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastdown.png new file mode 100644 index 000000000..99f31c5fe Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastdown.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fastforward.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastforward.png new file mode 100644 index 000000000..97d7fc7b2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastforward.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fastreverse.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastreverse.png new file mode 100644 index 000000000..40717e74d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastreverse.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fastup.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastup.png new file mode 100644 index 000000000..854d32a27 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fastup.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fbowing.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fbowing.png new file mode 100644 index 000000000..ef53eb64a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fbowing.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fear.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear.png new file mode 100644 index 000000000..559fe3848 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fear1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear1.png new file mode 100644 index 000000000..08aa49749 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fear3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear3.png new file mode 100644 index 000000000..e24864ff9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fear3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/featcat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/featcat.png new file mode 100644 index 000000000..854c42dc9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/featcat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/ffacepalm.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/ffacepalm.png new file mode 100644 index 000000000..54f621b93 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/ffacepalm.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fidk.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fidk.png new file mode 100644 index 000000000..48c672636 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fidk.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/finger.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/finger.png new file mode 100644 index 000000000..5cdba14f2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/finger.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fire.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fire.png new file mode 100644 index 000000000..d9437d479 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fire.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fish.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fish.png new file mode 100644 index 000000000..f268f70c4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fish.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/flamingo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/flamingo.png new file mode 100644 index 000000000..c461e79b0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/flamingo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fmage.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fmage.png new file mode 100644 index 000000000..717853d97 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fmage.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fno.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fno.png new file mode 100644 index 000000000..aab0c4c59 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fno.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/fok.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/fok.png new file mode 100644 index 000000000..ed85becba Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/fok.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown.png new file mode 100644 index 000000000..18eb16b69 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown2.png new file mode 100644 index 000000000..6473a63e9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown3.png new file mode 100644 index 000000000..48c9c9060 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown4.png new file mode 100644 index 000000000..5872f15be Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown5.png new file mode 100644 index 000000000..4c0ff755f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/frown6.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown6.png new file mode 100644 index 000000000..c6b69532e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/frown6.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/gemini.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/gemini.png new file mode 100644 index 000000000..a54cbde85 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/gemini.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/giraffe.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/giraffe.png new file mode 100644 index 000000000..1448d9fc3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/giraffe.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/grocervo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/grocervo.png new file mode 100644 index 000000000..cbdf0e343 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/grocervo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/halo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/halo.png new file mode 100644 index 000000000..f5e8a82ae Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/halo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hamburger.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hamburger.png new file mode 100644 index 000000000..11830cff5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hamburger.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/handshake.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/handshake.png new file mode 100644 index 000000000..bc77af72e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/handshake.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hashtag.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hashtag.png new file mode 100644 index 000000000..e435ca449 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hashtag.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart.png new file mode 100644 index 000000000..83edcd608 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart1.png new file mode 100644 index 000000000..04b2788cd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart2.png new file mode 100644 index 000000000..7ca315f3e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart3.png new file mode 100644 index 000000000..46b0a1ec9 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart4.png new file mode 100644 index 000000000..623a0b5f0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart5.png new file mode 100644 index 000000000..6d803121d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/heart6.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart6.png new file mode 100644 index 000000000..53e2163c0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/heart6.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hehe.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hehe.png new file mode 100644 index 000000000..d63951658 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hehe.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hmmm.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hmmm.png new file mode 100644 index 000000000..77ca5e4d5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hmmm.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hot.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hot.png new file mode 100644 index 000000000..00a101912 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hot.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass.png new file mode 100644 index 000000000..b3d8c40f2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass1.png new file mode 100644 index 000000000..ad87be4da Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hourglass1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/hug.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/hug.png new file mode 100644 index 000000000..b4b1faa37 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/hug.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/ice.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/ice.png new file mode 100644 index 000000000..8ae39a063 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/ice.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/ill.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/ill.png new file mode 100644 index 000000000..568cf41f6 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/ill.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove.png new file mode 100644 index 000000000..6d9fb9019 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove1.png new file mode 100644 index 000000000..069f19f6d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlove1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/inlovecat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlovecat.png new file mode 100644 index 000000000..f3a7800b6 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/inlovecat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/jackolantern.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/jackolantern.png new file mode 100644 index 000000000..e34f37a76 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/jackolantern.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/kebab.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/kebab.png new file mode 100644 index 000000000..168341880 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/kebab.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss.png new file mode 100644 index 000000000..ca5642268 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss1.png new file mode 100644 index 000000000..598bb2fc0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss2.png new file mode 100644 index 000000000..5b1cbd0f4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss3.png new file mode 100644 index 000000000..ca0d263cd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/kiss3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/lasttrack.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/lasttrack.png new file mode 100644 index 000000000..0e4ae32bf Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/lasttrack.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh.png new file mode 100644 index 000000000..b01a1d0af Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh2.png new file mode 100644 index 000000000..485581355 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh3.png new file mode 100644 index 000000000..c2feb4568 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh4.png new file mode 100644 index 000000000..f56fe746c Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/laugh4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/laughcat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/laughcat.png new file mode 100644 index 000000000..0fe4aec9e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/laughcat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/left.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/left.png new file mode 100644 index 000000000..2a570ad08 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/left.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/leftcurve.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/leftcurve.png new file mode 100644 index 000000000..17c61848a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/leftcurve.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/leo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/leo.png new file mode 100644 index 000000000..3d487e8b8 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/leo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/lion.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/lion.png new file mode 100644 index 000000000..cd0afc7f8 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/lion.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/lock.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/lock.png new file mode 100644 index 000000000..fd304ab1b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/lock.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/luck.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/luck.png new file mode 100644 index 000000000..1db9578c3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/luck.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/lul.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/lul.png new file mode 100644 index 000000000..71274ea66 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/lul.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/lying.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/lying.png new file mode 100644 index 000000000..f9eaac01f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/lying.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/m.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/m.png new file mode 100644 index 000000000..5b34b5266 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/m.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mad.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mad.png new file mode 100644 index 000000000..c380e4aea Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mad.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mbowing.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mbowing.png new file mode 100644 index 000000000..4748a3913 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mbowing.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/medal.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/medal.png new file mode 100644 index 000000000..248fa44e4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/medal.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mfacepalm.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mfacepalm.png new file mode 100644 index 000000000..72fa18f1e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mfacepalm.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/midk.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/midk.png new file mode 100644 index 000000000..7758c8b7b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/midk.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mmage.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mmage.png new file mode 100644 index 000000000..24420f848 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mmage.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mmh.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mmh.png new file mode 100644 index 000000000..4d9ad9671 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mmh.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mno.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mno.png new file mode 100644 index 000000000..f7d20c7dd Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mno.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/mok.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/mok.png new file mode 100644 index 000000000..70f8e2109 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/mok.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/money.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/money.png new file mode 100644 index 000000000..832f68a0c Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/money.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moneyface.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moneyface.png new file mode 100644 index 000000000..e37f7da7e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moneyface.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey1.png new file mode 100644 index 000000000..c696a0ef8 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey2.png new file mode 100644 index 000000000..3960da6f2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey3.png new file mode 100644 index 000000000..4393f46a1 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/monkey3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/monocle.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/monocle.png new file mode 100644 index 000000000..bbee49956 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/monocle.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon.png new file mode 100644 index 000000000..ceb46d04b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon1.png new file mode 100644 index 000000000..03f5c3bee Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon2.png new file mode 100644 index 000000000..5b422ad61 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon3.png new file mode 100644 index 000000000..4456f011f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon4.png new file mode 100644 index 000000000..be46fab52 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/moon5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon5.png new file mode 100644 index 000000000..e4b64055a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/moon5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/nausea.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/nausea.png new file mode 100644 index 000000000..f64ba4c34 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/nausea.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/nerd.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/nerd.png new file mode 100644 index 000000000..c2b9d2d11 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/nerd.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/neutral.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/neutral.png new file mode 100644 index 000000000..b39b6b835 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/neutral.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/nexttrack.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/nexttrack.png new file mode 100644 index 000000000..b347670a4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/nexttrack.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/no1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/no1.png new file mode 100644 index 000000000..07d15f058 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/no1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/noexpression.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/noexpression.png new file mode 100644 index 000000000..ceb8a82df Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/noexpression.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/nomouth.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/nomouth.png new file mode 100644 index 000000000..4324fc362 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/nomouth.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/ok.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/ok.png new file mode 100644 index 000000000..d4b6d6f7d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/ok.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/ok1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/ok1.png new file mode 100644 index 000000000..88fdef85f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/ok1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/owl.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/owl.png new file mode 100644 index 000000000..ca2b00898 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/owl.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pan.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pan.png new file mode 100644 index 000000000..4a485a443 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pan.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/party.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/party.png new file mode 100644 index 000000000..487de6cfb Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/party.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/party1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/party1.png new file mode 100644 index 000000000..a49a9cf90 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/party1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pause.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pause.png new file mode 100644 index 000000000..9976e28dc Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pause.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/peace.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/peace.png new file mode 100644 index 000000000..4bd5d1aca Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/peace.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/peach.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/peach.png new file mode 100644 index 000000000..de8769fe2 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/peach.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pencil.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pencil.png new file mode 100644 index 000000000..f4ccac9d0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pencil.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/person.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/person.png new file mode 100644 index 000000000..c926a933f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/person.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pick.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pick.png new file mode 100644 index 000000000..984c7a1b0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pick.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pig.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pig.png new file mode 100644 index 000000000..5a55e9331 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pig.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pisces.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pisces.png new file mode 100644 index 000000000..14162cc66 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pisces.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/pizza.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/pizza.png new file mode 100644 index 000000000..455307433 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/pizza.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/play.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/play.png new file mode 100644 index 000000000..f181eb45f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/play.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/playpause.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/playpause.png new file mode 100644 index 000000000..01e2a8f5b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/playpause.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/please.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/please.png new file mode 100644 index 000000000..2af5968ae Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/please.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/poo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/poo.png new file mode 100644 index 000000000..e2cf2b11b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/poo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/potato.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/potato.png new file mode 100644 index 000000000..4c3f11284 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/potato.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/puke.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/puke.png new file mode 100644 index 000000000..927b97d95 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/puke.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/punch.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/punch.png new file mode 100644 index 000000000..b0c55e1e7 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/punch.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/question.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/question.png new file mode 100644 index 000000000..6b18d5752 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/question.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/radioactive.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/radioactive.png new file mode 100644 index 000000000..98cd76cb5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/radioactive.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedfist.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedfist.png new file mode 100644 index 000000000..83fbe171b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedfist.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedhand.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedhand.png new file mode 100644 index 000000000..7ba257982 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/raisedhand.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/record.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/record.png new file mode 100644 index 000000000..2c331f80d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/record.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/redcircle.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/redcircle.png new file mode 100644 index 000000000..302ab1b11 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/redcircle.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/reverse.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/reverse.png new file mode 100644 index 000000000..b92afc458 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/reverse.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/riceball.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/riceball.png new file mode 100644 index 000000000..c5001a96a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/riceball.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/rightarrow.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/rightarrow.png new file mode 100644 index 000000000..46fc67656 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/rightarrow.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/rightcurve.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/rightcurve.png new file mode 100644 index 000000000..ec2af88b0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/rightcurve.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/robot.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/robot.png new file mode 100644 index 000000000..e79639294 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/robot.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/rock.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/rock.png new file mode 100644 index 000000000..24079d589 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/rock.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/rolling.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/rolling.png new file mode 100644 index 000000000..165c6a639 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/rolling.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/rooster.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/rooster.png new file mode 100644 index 000000000..c4e522ebc Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/rooster.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sad.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sad.png new file mode 100644 index 000000000..68b71b74f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sad.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sagittarius.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sagittarius.png new file mode 100644 index 000000000..86a797c2b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sagittarius.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/salad.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/salad.png new file mode 100644 index 000000000..a178af39d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/salad.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/salt.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/salt.png new file mode 100644 index 000000000..ab56a5640 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/salt.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpio.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpio.png new file mode 100644 index 000000000..53b8bc5f8 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpio.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpion.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpion.png new file mode 100644 index 000000000..0ba4a08b4 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/scorpion.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/shark.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/shark.png new file mode 100644 index 000000000..0b9fe6355 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/shark.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/shh.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/shh.png new file mode 100644 index 000000000..72a39c654 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/shh.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/shrimp.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/shrimp.png new file mode 100644 index 000000000..765c7b491 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/shrimp.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sleeping.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sleeping.png new file mode 100644 index 000000000..9faaba854 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sleeping.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sleepy.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sleepy.png new file mode 100644 index 000000000..d9e471b86 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sleepy.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/small.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/small.png new file mode 100644 index 000000000..15c1a6557 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/small.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile.png new file mode 100644 index 000000000..0a096ed25 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile2.png new file mode 100644 index 000000000..fc67e98ef Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile3.png new file mode 100644 index 000000000..3de84ec0f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile4.png new file mode 100644 index 000000000..6bced7081 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile5.png new file mode 100644 index 000000000..f648d3ad5 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smile6.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile6.png new file mode 100644 index 000000000..d060f87c1 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smile6.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/smilecat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/smilecat.png new file mode 100644 index 000000000..b092d61a1 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/smilecat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sneeze.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sneeze.png new file mode 100644 index 000000000..f4120f197 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sneeze.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/soccerball.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/soccerball.png new file mode 100644 index 000000000..4f4bd424d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/soccerball.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sparkles.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sparkles.png new file mode 100644 index 000000000..15f7ebebb Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sparkles.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/squid.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/squid.png new file mode 100644 index 000000000..045a876bb Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/squid.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/star.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/star.png new file mode 100644 index 000000000..fc0ccd390 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/star.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/starcrescent.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/starcrescent.png new file mode 100644 index 000000000..39d948a42 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/starcrescent.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/stareyes.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/stareyes.png new file mode 100644 index 000000000..347298139 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/stareyes.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/stop.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/stop.png new file mode 100644 index 000000000..d9b1439d0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/stop.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/stopsign.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/stopsign.png new file mode 100644 index 000000000..fd99c885d Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/stopsign.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sun.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sun.png new file mode 100644 index 000000000..6f48baa8e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sun.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sunglasses.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sunglasses.png new file mode 100644 index 000000000..ae0042e9c Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sunglasses.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/surprised.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/surprised.png new file mode 100644 index 000000000..c1c21ef25 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/surprised.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sushi.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sushi.png new file mode 100644 index 000000000..ed9d08bd1 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sushi.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/sweat.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/sweat.png new file mode 100644 index 000000000..1fb6d71c7 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/sweat.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/taurus.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/taurus.png new file mode 100644 index 000000000..2456949da Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/taurus.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think.png new file mode 100644 index 000000000..ca6919ec0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think1.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think1.png new file mode 100644 index 000000000..85ee00b8f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think1.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think2.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think2.png new file mode 100644 index 000000000..8b1132ed3 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think2.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think3.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think3.png new file mode 100644 index 000000000..a49ffd606 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think3.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think4.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think4.png new file mode 100644 index 000000000..61588d046 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think4.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think5.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think5.png new file mode 100644 index 000000000..f60324d57 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think5.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/think6.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/think6.png new file mode 100644 index 000000000..0a42bef44 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/think6.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/tongue.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/tongue.png new file mode 100644 index 000000000..732616ba6 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/tongue.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/tools.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/tools.png new file mode 100644 index 000000000..93f52bc02 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/tools.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/tree.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/tree.png new file mode 100644 index 000000000..ab6177b91 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/tree.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/trex.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/trex.png new file mode 100644 index 000000000..2dd0b8687 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/trex.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/turkey.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/turkey.png new file mode 100644 index 000000000..398fc64ff Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/turkey.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/twofingers.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/twofingers.png new file mode 100644 index 000000000..e38603d8a Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/twofingers.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/unamused.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/unamused.png new file mode 100644 index 000000000..36d5bee14 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/unamused.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/unicorn.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/unicorn.png new file mode 100644 index 000000000..55df2eb39 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/unicorn.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/unlock.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/unlock.png new file mode 100644 index 000000000..39b330632 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/unlock.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/up.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/up.png new file mode 100644 index 000000000..fda1ef4e0 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/up.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/upsidedown.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/upsidedown.png new file mode 100644 index 000000000..5a3ac6cea Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/upsidedown.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/virgo.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/virgo.png new file mode 100644 index 000000000..59490836b Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/virgo.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/voltage.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/voltage.png new file mode 100644 index 000000000..e5d4fdf42 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/voltage.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/warning.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/warning.png new file mode 100644 index 000000000..39c15bd9f Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/warning.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/wc.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/wc.png new file mode 100644 index 000000000..6f424696c Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/wc.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/what.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/what.png new file mode 100644 index 000000000..704788209 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/what.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/wink.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/wink.png new file mode 100644 index 000000000..ff477e6da Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/wink.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/woozy.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/woozy.png new file mode 100644 index 000000000..8ca2ed95e Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/woozy.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/write.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/write.png new file mode 100644 index 000000000..4fe6bc338 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/write.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/xd.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/xd.png new file mode 100644 index 000000000..b0d801f27 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/xd.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/yawn.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/yawn.png new file mode 100644 index 000000000..c0bfd55cf Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/yawn.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/yinyang.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/yinyang.png new file mode 100644 index 000000000..d706c4939 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/yinyang.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/yum.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/yum.png new file mode 100644 index 000000000..a6ec1ef79 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/yum.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/zebra.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/zebra.png new file mode 100644 index 000000000..69de46464 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/zebra.png differ diff --git a/src/main/resources/contents/omc_emoji/textures/font/emoji/zip.png b/src/main/resources/contents/omc_emoji/textures/font/emoji/zip.png new file mode 100644 index 000000000..68f903145 Binary files /dev/null and b/src/main/resources/contents/omc_emoji/textures/font/emoji/zip.png differ diff --git a/src/main/resources/contents/omc_entities/configs/fuzebebe.yml b/src/main/resources/contents/omc_entities/configs/fuzebebe.yml index 773ceee3b..a5aa92318 100644 --- a/src/main/resources/contents/omc_entities/configs/fuzebebe.yml +++ b/src/main/resources/contents/omc_entities/configs/fuzebebe.yml @@ -2,7 +2,7 @@ info: namespace: omc_entities entities: babyfuze: - display_name: "Bébé Fuze" + name: "Bébé Fuze" type: ZOMBIE model_folder: entity/fuzebebe silent: true diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/.metadata b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/.metadata similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/.metadata rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/.metadata diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/.uuid b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/.uuid similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/.uuid rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/.uuid diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/body.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/body.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/body.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/body.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/head.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/head.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/head.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/head.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/left_arm.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/left_arm.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/left_arm.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/left_arm.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/left_leg.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/left_leg.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/left_leg.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/left_leg.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/right_arm.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/right_arm.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/right_arm.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/right_arm.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/right_leg.json b/src/main/resources/contents/omc_entities/models/entity/fuzebebe/right_leg.json similarity index 100% rename from src/main/resources/contents/omc_entities/resourcepack/omc_entities/models/entity/fuzebebe/right_leg.json rename to src/main/resources/contents/omc_entities/models/entity/fuzebebe/right_leg.json diff --git a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/textures/entity/fuzebebe/fuzebebe.png b/src/main/resources/contents/omc_entities/resourcepack/omc_entities/textures/entity/fuzebebe/fuzebebe.png deleted file mode 100644 index 843e13672..000000000 Binary files a/src/main/resources/contents/omc_entities/resourcepack/omc_entities/textures/entity/fuzebebe/fuzebebe.png and /dev/null differ diff --git a/src/main/resources/contents/omc_entities/textures/entity/fuzebebe/fuzebebe.png b/src/main/resources/contents/omc_entities/textures/entity/fuzebebe/fuzebebe.png new file mode 100644 index 000000000..19661d1d3 Binary files /dev/null and b/src/main/resources/contents/omc_entities/textures/entity/fuzebebe/fuzebebe.png differ diff --git a/src/main/resources/contents/omc_esc/configs/esc.yml b/src/main/resources/contents/omc_esc/configs/esc.yml index 8911d4b28..c368459fc 100644 --- a/src/main/resources/contents/omc_esc/configs/esc.yml +++ b/src/main/resources/contents/omc_esc/configs/esc.yml @@ -1,5 +1,5 @@ info: - namespace: ia_various_configs + namespace: omc_esc minecraft_lang_overwrite: esc_menu_texts: entries: @@ -13,5 +13,4 @@ minecraft_lang_overwrite: "gui.stats": "" "menu.reportBugs": "" languages: - - ALL -#AVdkN1crF1aGdEZlNkQCNEdRdVU0EEVNRzaU5kMJRlT4dGVRdzd6ZVUM1URHpUVXxWMUJ0M \ No newline at end of file + - ALL \ No newline at end of file diff --git a/src/main/resources/contents/omc_esc/configs/esc_images.yml b/src/main/resources/contents/omc_esc/configs/esc_images.yml index 02f319d26..e2279798b 100644 --- a/src/main/resources/contents/omc_esc/configs/esc_images.yml +++ b/src/main/resources/contents/omc_esc/configs/esc_images.yml @@ -1,11 +1,9 @@ info: - namespace: graveyard_esc + namespace: omc_esc font_images: bottom_esc: path: "bottom_esc.png" y_position: 128 scale_ratio: 256 suggest_in_command: false - show_in_gui: false - -#AVdkN1crF1aGdEZlNkQCNEdRdVU0EEVNRzaU5kMJRlT4dGVRdzd6ZVUM1URHpUVXxWMUJ0M \ No newline at end of file + show_in_gui: false \ No newline at end of file diff --git a/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button.png b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button.png new file mode 100644 index 000000000..10b5f9fdb Binary files /dev/null and b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button.png differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button.png.mcmeta b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button.png.mcmeta similarity index 100% rename from src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button.png.mcmeta rename to src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button.png.mcmeta diff --git a/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_disabled.png b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_disabled.png new file mode 100644 index 000000000..036b5ff89 Binary files /dev/null and b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_disabled.png differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta similarity index 100% rename from src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta rename to src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta diff --git a/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_highlighted.png b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_highlighted.png new file mode 100644 index 000000000..e85c552b4 Binary files /dev/null and b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_highlighted.png differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta b/src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta similarity index 100% rename from src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta rename to src/main/resources/contents/omc_esc/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta diff --git a/src/main/resources/contents/omc_esc/minecraft/textures/gui/widgets.png b/src/main/resources/contents/omc_esc/minecraft/textures/gui/widgets.png new file mode 100644 index 000000000..73b839e83 Binary files /dev/null and b/src/main/resources/contents/omc_esc/minecraft/textures/gui/widgets.png differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/graveyard_esc/textures/bottom_esc.png b/src/main/resources/contents/omc_esc/resourcepack/assets/graveyard_esc/textures/bottom_esc.png deleted file mode 100644 index 7f07f7cf1..000000000 Binary files a/src/main/resources/contents/omc_esc/resourcepack/assets/graveyard_esc/textures/bottom_esc.png and /dev/null differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button.png b/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button.png deleted file mode 100644 index dc425a087..000000000 Binary files a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button.png and /dev/null differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_disabled.png b/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_disabled.png deleted file mode 100644 index 493b2f803..000000000 Binary files a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_disabled.png and /dev/null differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_highlighted.png b/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_highlighted.png deleted file mode 100644 index 47745a8f9..000000000 Binary files a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/sprites/widget/button_highlighted.png and /dev/null differ diff --git a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/widgets.png b/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/widgets.png deleted file mode 100644 index 52ecdd651..000000000 Binary files a/src/main/resources/contents/omc_esc/resourcepack/assets/minecraft/textures/gui/widgets.png and /dev/null differ diff --git a/src/main/resources/contents/omc_esc/textures/bottom_esc.png b/src/main/resources/contents/omc_esc/textures/bottom_esc.png new file mode 100644 index 000000000..510c13b5a Binary files /dev/null and b/src/main/resources/contents/omc_esc/textures/bottom_esc.png differ diff --git a/src/main/resources/contents/omc_foods/broche_kebab.yml b/src/main/resources/contents/omc_foods/broche_kebab.yml index 9d07867ed..c869df334 100644 --- a/src/main/resources/contents/omc_foods/broche_kebab.yml +++ b/src/main/resources/contents/omc_foods/broche_kebab.yml @@ -3,11 +3,9 @@ info: items: broche_kebab: enabled: true - display_name: Broche à viande - resource: - material: PAPER - generate: false - model_path: broche_kebab + name: Broche à viande + graphics: + model: broche_kebab behaviours: furniture: entity: armor_stand diff --git a/src/main/resources/contents/omc_foods/category.yml b/src/main/resources/contents/omc_foods/category.yml index 965f47145..06159c47a 100644 --- a/src/main/resources/contents/omc_foods/category.yml +++ b/src/main/resources/contents/omc_foods/category.yml @@ -3,7 +3,6 @@ info: categories: omc_foods: enabled: true - skip_if_already: false icon: omc_foods:kebab name: "OpenMC Foods" items: diff --git a/src/main/resources/contents/omc_foods/courgettes.yml b/src/main/resources/contents/omc_foods/courgettes.yml index ec104a0e1..22de6fd94 100644 --- a/src/main/resources/contents/omc_foods/courgettes.yml +++ b/src/main/resources/contents/omc_foods/courgettes.yml @@ -2,12 +2,10 @@ info: namespace: omc_foods items: courgette_seed: - display_name: Graine de Courgette - resource: - generate: true - material: WHEAT_SEEDS - textures: - - items/graine_de_courgette + name: Graine de Courgette + material: WHEAT_SEEDS + graphics: + texture: items/graine_de_courgette specific_properties: seed: crop_block: POTATOES @@ -18,18 +16,15 @@ items: max_amount: 2 chance: 100 courgette: - display_name: Courgette - resource: - material: DRIED_KELP - generate: true - textures: - - items/courgette.png + name: Courgette + material: DRIED_KELP + graphics: + texture: items/courgette gratin_courgette: - display_name: Gratin de Courgette - resource: - material: MELON_SLICE - generate: false - model_path: gratin_courgette + name: Gratin de Courgette + material: MELON_SLICE + graphics: + model: gratin_courgette events: eat: feed: diff --git a/src/main/resources/contents/omc_foods/frite.yml b/src/main/resources/contents/omc_foods/frite.yml index 0ba1a513e..be89e17e2 100644 --- a/src/main/resources/contents/omc_foods/frite.yml +++ b/src/main/resources/contents/omc_foods/frite.yml @@ -2,13 +2,11 @@ info: namespace: omc_foods items: frite: - display_name: Frite + name: Frite permission: ayw.frite - resource: - material: GOLDEN_CARROT - generate: true - textures: - - items/frite.png + material: GOLDEN_CARROT + graphics: + texture: items/frite recipes: crafting_table: frite: diff --git a/src/main/resources/contents/omc_foods/kebab.yml b/src/main/resources/contents/omc_foods/kebab.yml index b734ee1d9..8066c9586 100644 --- a/src/main/resources/contents/omc_foods/kebab.yml +++ b/src/main/resources/contents/omc_foods/kebab.yml @@ -2,12 +2,10 @@ info: namespace: omc_foods items: kebab: - display_name: Kebab - resource: - material: COOKED_BEEF - generate: true - textures: - - items/kebab.png + name: Kebab + material: COOKED_BEEF + graphics: + texture: items/kebab recipes: crafting_table: kebab: diff --git a/src/main/resources/contents/omc_foods/models/broche_kebab.json b/src/main/resources/contents/omc_foods/models/broche_kebab.json index fff68e962..7bcbeddb1 100644 --- a/src/main/resources/contents/omc_foods/models/broche_kebab.json +++ b/src/main/resources/contents/omc_foods/models/broche_kebab.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.11", "credit": "Made with Blockbench", "texture_size": [128, 128], "textures": { @@ -71,45 +72,19 @@ "down": {"uv": [2.5, 6.625, 2, 7.125], "texture": "#0"} } }, - { - "from": [18.5, -7, -2], - "to": [18.5, -4, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [9, -10, 8.5]}, - "faces": { - "north": {"uv": [0, 0, 0, 0.375], "texture": "#0"}, - "east": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0.375], "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, - "up": {"uv": [0, 2.5, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 2.5], "texture": "#0"} - } - }, { "from": [-1.5, -10, -2], "to": [18.5, -7, 18], "rotation": {"angle": 45, "axis": "y", "origin": [9, -13, 8.5]}, "faces": { "north": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, - "east": {"uv": [5.5, 0.375, 8, 0.75], "texture": "#0"}, - "south": {"uv": [5.5, 0.75, 8, 1.125], "texture": "#0"}, + "east": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, + "south": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, "west": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, "up": {"uv": [2.5, 2.125, 0, 0], "texture": "#0"}, "down": {"uv": [2.5, 2.5, 0, 5], "texture": "#0"} } }, - { - "from": [-1.5, -7, 18], - "to": [18.5, -4, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [9, -10, 8.5]}, - "faces": { - "north": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0.375], "texture": "#0"}, - "south": {"uv": [5.5, 1.5, 8, 1.875], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0.375], "texture": "#0"}, - "up": {"uv": [2.5, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [2.5, 0, 0, 0], "texture": "#0"} - } - }, { "from": [2, -5, 0], "to": [17, -5, 15], @@ -152,8 +127,10 @@ { "name": "group", "origin": [8, 8, 8], + "scope": 0, "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + "boneType": "", + "children": [0, 1, 2, 3, 4, 5, 6, 7] } ] } \ No newline at end of file diff --git a/src/main/resources/contents/omc_foods/onion.yml b/src/main/resources/contents/omc_foods/onion.yml index a09ea043f..ee733c42a 100644 --- a/src/main/resources/contents/omc_foods/onion.yml +++ b/src/main/resources/contents/omc_foods/onion.yml @@ -2,9 +2,7 @@ info: namespace: omc_foods items: onion: - display_name: Onion - resource: - material: PORKCHOP - generate: true - textures: - - items/onion.png \ No newline at end of file + name: Onion + material: PORKCHOP + graphics: + texture: items/onion diff --git a/src/main/resources/contents/omc_foods/salade.yml b/src/main/resources/contents/omc_foods/salade.yml index ab35ae531..9834c7371 100644 --- a/src/main/resources/contents/omc_foods/salade.yml +++ b/src/main/resources/contents/omc_foods/salade.yml @@ -2,9 +2,7 @@ info: namespace: omc_foods items: salade: - display_name: Salade - resource: - material: DRIED_KELP - generate: true - textures: - - items/salade.png \ No newline at end of file + name: Salade + material: DRIED_KELP + graphics: + texture: items/salade diff --git a/src/main/resources/contents/omc_foods/seeds.yml b/src/main/resources/contents/omc_foods/seeds.yml index 5b3633a17..8aaf05ebb 100644 --- a/src/main/resources/contents/omc_foods/seeds.yml +++ b/src/main/resources/contents/omc_foods/seeds.yml @@ -2,12 +2,10 @@ info: namespace: omc_foods items: tomato_seeds: - display_name: Graines de tomate - resource: - generate: true - material: WHEAT_SEEDS - textures: - - items/tomato_seeds + name: Graines de tomate + material: WHEAT_SEEDS + graphics: + texture: items/tomato_seeds specific_properties: seed: crop_block: BEETROOTS @@ -18,12 +16,10 @@ items: max_amount: 2 chance: 100 onion_seeds: - display_name: "Graines d'onion" - resource: - generate: true - material: WHEAT_SEEDS - textures: - - items/onion_seeds + name: "Graines d'onion" + material: WHEAT_SEEDS + graphics: + texture: items/onion_seeds specific_properties: seed: crop_block: WHEAT @@ -34,12 +30,10 @@ items: max_amount: 3 chance: 100 salad_seed: - display_name: Graine de salade - resource: - generate: true - material: WHEAT_SEEDS - textures: - - items/salad_seed + name: Graine de salade + material: WHEAT_SEEDS + graphics: + texture: items/salad_seed specific_properties: seed: crop_block: POTATOES diff --git a/src/main/resources/contents/omc_foods/spatule.yml b/src/main/resources/contents/omc_foods/spatule.yml index db704296b..5b0be915a 100644 --- a/src/main/resources/contents/omc_foods/spatule.yml +++ b/src/main/resources/contents/omc_foods/spatule.yml @@ -2,9 +2,7 @@ info: namespace: omc_foods items: spatule: - display_name: Spatule - resource: - material: IRON_SWORD - generate: true - textures: - - items/spatule.png \ No newline at end of file + name: Spatule + material: IRON_SWORD + graphics: + texture: items/spatule diff --git a/src/main/resources/contents/omc_foods/textures/broche_kebab.png b/src/main/resources/contents/omc_foods/textures/broche_kebab.png index 5185b2bd4..be79ed8ac 100644 Binary files a/src/main/resources/contents/omc_foods/textures/broche_kebab.png and b/src/main/resources/contents/omc_foods/textures/broche_kebab.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/courgette.png b/src/main/resources/contents/omc_foods/textures/items/courgette.png index e3af0570d..d246a4d62 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/courgette.png and b/src/main/resources/contents/omc_foods/textures/items/courgette.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/frite.png b/src/main/resources/contents/omc_foods/textures/items/frite.png index d0ebf6f81..cebd4c7b4 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/frite.png and b/src/main/resources/contents/omc_foods/textures/items/frite.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/graine_de_courgette.png b/src/main/resources/contents/omc_foods/textures/items/graine_de_courgette.png index f65c3a4b9..f4c0270a6 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/graine_de_courgette.png and b/src/main/resources/contents/omc_foods/textures/items/graine_de_courgette.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/texturegratin.png b/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/texturegratin.png index a563dc4aa..9c98ae521 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/texturegratin.png and b/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/texturegratin.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/textureverregrattin.png b/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/textureverregrattin.png index f81f75873..4da7f1fff 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/textureverregrattin.png and b/src/main/resources/contents/omc_foods/textures/items/gratin_courgette/textureverregrattin.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/kebab.png b/src/main/resources/contents/omc_foods/textures/items/kebab.png index c20c45c77..694f3810b 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/kebab.png and b/src/main/resources/contents/omc_foods/textures/items/kebab.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/mixture.png b/src/main/resources/contents/omc_foods/textures/items/mixture.png index 263ba35d7..4a38a9e52 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/mixture.png and b/src/main/resources/contents/omc_foods/textures/items/mixture.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/onion.png b/src/main/resources/contents/omc_foods/textures/items/onion.png index f00bba297..22d46942b 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/onion.png and b/src/main/resources/contents/omc_foods/textures/items/onion.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/onion_seeds.png b/src/main/resources/contents/omc_foods/textures/items/onion_seeds.png index c2a403dc9..2b1255a16 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/onion_seeds.png and b/src/main/resources/contents/omc_foods/textures/items/onion_seeds.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/salad_seed.png b/src/main/resources/contents/omc_foods/textures/items/salad_seed.png index f67f26bb5..4e59ffeb2 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/salad_seed.png and b/src/main/resources/contents/omc_foods/textures/items/salad_seed.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/salade.png b/src/main/resources/contents/omc_foods/textures/items/salade.png index cc571d5ae..38a32ef0d 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/salade.png and b/src/main/resources/contents/omc_foods/textures/items/salade.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/spatule.png b/src/main/resources/contents/omc_foods/textures/items/spatule.png index e65554d3c..d935b7110 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/spatule.png and b/src/main/resources/contents/omc_foods/textures/items/spatule.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/tomate.png b/src/main/resources/contents/omc_foods/textures/items/tomate.png index 9c0671d90..5514b9c04 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/tomate.png and b/src/main/resources/contents/omc_foods/textures/items/tomate.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/tomato_seeds.png b/src/main/resources/contents/omc_foods/textures/items/tomato_seeds.png index 700ece9e5..477730f36 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/tomato_seeds.png and b/src/main/resources/contents/omc_foods/textures/items/tomato_seeds.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/urne/papertexture.png b/src/main/resources/contents/omc_foods/textures/items/urne/papertexture.png index d40bba7fb..657504f15 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/urne/papertexture.png and b/src/main/resources/contents/omc_foods/textures/items/urne/papertexture.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/urne/texture1.png b/src/main/resources/contents/omc_foods/textures/items/urne/texture1.png index 6ca02d54c..2deece924 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/urne/texture1.png and b/src/main/resources/contents/omc_foods/textures/items/urne/texture1.png differ diff --git a/src/main/resources/contents/omc_foods/textures/items/urne/texture2.png b/src/main/resources/contents/omc_foods/textures/items/urne/texture2.png index efa33d543..cf52cf6b4 100644 Binary files a/src/main/resources/contents/omc_foods/textures/items/urne/texture2.png and b/src/main/resources/contents/omc_foods/textures/items/urne/texture2.png differ diff --git a/src/main/resources/contents/omc_foods/the_mixture.yml b/src/main/resources/contents/omc_foods/the_mixture.yml index c2290f2c0..86caa2a21 100644 --- a/src/main/resources/contents/omc_foods/the_mixture.yml +++ b/src/main/resources/contents/omc_foods/the_mixture.yml @@ -2,15 +2,30 @@ info: namespace: omc_foods items: the_mixture: - display_name: "§9The Mixture" + name: "The Mixture" lore: - - "§8§oun mystérieux mélange..." - - "§6Aucun Effet Secondaire!" - components_nbt_file: "the_mixture_nbt.json" - resource: - material: POTION - generate: false - model_path: the_mixture + - "un mystérieux mélange..." + - "Aucun Effet Secondaire!" + graphics: + model: the_mixture + max_stack_size: 16 + consumable: + nutrition: 4 + saturation: 2 + can_always_eat: true + animation: drink + sound: entity.generic.drink + effects: + - type: apply_status_effects + effects: + - potion: nausea + duration: 500 + - potion: speed + duration: 2400 + amplifier: 2 + - potion: haste + duration: 1200 + amplifier: 2 recipes: crafting_table: the_mixture: diff --git a/src/main/resources/contents/omc_foods/the_mixture_nbt.json b/src/main/resources/contents/omc_foods/the_mixture_nbt.json deleted file mode 100644 index da886e9a2..000000000 --- a/src/main/resources/contents/omc_foods/the_mixture_nbt.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "components": { - "minecraft:consumable": { - "on_consume_effects": [ - { - "type": "apply_effects", - "effects": [ - { - "id": "minecraft:nausea", - "duration": 500 - }, - { - "id": "minecraft:speed", - "duration": 2400, - "amplifier": 2 - }, - { - "id": "minecraft:haste", - "duration": 1200, - "amplifier": 2 - } - ] - } - ], - "animation": "drink", - "sound": "minecraft:item.honey_bottle.drink" - }, - "food": { - "saturation": 2, - "nutrition": 4, - "can_always_eat": true - } - } -} \ No newline at end of file diff --git a/src/main/resources/contents/omc_foods/tomate.yml b/src/main/resources/contents/omc_foods/tomate.yml index e6db272b4..b24b3b10e 100644 --- a/src/main/resources/contents/omc_foods/tomate.yml +++ b/src/main/resources/contents/omc_foods/tomate.yml @@ -2,9 +2,7 @@ info: namespace: omc_foods items: tomate: - display_name: Tomate - resource: - material: BEETROOT - generate: true - textures: - - items/tomate.png \ No newline at end of file + name: Tomate + material: BEETROOT + graphics: + texture: items/tomate diff --git a/src/main/resources/contents/omc_homes/configs/category.yml b/src/main/resources/contents/omc_homes/configs/category.yml index 76189b3e5..7f82300be 100644 --- a/src/main/resources/contents/omc_homes/configs/category.yml +++ b/src/main/resources/contents/omc_homes/configs/category.yml @@ -3,7 +3,6 @@ info: categories: omc_homes: enabled: true - skip_if_already: false icon: omc_homes:omc_homes_icon_axenq name: "OpenMC Homes" items: diff --git a/src/main/resources/contents/omc_homes/configs/icons.yml b/src/main/resources/contents/omc_homes/configs/icons.yml index 944f0922c..e90736728 100644 --- a/src/main/resources/contents/omc_homes/configs/icons.yml +++ b/src/main/resources/contents/omc_homes/configs/icons.yml @@ -3,125 +3,79 @@ info: items: omc_homes_icon_axenq: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/axenq + name: Pourquoi faire ? + graphics: + texture: icons/axenq omc_homes_icon_bank: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/bank + name: Pourquoi faire ? + graphics: + texture: icons/bank omc_homes_icon_chateau: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/chateau + name: Pourquoi faire ? + graphics: + texture: icons/chateau omc_homes_icon_chest: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/chest + name: Pourquoi faire ? + graphics: + texture: icons/chest omc_homes_icon_grass: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/grass + name: Pourquoi faire ? + graphics: + texture: icons/grass omc_homes_icon_maison: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/maison + name: Pourquoi faire ? + graphics: + texture: icons/maison omc_homes_icon_sandblock: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/sandblock + name: Pourquoi faire ? + graphics: + texture: icons/sandblock omc_homes_icon_shop: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/shop + name: Pourquoi faire ? + graphics: + texture: icons/shop omc_homes_icon_xernas: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/xernas + name: Pourquoi faire ? + graphics: + texture: icons/xernas omc_homes_icon_zombie: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/zombie + name: Pourquoi faire ? + graphics: + texture: icons/zombie omc_homes_icon_upgrade: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/upgrade + name: Pourquoi faire ? + graphics: + texture: icons/upgrade omc_homes_icon_information: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/information + name: Pourquoi faire ? + graphics: + texture: icons/information omc_homes_icon_bin: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/bin + name: Pourquoi faire ? + graphics: + texture: icons/bin omc_homes_icon_bin_red: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - icons/bin_red + name: Pourquoi faire ? + graphics: + texture: icons/bin_red omc_homes_invisible: enabled: true - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - items/invisible - + name: Pourquoi faire ? + graphics: + texture: items/invisible font_images: bin: permission: 0 diff --git a/src/main/resources/contents/omc_homes/configs/menus.yml b/src/main/resources/contents/omc_homes/configs/menus.yml index 9e4f88406..f20299684 100644 --- a/src/main/resources/contents/omc_homes/configs/menus.yml +++ b/src/main/resources/contents/omc_homes/configs/menus.yml @@ -3,25 +3,25 @@ info: font_images: omc_homes_menus_home: permission: "ayw.emoji.admin" - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "menus/homes_menu.png" y_position: 25 omc_homes_menus_home_delete: permission: "ayw.emoji.admin" - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "menus/homes_menu_delete.png" y_position: 25 omc_homes_menus_home_upgrade: permission: "ayw.emoji.admin" - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "menus/homes_menu_upgrade.png" y_position: 25 omc_homes_menus_home_settings: permission: "ayw.emoji.admin" - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "menus/homes_settings.png" y_position: 25 \ No newline at end of file diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/axenq.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/axenq.png new file mode 100644 index 000000000..41af7dc90 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/axenq.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bank.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bank.png new file mode 100644 index 000000000..664fbc639 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bank.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin.png new file mode 100644 index 000000000..b5536e2be Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin_red.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin_red.png new file mode 100644 index 000000000..de5f8a9a7 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/bin_red.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chateau.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chateau.png new file mode 100644 index 000000000..d7b77d3f5 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chateau.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chest.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chest.png new file mode 100644 index 000000000..e97f5e9d7 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/chest.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/grass.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/grass.png new file mode 100644 index 000000000..135715313 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/grass.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/information.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/information.png new file mode 100644 index 000000000..aae5501b3 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/information.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/maison.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/maison.png new file mode 100644 index 000000000..efae6f50d Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/maison.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock-export.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock-export.png new file mode 100644 index 000000000..821a45e4e Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock-export.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock.png new file mode 100644 index 000000000..db78afe43 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/sandblock.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/shop.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/shop.png new file mode 100644 index 000000000..19d1657ac Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/shop.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/upgrade.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/upgrade.png new file mode 100644 index 000000000..b43b895cc Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/upgrade.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/xernas.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/xernas.png new file mode 100644 index 000000000..717b1e0cf Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/xernas.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/icons/zombie.png b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/zombie.png new file mode 100644 index 000000000..1531690c0 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/icons/zombie.png differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/items/invisible.png b/src/main/resources/contents/omc_homes/omc_homes/textures/items/invisible.png similarity index 100% rename from src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/items/invisible.png rename to src/main/resources/contents/omc_homes/omc_homes/textures/items/invisible.png diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu.png b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu.png new file mode 100644 index 000000000..9c5786386 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_delete.png b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_delete.png new file mode 100644 index 000000000..6a934e822 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_delete.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_upgrade.png b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_upgrade.png new file mode 100644 index 000000000..db558145d Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_menu_upgrade.png differ diff --git a/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_settings.png b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_settings.png new file mode 100644 index 000000000..3698561a3 Binary files /dev/null and b/src/main/resources/contents/omc_homes/omc_homes/textures/menus/homes_settings.png differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/axenq.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/axenq.png deleted file mode 100644 index 948fae526..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/axenq.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bank.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bank.png deleted file mode 100644 index fc464a6f6..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bank.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin.png deleted file mode 100644 index 8084b89e5..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin_red.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin_red.png deleted file mode 100644 index 144c1e040..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/bin_red.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chateau.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chateau.png deleted file mode 100644 index 4d7b9058d..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chateau.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chest.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chest.png deleted file mode 100644 index b5a57de91..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/chest.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/grass.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/grass.png deleted file mode 100644 index 1f3fb6932..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/grass.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/information.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/information.png deleted file mode 100644 index b663f5b3d..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/information.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/maison.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/maison.png deleted file mode 100644 index 2cce26f74..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/maison.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock-export.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock-export.png deleted file mode 100644 index 0ce857c06..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock-export.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock.png deleted file mode 100644 index 871acfa0c..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/sandblock.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/shop.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/shop.png deleted file mode 100644 index c5d32dca7..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/shop.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/upgrade.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/upgrade.png deleted file mode 100644 index 324336429..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/upgrade.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/xernas.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/xernas.png deleted file mode 100644 index c2d81934c..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/xernas.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/zombie.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/zombie.png deleted file mode 100644 index 46d1894e7..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/icons/zombie.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu.png deleted file mode 100644 index 67fb081a6..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_delete.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_delete.png deleted file mode 100644 index 408b332f6..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_delete.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_upgrade.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_upgrade.png deleted file mode 100644 index 60780f33c..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_menu_upgrade.png and /dev/null differ diff --git a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_settings.png b/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_settings.png deleted file mode 100644 index 2453fcaea..000000000 Binary files a/src/main/resources/contents/omc_homes/resourcepack/assets/omc_homes/textures/menus/homes_settings.png and /dev/null differ diff --git a/src/main/resources/contents/omc_icons/configs/items.yml b/src/main/resources/contents/omc_icons/configs/items.yml index c9131ca8d..70fc1b6fe 100644 --- a/src/main/resources/contents/omc_icons/configs/items.yml +++ b/src/main/resources/contents/omc_icons/configs/items.yml @@ -2,9 +2,6 @@ info: namespace: omc_icons items: openmc-armor-icon: - display_name: openmc-armor-icon - resource: - material: PAPER - generate: true - textures: - - openmc-armor-icon \ No newline at end of file + name: openmc-armor-icon + graphics: + texture: openmc-armor-icon diff --git a/src/main/resources/contents/omc_icons/textures/buttons/prendre.png b/src/main/resources/contents/omc_icons/textures/buttons/prendre.png index 2f4dc1675..6f71a84d6 100644 Binary files a/src/main/resources/contents/omc_icons/textures/buttons/prendre.png and b/src/main/resources/contents/omc_icons/textures/buttons/prendre.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/aywenito.png b/src/main/resources/contents/omc_icons/textures/font/aywenito.png index e0fa07b87..d92f73922 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/aywenito.png and b/src/main/resources/contents/omc_icons/textures/font/aywenito.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/dream_openmc.png b/src/main/resources/contents/omc_icons/textures/font/dream_openmc.png index 5b1797dd9..3a6ab04cb 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/dream_openmc.png and b/src/main/resources/contents/omc_icons/textures/font/dream_openmc.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/emoji/openmc.png b/src/main/resources/contents/omc_icons/textures/font/emoji/openmc.png index cd93acfc0..17d144b22 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/emoji/openmc.png and b/src/main/resources/contents/omc_icons/textures/font/emoji/openmc.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/kebabs-aywen.png b/src/main/resources/contents/omc_icons/textures/font/kebabs-aywen.png index 2b4af831a..c1d3e29bb 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/kebabs-aywen.png and b/src/main/resources/contents/omc_icons/textures/font/kebabs-aywen.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/openmc.png b/src/main/resources/contents/omc_icons/textures/font/openmc.png index cd93acfc0..17d144b22 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/openmc.png and b/src/main/resources/contents/omc_icons/textures/font/openmc.png differ diff --git a/src/main/resources/contents/omc_icons/textures/font/openmc_logo.png b/src/main/resources/contents/omc_icons/textures/font/openmc_logo.png index 5fa1866f4..686b20f98 100644 Binary files a/src/main/resources/contents/omc_icons/textures/font/openmc_logo.png and b/src/main/resources/contents/omc_icons/textures/font/openmc_logo.png differ diff --git a/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png b/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png index e7539de6f..ba8035dba 100644 Binary files a/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png and b/src/main/resources/contents/omc_icons/textures/openmc-armor-icon.png differ diff --git a/src/main/resources/contents/omc_icons/textures/server-icon.png b/src/main/resources/contents/omc_icons/textures/server-icon.png index 840a894fc..8670038eb 100644 Binary files a/src/main/resources/contents/omc_icons/textures/server-icon.png and b/src/main/resources/contents/omc_icons/textures/server-icon.png differ diff --git a/src/main/resources/contents/omc_items/armor.yml b/src/main/resources/contents/omc_items/armor.yml index 0bd4a2047..78a37d73e 100644 --- a/src/main/resources/contents/omc_items/armor.yml +++ b/src/main/resources/contents/omc_items/armor.yml @@ -3,10 +3,9 @@ info: items: suit_helmet: name: Suit Helmet - resource: - generate: true + material: IRON_HELMET + graphics: texture: items/suit_armor/helmet - material: IRON_HELMET durability: max_durability: 165 equipment: @@ -15,10 +14,9 @@ items: armor: 1 suit_chestplate: name: Suit Chestplate - resource: - generate: true + material: IRON_CHESTPLATE + graphics: texture: items/suit_armor/chestplate - material: IRON_CHESTPLATE durability: max_durability: 165 equipment: @@ -27,10 +25,9 @@ items: armor: 1 suit_leggings: name: Suit Leggings - resource: - generate: true + material: IRON_LEGGINGS + graphics: texture: items/suit_armor/leggings - material: IRON_LEGGINGS durability: max_durability: 165 equipment: @@ -39,10 +36,9 @@ items: armor: 1 suit_boots: name: Suit Boots - resource: - generate: true + material: IRON_BOOTS + graphics: texture: items/suit_armor/boots - material: IRON_BOOTS durability: max_durability: 165 equipment: @@ -51,10 +47,9 @@ items: armor: 1 aywen_cap: name: Aywen Cap - resource: - generate: false - model_path: armor/aywen_cap - material: IRON_HELMET + material: IRON_HELMET + graphics: + model: armor/aywen_cap durability: max_durability: 2010 equipment: diff --git a/src/main/resources/contents/omc_items/builder_wand.yml b/src/main/resources/contents/omc_items/builder_wand.yml index e870efa89..d3d6b21bc 100644 --- a/src/main/resources/contents/omc_items/builder_wand.yml +++ b/src/main/resources/contents/omc_items/builder_wand.yml @@ -7,13 +7,12 @@ scripts: items: builder_wand: permission: omc_items.builder_wand - display_name: Builder Wand + name: Builder Wand lore: - - "§7Permet de poser une large zone de blocs" - resource: - material: WOODEN_SHOVEL - generate: false - model_path: items/builder_wand + - "Permet de poser une large zone de blocs" + material: WOODEN_SHOVEL + graphics: + model: items/builder_wand blocked_enchants: - ALL durability: diff --git a/src/main/resources/contents/omc_items/category.yml b/src/main/resources/contents/omc_items/category.yml index 79e5b42b2..73a6ea033 100644 --- a/src/main/resources/contents/omc_items/category.yml +++ b/src/main/resources/contents/omc_items/category.yml @@ -3,7 +3,6 @@ info: categories: omc_items: enabled: true - skip_if_already: false icon: omc_items:aywenite name: "OpenMC Items" items: diff --git a/src/main/resources/contents/omc_items/hammers.yml b/src/main/resources/contents/omc_items/hammers.yml index edb341e67..959e26ee3 100644 --- a/src/main/resources/contents/omc_items/hammers.yml +++ b/src/main/resources/contents/omc_items/hammers.yml @@ -3,13 +3,12 @@ info: items: iron_hammer: permission: customitems.iron_hammer - display_name: Marteau en fer + name: Marteau en fer lore: - - "§7Permet de creuser une zone de 3x3 blocs" - resource: - material: IRON_PICKAXE - generate: false - model_path: items/hammers/iron_hammer + - "Permet de creuser une zone de 3x3 blocs" + material: IRON_PICKAXE + graphics: + model: items/hammers/iron_hammer blocked_enchants: - FORTUNE - SILK_TOUCH @@ -18,13 +17,12 @@ items: diamond_hammer: permission: customitems.diamond_hammer - display_name: Marteau en diamant + name: Marteau en diamant lore: - - "§7Permet de creuser une zone de 3x3x2 blocs" - resource: - material: DIAMOND_PICKAXE - generate: false - model_path: items/hammers/diamond_hammer + - "Permet de creuser une zone de 3x3x2 blocs" + material: DIAMOND_PICKAXE + graphics: + model: items/hammers/diamond_hammer blocked_enchants: - FORTUNE - SILK_TOUCH @@ -33,13 +31,12 @@ items: netherite_hammer: permission: customitems.netherite_hammer - display_name: Marteau en netherite + name: Marteau en netherite lore: - - "§7Permet de creuser une zone de 3x3x3 blocs" - resource: - material: NETHERITE_PICKAXE - generate: false - model_path: items/hammers/netherite_hammer + - "Permet de creuser une zone de 3x3x3 blocs" + material: NETHERITE_PICKAXE + graphics: + model: items/hammers/netherite_hammer blocked_enchants: - FORTUNE - SILK_TOUCH diff --git a/src/main/resources/contents/omc_items/items.yml b/src/main/resources/contents/omc_items/items.yml index 0c3ebc592..802c3dd7e 100644 --- a/src/main/resources/contents/omc_items/items.yml +++ b/src/main/resources/contents/omc_items/items.yml @@ -2,49 +2,43 @@ info: namespace: omc_items items: aywenite: - display_name: §dAywenite + name: Aywenite lore: - - "§7Un matériau exceptionnel" - resource: - generate: true - material: EMERALD - textures: - - aywenite.png + - "Un matériau exceptionnel" + material: EMERALD + graphics: + texture: aywenite mascot_stick: - display_name: Mascot Wand - resource: - material: STICK - model_path: items/msctt_wand + name: Mascot Wand + material: STICK + graphics: + model: items/msctt_wand warp_stick: - display_name: Warp Wand - resource: - material: STICK - model_path: items/warp_wand + name: Warp Wand + material: STICK + graphics: + model: items/warp_wand unknown_stick: - display_name: unknown wand - resource: - material: STICK - model_path: items/rndm_wand + name: unknown wand + material: STICK + graphics: + model: items/rndm_wand renforced_stick: - display_name: Bâton Renforcé + name: Bâton Renforcé lore: - - §9Ingrédients - resource: - generate: true - material: PAPER - textures: - - renforced_stick.png + - Ingrédients + graphics: + texture: renforced_stick spawner_extractor: - display_name: §6§lExtracteur de Spawner + name: Extracteur de Spawner lore: - - "§7Cette outil permet de récupérer des spawners" - - "§c⚠ 40% de chance d’échec" + - "Cette outil permet de récupérer des spawners" + - "⚠ 40% de chance d’échec" durability: max_durability: 2 - resource: - generate: false - material: DIAMOND_PICKAXE - model_path: items/spawner_extractor + material: DIAMOND_PICKAXE + graphics: + model: items/spawner_extractor blocked_enchants: - ALL events: diff --git a/src/main/resources/contents/omc_items/textures/armor/aywen_cap/texture.png b/src/main/resources/contents/omc_items/textures/armor/aywen_cap/texture.png index a5ae88140..3b7fc9f45 100644 Binary files a/src/main/resources/contents/omc_items/textures/armor/aywen_cap/texture.png and b/src/main/resources/contents/omc_items/textures/armor/aywen_cap/texture.png differ diff --git a/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer1.png b/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer1.png index d318e767f..bd531b90e 100644 Binary files a/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer1.png and b/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer1.png differ diff --git a/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer2.png b/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer2.png index c24be5796..f1d73c278 100644 Binary files a/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer2.png and b/src/main/resources/contents/omc_items/textures/armor/suit_armor/layer2.png differ diff --git a/src/main/resources/contents/omc_items/textures/aywenite.png b/src/main/resources/contents/omc_items/textures/aywenite.png index 30bbea5de..28b7277b2 100644 Binary files a/src/main/resources/contents/omc_items/textures/aywenite.png and b/src/main/resources/contents/omc_items/textures/aywenite.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/hammers/diamond_hammer.png b/src/main/resources/contents/omc_items/textures/items/hammers/diamond_hammer.png index 086d3b80e..513179119 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/hammers/diamond_hammer.png and b/src/main/resources/contents/omc_items/textures/items/hammers/diamond_hammer.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/hammers/iron_hammer.png b/src/main/resources/contents/omc_items/textures/items/hammers/iron_hammer.png index eaaf659a3..cc0dc6ca7 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/hammers/iron_hammer.png and b/src/main/resources/contents/omc_items/textures/items/hammers/iron_hammer.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/hammers/netherite_hammer.png b/src/main/resources/contents/omc_items/textures/items/hammers/netherite_hammer.png index a8f0a49fb..fb5173c51 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/hammers/netherite_hammer.png and b/src/main/resources/contents/omc_items/textures/items/hammers/netherite_hammer.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/suit_armor/boots.png b/src/main/resources/contents/omc_items/textures/items/suit_armor/boots.png index 8bd0d3a7c..87e675ecd 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/suit_armor/boots.png and b/src/main/resources/contents/omc_items/textures/items/suit_armor/boots.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/suit_armor/chestplate.png b/src/main/resources/contents/omc_items/textures/items/suit_armor/chestplate.png index 800eafdeb..66474a273 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/suit_armor/chestplate.png and b/src/main/resources/contents/omc_items/textures/items/suit_armor/chestplate.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/suit_armor/helmet.png b/src/main/resources/contents/omc_items/textures/items/suit_armor/helmet.png index 8de60fc10..1095de1fd 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/suit_armor/helmet.png and b/src/main/resources/contents/omc_items/textures/items/suit_armor/helmet.png differ diff --git a/src/main/resources/contents/omc_items/textures/items/suit_armor/leggings.png b/src/main/resources/contents/omc_items/textures/items/suit_armor/leggings.png index 9316c13c4..61d02bfa5 100644 Binary files a/src/main/resources/contents/omc_items/textures/items/suit_armor/leggings.png and b/src/main/resources/contents/omc_items/textures/items/suit_armor/leggings.png differ diff --git a/src/main/resources/contents/omc_items/textures/renforced_stick.png b/src/main/resources/contents/omc_items/textures/renforced_stick.png index d4e3395fa..4c0456222 100644 Binary files a/src/main/resources/contents/omc_items/textures/renforced_stick.png and b/src/main/resources/contents/omc_items/textures/renforced_stick.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/builder_wand.png b/src/main/resources/contents/omc_items/textures/wands/builder_wand.png index 0216675e6..f5c642381 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/builder_wand.png and b/src/main/resources/contents/omc_items/textures/wands/builder_wand.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/builder_wand_item.png b/src/main/resources/contents/omc_items/textures/wands/builder_wand_item.png index c72e0e8c1..f02c63131 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/builder_wand_item.png and b/src/main/resources/contents/omc_items/textures/wands/builder_wand_item.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/flechee.png b/src/main/resources/contents/omc_items/textures/wands/flechee.png index 72ba2cc91..4b6ae58ae 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/flechee.png and b/src/main/resources/contents/omc_items/textures/wands/flechee.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/halo1.png b/src/main/resources/contents/omc_items/textures/wands/halo1.png index 6c52c4e78..5d41dd4e0 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/halo1.png and b/src/main/resources/contents/omc_items/textures/wands/halo1.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/halo2.png b/src/main/resources/contents/omc_items/textures/wands/halo2.png index 16a626f18..ac6511fdb 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/halo2.png and b/src/main/resources/contents/omc_items/textures/wands/halo2.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/maison.png b/src/main/resources/contents/omc_items/textures/wands/maison.png index f8864c87f..6325ec808 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/maison.png and b/src/main/resources/contents/omc_items/textures/wands/maison.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/maison2.png b/src/main/resources/contents/omc_items/textures/wands/maison2.png index 3247b281b..dfa983fdd 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/maison2.png and b/src/main/resources/contents/omc_items/textures/wands/maison2.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/mascotte.png b/src/main/resources/contents/omc_items/textures/wands/mascotte.png index a289bc4e1..a0dcb9ffa 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/mascotte.png and b/src/main/resources/contents/omc_items/textures/wands/mascotte.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/mascotte_outline.png b/src/main/resources/contents/omc_items/textures/wands/mascotte_outline.png index 8b8048218..d09dc6aeb 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/mascotte_outline.png and b/src/main/resources/contents/omc_items/textures/wands/mascotte_outline.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/outlinemaison.png b/src/main/resources/contents/omc_items/textures/wands/outlinemaison.png index 47bd5ec63..174b78d68 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/outlinemaison.png and b/src/main/resources/contents/omc_items/textures/wands/outlinemaison.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/outlineplanete.png b/src/main/resources/contents/omc_items/textures/wands/outlineplanete.png index 55309edf8..c2badbc66 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/outlineplanete.png and b/src/main/resources/contents/omc_items/textures/wands/outlineplanete.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/planet.png b/src/main/resources/contents/omc_items/textures/wands/planet.png index 9a7429700..5281ce643 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/planet.png and b/src/main/resources/contents/omc_items/textures/wands/planet.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/spawner_extractor.png b/src/main/resources/contents/omc_items/textures/wands/spawner_extractor.png index 498a1bf7d..9c94993c9 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/spawner_extractor.png and b/src/main/resources/contents/omc_items/textures/wands/spawner_extractor.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/toit.png b/src/main/resources/contents/omc_items/textures/wands/toit.png index c3b9f0a8e..41c3bd1e6 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/toit.png and b/src/main/resources/contents/omc_items/textures/wands/toit.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile1.png b/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile1.png index c91530680..30e45cf3c 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile1.png and b/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile1.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile2.png b/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile2.png index b253d7266..36ce37a81 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile2.png and b/src/main/resources/contents/omc_items/textures/wands/villeoutlinerandometsurementutile2.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/wand_baton_et_claim.png b/src/main/resources/contents/omc_items/textures/wands/wand_baton_et_claim.png index 26339efa4..02cc6aecc 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/wand_baton_et_claim.png and b/src/main/resources/contents/omc_items/textures/wands/wand_baton_et_claim.png differ diff --git a/src/main/resources/contents/omc_items/textures/wands/warp1.png b/src/main/resources/contents/omc_items/textures/wands/warp1.png index f72ad3ac0..bbd4ad39a 100644 Binary files a/src/main/resources/contents/omc_items/textures/wands/warp1.png and b/src/main/resources/contents/omc_items/textures/wands/warp1.png differ diff --git a/src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/en_us.json b/src/main/resources/contents/omc_langs/minecraft/lang/en_us.json similarity index 100% rename from src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/en_us.json rename to src/main/resources/contents/omc_langs/minecraft/lang/en_us.json diff --git a/src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/fr_ca.json b/src/main/resources/contents/omc_langs/minecraft/lang/fr_ca.json similarity index 100% rename from src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/fr_ca.json rename to src/main/resources/contents/omc_langs/minecraft/lang/fr_ca.json diff --git a/src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/fr_fr.json b/src/main/resources/contents/omc_langs/minecraft/lang/fr_fr.json similarity index 100% rename from src/main/resources/contents/omc_langs/resourcepack/assets/minecraft/lang/fr_fr.json rename to src/main/resources/contents/omc_langs/minecraft/lang/fr_fr.json diff --git a/src/main/resources/contents/omc_loading_screen/resourcepack/assets/omc_loading_screen/textures/font/openmc.png b/src/main/resources/contents/omc_loading_screen/resourcepack/assets/omc_loading_screen/textures/font/openmc.png deleted file mode 100644 index 8fae852f6..000000000 Binary files a/src/main/resources/contents/omc_loading_screen/resourcepack/assets/omc_loading_screen/textures/font/openmc.png and /dev/null differ diff --git a/src/main/resources/contents/omc_loading_screen/textures/font/openmc.png b/src/main/resources/contents/omc_loading_screen/textures/font/openmc.png new file mode 100644 index 000000000..fed2ae12d Binary files /dev/null and b/src/main/resources/contents/omc_loading_screen/textures/font/openmc.png differ diff --git a/src/main/resources/contents/omc_main_menu/config.yml b/src/main/resources/contents/omc_main_menu/config.yml index a20ff354d..a2afe1112 100644 --- a/src/main/resources/contents/omc_main_menu/config.yml +++ b/src/main/resources/contents/omc_main_menu/config.yml @@ -9,7 +9,7 @@ font_images: y_position: 31 omc_main_menu_page_2: permission: op - show_in_gui: true + show_in_gui: false path: "font/omc_main_menu_page_2.png" y_position: 31 omc_main_menu_page_1_sans_ville: diff --git a/src/main/resources/contents/omc_main_menu/heads.yml b/src/main/resources/contents/omc_main_menu/heads.yml index 755c74fec..ab2334bf7 100644 --- a/src/main/resources/contents/omc_main_menu/heads.yml +++ b/src/main/resources/contents/omc_main_menu/heads.yml @@ -3,7 +3,6 @@ info: items: player_head: enabled: true - resource: - generate: false - model_path: item/player_head - material: PLAYER_HEAD \ No newline at end of file + material: PLAYER_HEAD + graphics: + model: item/player_head diff --git a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/models/item/player_head.json b/src/main/resources/contents/omc_main_menu/models/item/player_head.json similarity index 100% rename from src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/models/item/player_head.json rename to src/main/resources/contents/omc_main_menu/models/item/player_head.json diff --git a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1.png b/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1.png deleted file mode 100644 index 5fe5c01e8..000000000 Binary files a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1.png and /dev/null differ diff --git a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png b/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png deleted file mode 100644 index ba3352eae..000000000 Binary files a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png and /dev/null differ diff --git a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_2.png b/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_2.png deleted file mode 100644 index af36e096e..000000000 Binary files a/src/main/resources/contents/omc_main_menu/resourcepack/assets/omc_main_menu/textures/font/omc_main_menu_page_2.png and /dev/null differ diff --git a/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1.png b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1.png new file mode 100644 index 000000000..77a1458d6 Binary files /dev/null and b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1.png differ diff --git a/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png new file mode 100644 index 000000000..6a5ed1739 Binary files /dev/null and b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_1_sans_ville.png differ diff --git a/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_2.png b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_2.png new file mode 100644 index 000000000..48bce9cbc Binary files /dev/null and b/src/main/resources/contents/omc_main_menu/textures/font/omc_main_menu_page_2.png differ diff --git a/src/main/resources/contents/omc_menus/configs/btn.yml b/src/main/resources/contents/omc_menus/configs/btn.yml index de38806ee..c820ed414 100644 --- a/src/main/resources/contents/omc_menus/configs/btn.yml +++ b/src/main/resources/contents/omc_menus/configs/btn.yml @@ -2,95 +2,55 @@ info: namespace: omc_menus items: accept_btn: - display_name: accept - resource: - material: PAPER - generate: true - textures: - - accept_btn + name: accept + graphics: + texture: accept_btn refuse_btn: - display_name: refuse - resource: - material: PAPER - generate: true - textures: - - refuse_btn + name: refuse + graphics: + texture: refuse_btn 1_btn: - display_name: 1 - resource: - material: PAPER - generate: true - textures: - - 1_btn + name: 1 + graphics: + texture: 1_btn 64_btn: - display_name: 10 - resource: - material: PAPER - generate: true - textures: - - 64_btn + name: 10 + graphics: + texture: 64_btn plus_btn: - display_name: plus - resource: - material: PAPER - generate: true - textures: - - plus_btn + name: plus + graphics: + texture: plus_btn minus_btn: - display_name: plus - resource: - material: PAPER - generate: true - textures: - - minus_btn + name: plus + graphics: + texture: minus_btn mailbox_accept_btn: - display_name: accept - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/accept_btn" + name: accept + graphics: + texture: "items/mailbox/accept_btn" mailbox_refuse_btn: - display_name: refuse - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/refuse_btn" + name: refuse + graphics: + texture: "items/mailbox/refuse_btn" mailbox_cancel_btn: - display_name: accept - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/cancel_btn" + name: accept + graphics: + texture: "items/mailbox/cancel_btn" mailbox_arrow_left: - display_name: arrow left - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/arrow_left" + name: arrow left + graphics: + texture: "items/mailbox/arrow_left" mailbox_arrow_right: - display_name: arrow right - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/arrow_right" + name: arrow right + graphics: + texture: "items/mailbox/arrow_right" mailbox_send: - display_name: send - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/paper_plane" + name: send + graphics: + texture: "items/mailbox/paper_plane" mailbox_hourglass: - display_name: hourglass - resource: - material: PAPER - generate: true - textures: - - "items/mailbox/hourglass" + name: hourglass + graphics: - \ No newline at end of file + texture: "items/mailbox/hourglass" diff --git a/src/main/resources/contents/omc_menus/configs/menus.yml b/src/main/resources/contents/omc_menus/configs/menus.yml index 6732011ac..b46ffd086 100644 --- a/src/main/resources/contents/omc_menus/configs/menus.yml +++ b/src/main/resources/contents/omc_menus/configs/menus.yml @@ -3,79 +3,79 @@ info: font_images: confirm_menu: permission: confirm.menu - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "confirm_menu.png" y_position: 16 adminshop: permission: adminshop.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "adminshop.png" y_position: 17 adminshop_category: permission: adminshop.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "adminshop_category.png" y_position: 17 adminshop_items: permission: adminshop.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "adminshop_items.png" y_position: 20 settings: permission: settings.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "settings.png" y_position: 25 mayor: permission: mayor.menu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "mayor.png" y_position: 60 city_mainmenu: permission: city.mainmenu - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "city_mainmenu.png" y_position: 30 city_template3x9: permission: city.template3x9 - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "city_template3x9.png" y_position: 59 city_template5x9: permission: city.template5x9 - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "city_template5x9.png" y_position: 30 city_template6x9: permission: city.template6x9 - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "city_template6x9.png" y_position: 30 home_mailbox: permission: mailbox.home - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "home_mailbox.png" y_position: 22 player_mailbox: permission: mailbox.player - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "player_mailbox.png" y_position: 22 letter_mailbox: permission: mailbox.letter - show_in_gui: true + show_in_gui: false suggestion_in_command: false path: "letter_mailbox.png" y_position: 22 diff --git a/src/main/resources/contents/omc_menus/textures/1_btn.png b/src/main/resources/contents/omc_menus/textures/1_btn.png index af287c283..0669b72ac 100644 Binary files a/src/main/resources/contents/omc_menus/textures/1_btn.png and b/src/main/resources/contents/omc_menus/textures/1_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/64_btn.png b/src/main/resources/contents/omc_menus/textures/64_btn.png index 35a017b3b..aa4afbb99 100644 Binary files a/src/main/resources/contents/omc_menus/textures/64_btn.png and b/src/main/resources/contents/omc_menus/textures/64_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/accept_btn.png b/src/main/resources/contents/omc_menus/textures/accept_btn.png index 40277fe19..252b89f0b 100644 Binary files a/src/main/resources/contents/omc_menus/textures/accept_btn.png and b/src/main/resources/contents/omc_menus/textures/accept_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/adminshop.png b/src/main/resources/contents/omc_menus/textures/adminshop.png index c71f69ca4..9ad6c97e8 100644 Binary files a/src/main/resources/contents/omc_menus/textures/adminshop.png and b/src/main/resources/contents/omc_menus/textures/adminshop.png differ diff --git a/src/main/resources/contents/omc_menus/textures/adminshop_category.png b/src/main/resources/contents/omc_menus/textures/adminshop_category.png index 3342e655b..ff3550f8b 100644 Binary files a/src/main/resources/contents/omc_menus/textures/adminshop_category.png and b/src/main/resources/contents/omc_menus/textures/adminshop_category.png differ diff --git a/src/main/resources/contents/omc_menus/textures/adminshop_items.png b/src/main/resources/contents/omc_menus/textures/adminshop_items.png index 6af89b29c..a656cef90 100644 Binary files a/src/main/resources/contents/omc_menus/textures/adminshop_items.png and b/src/main/resources/contents/omc_menus/textures/adminshop_items.png differ diff --git a/src/main/resources/contents/omc_menus/textures/city_mainmenu.png b/src/main/resources/contents/omc_menus/textures/city_mainmenu.png index 7b34454ba..bfc66e751 100644 Binary files a/src/main/resources/contents/omc_menus/textures/city_mainmenu.png and b/src/main/resources/contents/omc_menus/textures/city_mainmenu.png differ diff --git a/src/main/resources/contents/omc_menus/textures/city_template3x9.png b/src/main/resources/contents/omc_menus/textures/city_template3x9.png index 91ca95d52..ffe40ae11 100644 Binary files a/src/main/resources/contents/omc_menus/textures/city_template3x9.png and b/src/main/resources/contents/omc_menus/textures/city_template3x9.png differ diff --git a/src/main/resources/contents/omc_menus/textures/city_template5x9.png b/src/main/resources/contents/omc_menus/textures/city_template5x9.png index 2530fa433..890f5f3d9 100644 Binary files a/src/main/resources/contents/omc_menus/textures/city_template5x9.png and b/src/main/resources/contents/omc_menus/textures/city_template5x9.png differ diff --git a/src/main/resources/contents/omc_menus/textures/city_template6x9.png b/src/main/resources/contents/omc_menus/textures/city_template6x9.png index 0b9733f28..fe034bccc 100644 Binary files a/src/main/resources/contents/omc_menus/textures/city_template6x9.png and b/src/main/resources/contents/omc_menus/textures/city_template6x9.png differ diff --git a/src/main/resources/contents/omc_menus/textures/confirm_menu.png b/src/main/resources/contents/omc_menus/textures/confirm_menu.png index 9b2431514..13a475cd1 100644 Binary files a/src/main/resources/contents/omc_menus/textures/confirm_menu.png and b/src/main/resources/contents/omc_menus/textures/confirm_menu.png differ diff --git a/src/main/resources/contents/omc_menus/textures/home_mailbox.png b/src/main/resources/contents/omc_menus/textures/home_mailbox.png index 60d3e9e65..d3162a3c9 100644 Binary files a/src/main/resources/contents/omc_menus/textures/home_mailbox.png and b/src/main/resources/contents/omc_menus/textures/home_mailbox.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/accept_btn.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/accept_btn.png index d3553691b..d4bea00f8 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/accept_btn.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/accept_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_left.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_left.png index 7e829d6d0..c3edf6333 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_left.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_left.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_right.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_right.png index 66fcddac1..ef943dd23 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_right.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/arrow_right.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/cancel_btn.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/cancel_btn.png index 203d8b007..3f47d0533 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/cancel_btn.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/cancel_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/hourglass.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/hourglass.png index f9cc675f0..e4a43cb34 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/hourglass.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/hourglass.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/paper_plane.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/paper_plane.png index 15f3f5221..5c97b8fcf 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/paper_plane.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/paper_plane.png differ diff --git a/src/main/resources/contents/omc_menus/textures/items/mailbox/refuse_btn.png b/src/main/resources/contents/omc_menus/textures/items/mailbox/refuse_btn.png index aad267b1f..1ffd9a37a 100644 Binary files a/src/main/resources/contents/omc_menus/textures/items/mailbox/refuse_btn.png and b/src/main/resources/contents/omc_menus/textures/items/mailbox/refuse_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/letter_mailbox.png b/src/main/resources/contents/omc_menus/textures/letter_mailbox.png index c79c9a257..6b9002cac 100644 Binary files a/src/main/resources/contents/omc_menus/textures/letter_mailbox.png and b/src/main/resources/contents/omc_menus/textures/letter_mailbox.png differ diff --git a/src/main/resources/contents/omc_menus/textures/mayor.png b/src/main/resources/contents/omc_menus/textures/mayor.png index cd728d444..4a7b06694 100644 Binary files a/src/main/resources/contents/omc_menus/textures/mayor.png and b/src/main/resources/contents/omc_menus/textures/mayor.png differ diff --git a/src/main/resources/contents/omc_menus/textures/minus_btn.png b/src/main/resources/contents/omc_menus/textures/minus_btn.png index 88ee601b7..54668cf5e 100644 Binary files a/src/main/resources/contents/omc_menus/textures/minus_btn.png and b/src/main/resources/contents/omc_menus/textures/minus_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/player_mailbox.png b/src/main/resources/contents/omc_menus/textures/player_mailbox.png index aa89b7af8..4021cc614 100644 Binary files a/src/main/resources/contents/omc_menus/textures/player_mailbox.png and b/src/main/resources/contents/omc_menus/textures/player_mailbox.png differ diff --git a/src/main/resources/contents/omc_menus/textures/plus_btn.png b/src/main/resources/contents/omc_menus/textures/plus_btn.png index 033658ab1..add0f053e 100644 Binary files a/src/main/resources/contents/omc_menus/textures/plus_btn.png and b/src/main/resources/contents/omc_menus/textures/plus_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/refuse_btn.png b/src/main/resources/contents/omc_menus/textures/refuse_btn.png index 1ae786681..d1a7933c6 100644 Binary files a/src/main/resources/contents/omc_menus/textures/refuse_btn.png and b/src/main/resources/contents/omc_menus/textures/refuse_btn.png differ diff --git a/src/main/resources/contents/omc_menus/textures/settings.png b/src/main/resources/contents/omc_menus/textures/settings.png index 8dea559b2..7f84e4bbd 100644 Binary files a/src/main/resources/contents/omc_menus/textures/settings.png and b/src/main/resources/contents/omc_menus/textures/settings.png differ diff --git a/src/main/resources/contents/omc_plush/category.yml b/src/main/resources/contents/omc_plush/category.yml index 0ddbe2d60..6e30284e4 100644 --- a/src/main/resources/contents/omc_plush/category.yml +++ b/src/main/resources/contents/omc_plush/category.yml @@ -3,7 +3,6 @@ info: categories: omc_plush: enabled: true - skip_if_already: false icon: omc_plush:peluche_awyen name: "OpenMC Plush" items: diff --git a/src/main/resources/contents/omc_plush/peluche.yml b/src/main/resources/contents/omc_plush/peluche.yml index 71f91cd94..b574c2e3a 100644 --- a/src/main/resources/contents/omc_plush/peluche.yml +++ b/src/main/resources/contents/omc_plush/peluche.yml @@ -2,10 +2,9 @@ info: namespace: omc_plush items: peluche_awyen: - display_name: Aywen la peluche - resource: - material: PAPER - model_path: peluche + name: Aywen la peluche + graphics: + model: peluche behaviours: furniture: entity: armor_stand @@ -26,10 +25,9 @@ items: ceilling: false floor: true peluche_seinyy: - display_name: Seinyy la peluche - resource: - material: PAPER - model_path: peluche_seiny + name: Seinyy la peluche + graphics: + model: peluche_seiny behaviours: furniture: entity: armor_stand diff --git a/src/main/resources/contents/omc_plush/textures/models/peluche.png b/src/main/resources/contents/omc_plush/textures/models/peluche.png index 1c4208476..71a0106c9 100644 Binary files a/src/main/resources/contents/omc_plush/textures/models/peluche.png and b/src/main/resources/contents/omc_plush/textures/models/peluche.png differ diff --git a/src/main/resources/contents/omc_plush/textures/models/peluche_seiny.png b/src/main/resources/contents/omc_plush/textures/models/peluche_seiny.png index 87cf777c7..feae87e8b 100644 Binary files a/src/main/resources/contents/omc_plush/textures/models/peluche_seiny.png and b/src/main/resources/contents/omc_plush/textures/models/peluche_seiny.png differ diff --git a/src/main/resources/contents/omc_quests/configs/btn.yml b/src/main/resources/contents/omc_quests/configs/btn.yml index e4448015d..525272d42 100644 --- a/src/main/resources/contents/omc_quests/configs/btn.yml +++ b/src/main/resources/contents/omc_quests/configs/btn.yml @@ -2,16 +2,10 @@ info: namespace: omc_quests items: quests_right_arrow: - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - right_arrow + name: Pourquoi faire ? + graphics: + texture: right_arrow quests_left_arrow: - display_name: Pourquoi faire ? - resource: - material: PAPER - generate: true - textures: - - left_arrow \ No newline at end of file + name: Pourquoi faire ? + graphics: + texture: left_arrow diff --git a/src/main/resources/contents/omc_quests/configs/menus.yml b/src/main/resources/contents/omc_quests/configs/menus.yml index 6b9266168..458a82b57 100644 --- a/src/main/resources/contents/omc_quests/configs/menus.yml +++ b/src/main/resources/contents/omc_quests/configs/menus.yml @@ -3,7 +3,7 @@ info: font_images: quests_menu: permission: confirm.menu - show_in_gui: true + show_in_gui: false suggest_in_command: false path: "quests_menu.png" y_position: 43 \ No newline at end of file diff --git a/src/main/resources/contents/omc_quests/textures/left_arrow.png b/src/main/resources/contents/omc_quests/textures/left_arrow.png index 516e5fa8b..e1513ed06 100644 Binary files a/src/main/resources/contents/omc_quests/textures/left_arrow.png and b/src/main/resources/contents/omc_quests/textures/left_arrow.png differ diff --git a/src/main/resources/contents/omc_quests/textures/quests_menu.png b/src/main/resources/contents/omc_quests/textures/quests_menu.png index a8ca71526..86e550e3d 100644 Binary files a/src/main/resources/contents/omc_quests/textures/quests_menu.png and b/src/main/resources/contents/omc_quests/textures/quests_menu.png differ diff --git a/src/main/resources/contents/omc_quests/textures/right_arrow.png b/src/main/resources/contents/omc_quests/textures/right_arrow.png index 4de9e4c92..5b33c0abd 100644 Binary files a/src/main/resources/contents/omc_quests/textures/right_arrow.png and b/src/main/resources/contents/omc_quests/textures/right_arrow.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/admin.png b/src/main/resources/contents/omc_ranks/textures/admin.png index ade514fff..039f8aa89 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/admin.png and b/src/main/resources/contents/omc_ranks/textures/admin.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/animateur.png b/src/main/resources/contents/omc_ranks/textures/animateur.png index 47b4060ee..c3e2742c0 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/animateur.png and b/src/main/resources/contents/omc_ranks/textures/animateur.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/blank_blue.png b/src/main/resources/contents/omc_ranks/textures/blank_blue.png index 5737f4021..ea493b54c 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/blank_blue.png and b/src/main/resources/contents/omc_ranks/textures/blank_blue.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/blank_gray.png b/src/main/resources/contents/omc_ranks/textures/blank_gray.png index 15905a933..cef959e82 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/blank_gray.png and b/src/main/resources/contents/omc_ranks/textures/blank_gray.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/blank_red.png b/src/main/resources/contents/omc_ranks/textures/blank_red.png index 72726f6a3..351e06fb3 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/blank_red.png and b/src/main/resources/contents/omc_ranks/textures/blank_red.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/builder.png b/src/main/resources/contents/omc_ranks/textures/builder.png index 1cf5319c2..4f081857e 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/builder.png and b/src/main/resources/contents/omc_ranks/textures/builder.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/dev.png b/src/main/resources/contents/omc_ranks/textures/dev.png index fd91d5420..8250c576d 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/dev.png and b/src/main/resources/contents/omc_ranks/textures/dev.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/developer.png b/src/main/resources/contents/omc_ranks/textures/developer.png index 16dc18db8..49e546bff 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/developer.png and b/src/main/resources/contents/omc_ranks/textures/developer.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/discord.png b/src/main/resources/contents/omc_ranks/textures/discord.png index f8479e26e..237ab0b7a 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/discord.png and b/src/main/resources/contents/omc_ranks/textures/discord.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/event.png b/src/main/resources/contents/omc_ranks/textures/event.png index 0fb00653c..ce5ad2270 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/event.png and b/src/main/resources/contents/omc_ranks/textures/event.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/game.png b/src/main/resources/contents/omc_ranks/textures/game.png index 720f105c0..895463ae4 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/game.png and b/src/main/resources/contents/omc_ranks/textures/game.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/helper.png b/src/main/resources/contents/omc_ranks/textures/helper.png index c018750ba..21f5decdb 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/helper.png and b/src/main/resources/contents/omc_ranks/textures/helper.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/java.png b/src/main/resources/contents/omc_ranks/textures/java.png index 6492023ec..e2bbb74aa 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/java.png and b/src/main/resources/contents/omc_ranks/textures/java.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/manager.png b/src/main/resources/contents/omc_ranks/textures/manager.png index 10001e6b6..5ba8e4741 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/manager.png and b/src/main/resources/contents/omc_ranks/textures/manager.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/modo.png b/src/main/resources/contents/omc_ranks/textures/modo.png index 597e91d24..b5bbaaa36 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/modo.png and b/src/main/resources/contents/omc_ranks/textures/modo.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/modo_test.png b/src/main/resources/contents/omc_ranks/textures/modo_test.png index 8885cfd56..dd42adca1 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/modo_test.png and b/src/main/resources/contents/omc_ranks/textures/modo_test.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/patreon.png b/src/main/resources/contents/omc_ranks/textures/patreon.png index 1f63797c4..a25df504e 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/patreon.png and b/src/main/resources/contents/omc_ranks/textures/patreon.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/patreon2.png b/src/main/resources/contents/omc_ranks/textures/patreon2.png index f755f2d2c..a306d52c0 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/patreon2.png and b/src/main/resources/contents/omc_ranks/textures/patreon2.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/player.png b/src/main/resources/contents/omc_ranks/textures/player.png index 2f0447e03..701f029f7 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/player.png and b/src/main/resources/contents/omc_ranks/textures/player.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/rejoindre.png b/src/main/resources/contents/omc_ranks/textures/rejoindre.png index fcb6916ac..4cf5c7643 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/rejoindre.png and b/src/main/resources/contents/omc_ranks/textures/rejoindre.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/skript.png b/src/main/resources/contents/omc_ranks/textures/skript.png index 265ac8075..cf9b5f129 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/skript.png and b/src/main/resources/contents/omc_ranks/textures/skript.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/vip.png b/src/main/resources/contents/omc_ranks/textures/vip.png index 22e70001b..ebff35424 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/vip.png and b/src/main/resources/contents/omc_ranks/textures/vip.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/vipplus.png b/src/main/resources/contents/omc_ranks/textures/vipplus.png index 8d63e8e22..1b76bc787 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/vipplus.png and b/src/main/resources/contents/omc_ranks/textures/vipplus.png differ diff --git a/src/main/resources/contents/omc_ranks/textures/youtube.png b/src/main/resources/contents/omc_ranks/textures/youtube.png index 7df501375..238539ed7 100644 Binary files a/src/main/resources/contents/omc_ranks/textures/youtube.png and b/src/main/resources/contents/omc_ranks/textures/youtube.png differ diff --git a/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/background.png b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/background.png new file mode 100644 index 000000000..efd6f8be9 Binary files /dev/null and b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/background.png differ diff --git a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/background.png.mcmeta b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/background.png.mcmeta similarity index 100% rename from src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/background.png.mcmeta rename to src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/background.png.mcmeta diff --git a/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/frame.png b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/frame.png new file mode 100644 index 000000000..ee1364da8 Binary files /dev/null and b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/frame.png.mcmeta b/src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/frame.png.mcmeta similarity index 100% rename from src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/frame.png.mcmeta rename to src/main/resources/contents/omc_tooltips/minecraft/textures/gui/sprites/tooltip/frame.png.mcmeta diff --git a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/background.png b/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/background.png deleted file mode 100644 index 269d85ad1..000000000 Binary files a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/background.png and /dev/null differ diff --git a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/frame.png b/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/frame.png deleted file mode 100644 index 5af32c206..000000000 Binary files a/src/main/resources/contents/omc_tooltips/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/frame.png and /dev/null differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/common_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/common_background.png index f4d148f02..c0d00c163 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/common_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/common_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/common_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/common_frame.png index f69c5959a..1ee6166a2 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/common_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/common_frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_background.png index b3f3d7075..5851a6917 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_frame.png index 7e1132a9f..dec6e92fd 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/epic_frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_background.png index 0c0cb34e5..41e7f7c1d 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_frame.png index e30fcc9bc..bc3154b3e 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/legendary_frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_background.png index a4479634f..3845f07cd 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_frame.png index 57aa277ed..4ffa54e9a 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/onirique_frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_background.png index bb21f5ed8..bbc82e63f 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_frame.png index 40f2a286c..20fdf270f 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/rare_frame.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_background.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_background.png index a36cb6c11..16c16408e 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_background.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_background.png differ diff --git a/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_frame.png b/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_frame.png index 74c41be2d..f3df00b02 100644 Binary files a/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_frame.png and b/src/main/resources/contents/omc_tooltips/textures/tooltip/uncommon_frame.png differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/corail_tombstone/corail_tombstone_icons.json b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/corail_tombstone/corail_tombstone_icons.json deleted file mode 100644 index e0a5bf085..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/corail_tombstone/corail_tombstone_icons.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "providers": [ - - { - "type": "bitmap", - "file": "tombstone:icons/enchantments/frostbite.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uCF01" - ] - }, - { - "type": "bitmap", - "file": "tombstone:icons/enchantments/curse_of_bones.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uCF02" - ] - }, - { - "type": "bitmap", - "file": "tombstone:icons/enchantments/soulbound.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uCF03" - ] - }, - { - "type": "bitmap", - "file": "tombstone:icons/enchantments/magic_siphon.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uCF04" - ] - }, - { - "type": "bitmap", - "file": "tombstone:icons/enchantments/spectral_conjurer.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uCF05" - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/default.json b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/default.json deleted file mode 100644 index dedff2f61..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/font/default.json +++ /dev/null @@ -1,390 +0,0 @@ -{ - "providers": [ - { - "type": "reference", - "id": "minecraft:corail_tombstone/corail_tombstone_icons" - }, - - - - { - "type": "bitmap", - "file": "minecraft:better_enchantments/fire_aspect.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC140" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/aquatic_affinity.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC141" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/bane_of_arthropods.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC142" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/blast_protection.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC143" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/wind_burst.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC144" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/fire_protection.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC145" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/lure.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC146" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/mending.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC147" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/protection.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC148" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/infinity.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC149" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/fortune.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC150" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/efficiency.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC151" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/flame.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC152" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/respiration.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC153" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/multishot.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC154" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/quick_charge.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC155" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/piercing.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC156" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/vanishing_curse.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC157" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/depth_strider.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC158" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/sharpness.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC159" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/sweeping_edge.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC160" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/soul_speed.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC161" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/binding_curse.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC162" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/riptide.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC163" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/impaling.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC164" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/looting.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC165" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/unbreaking.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC166" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/loyalty.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC167" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/projectile_protection.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC168" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/luck_of_the_sea.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC169" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/swift_sneak.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC170" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/breach.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC171" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/frost_walker.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC172" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/thorns.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC173" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/channeling.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC174" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/density.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC175" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/smite.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC176" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/feather_falling.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC177" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/power.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC178" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/knockback.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC179" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/knockback.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC180" - ] - }, - { - "type": "bitmap", - "file": "minecraft:better_enchantments/silk_touch.png", - "ascent": 8, - "height": 9, - "chars": [ - "\uC181" - ] - } - - ] -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/en_us.json b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/en_us.json deleted file mode 100644 index a3c5c6e7b..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/en_us.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "enchantment.minecraft.aqua_affinity": "§f\uC141 §rAqua Affinity§r", - "enchantment.minecraft.bane_of_arthropods": "§f\uC142 §rBane of Arthropods§r", - "enchantment.minecraft.binding_curse": "§f\uC162 §rCurse of Binding§r", - "enchantment.minecraft.blast_protection": "§f\uC143 §rBlast Protection§r", - "enchantment.minecraft.breach": "§f\uC171 §rBreach§r", - "enchantment.minecraft.channeling": "§f\uC174 §rChanneling§r", - "enchantment.minecraft.density": "§f\uC175 §rDensity§r", - "enchantment.minecraft.depth_strider": "§f\uC158 §rDepth Strider§r", - "enchantment.minecraft.efficiency": "§f\uC151 §rEfficiency§r", - "enchantment.minecraft.feather_falling": "§f\uC177 §rFeather Falling§r", - "enchantment.minecraft.fire_aspect": "§f\uC140 §rFire Aspect§r", - "enchantment.minecraft.fire_protection": "§f\uC145 §rFire Protection§r", - "enchantment.minecraft.flame": "§f\uC152 §rFlame§r", - "enchantment.minecraft.fortune": "§f\uC150 §rFortune§r", - "enchantment.minecraft.frost_walker": "§f\uC172 §rFrost Walker§r", - "enchantment.minecraft.impaling": "§f\uC164 §rImpaling§r", - "enchantment.minecraft.infinity": "§f\uC149 §rInfinity§r", - "enchantment.minecraft.knockback": "§f\uC179 §rKnockback§r", - "enchantment.minecraft.looting": "§f\uC165 §rLooting§r", - "enchantment.minecraft.loyalty": "§f\uC167 §rLoyalty§r", - "enchantment.minecraft.luck_of_the_sea": "§f\uC169 §rLuck of the sea§r", - "enchantment.minecraft.lure": "§f\uC146 §rLure§r", - "enchantment.minecraft.mending": "§f\uC147 §rMending§r", - "enchantment.minecraft.multishot": "§f\uC154 §rMultishot§r", - "enchantment.minecraft.piercing": "§f\uC156 §rPiercing§r", - "enchantment.minecraft.power": "§f\uC178 §rPower§r", - "enchantment.minecraft.projectile_protection": "§f\uC168 §rProjectile Protection§r", - "enchantment.minecraft.protection": "§f\uC148 §rProtection§r", - "enchantment.minecraft.punch": "§f\uC179 §rPunch§r", - "enchantment.minecraft.quick_charge": "§f\uC155 §rQuick Charge§r", - "enchantment.minecraft.respiration": "§f\uC153 §rRespiration§r", - "enchantment.minecraft.riptide": "§f\uC163 §rRiptide§r", - "enchantment.minecraft.sharpness": "§f\uC159 §rSharpness§r", - "enchantment.minecraft.silk_touch": "§f\uC181 §rSilk Touch§r", - "enchantment.minecraft.smite": "§f\uC176 §rSmite§r", - "enchantment.minecraft.soul_speed": "§f\uC161 §rSoul Speed§r", - "enchantment.minecraft.sweeping": "§f\uC160 §rSweeping§r", - "enchantment.minecraft.sweeping_edge": "§f\uC160 §rSweeping Edge§r", - "enchantment.minecraft.swift_sneak": "§f\uC170 §rSwift Sneak§r", - "enchantment.minecraft.thorns": "§f\uC173 §rThorns§r", - "enchantment.minecraft.unbreaking": "§f\uC166 §rUnbreaking§r", - "enchantment.minecraft.vanishing_curse": "§f\uC157 §rCurse of Vanishing§r", - "enchantment.minecraft.wind_burst": "§f\uC144 §rWind Burst§r" -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_es.json b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_es.json deleted file mode 100644 index 6794df178..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_es.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "enchantment.minecraft.aqua_affinity": "§f\uC141 §rAfinidad acuática§r", - "enchantment.minecraft.bane_of_arthropods": "§f\uC142 §rPerdición de los artrópodos§r", - "enchantment.minecraft.binding_curse": "§f\uC162 §rMaldición de ligamiento§r", - "enchantment.minecraft.blast_protection": "§f\uC143 §rProtección contra explosiones§r", - "enchantment.minecraft.breach": "§f\uC171 §rFisura§r", - "enchantment.minecraft.channeling": "§f\uC174 §rConductividad§r", - "enchantment.minecraft.density": "§f\uC175 §rDensidad§r", - "enchantment.minecraft.depth_strider": "§f\uC158 §rAgilidad acuática§r", - "enchantment.minecraft.efficiency": "§f\uC151 §rEficiencia§r", - "enchantment.minecraft.feather_falling": "§f\uC177 §rCaída de pluma§r", - "enchantment.minecraft.fire_aspect": "§f\uC140 §rAspecto ígneo§r", - "enchantment.minecraft.fire_protection": "§f\uC145 §rProtección contra el fuego§r", - "enchantment.minecraft.flame": "§f\uC152 §rFlecha de Fuego§r", - "enchantment.minecraft.fortune": "§f\uC150 §rFortuna§r", - "enchantment.minecraft.frost_walker": "§f\uC172 §rPaso helado§r", - "enchantment.minecraft.impaling": "§f\uC164 §rEmpalamiento§r", - "enchantment.minecraft.infinity": "§f\uC149 §rInfinidad§r", - "enchantment.minecraft.knockback": "§f\uC179 §rEmpuje§r", - "enchantment.minecraft.looting": "§f\uC165 §rBotín§r", - "enchantment.minecraft.loyalty": "§f\uC167 §rLealtad§r", - "enchantment.minecraft.luck_of_the_sea": "§f\uC169 §rSuerte marina§r", - "enchantment.minecraft.lure": "§f\uC146 §rAtracción§r", - "enchantment.minecraft.mending": "§f\uC147 §rReparación§r", - "enchantment.minecraft.multishot": "§f\uC154 §rMultidisparo§r", - "enchantment.minecraft.piercing": "§f\uC156 §rPerforación§r", - "enchantment.minecraft.power": "§f\uC178 §rPoder§r", - "enchantment.minecraft.projectile_protection": "§f\uC168 §rProtección contra proyectiles§r", - "enchantment.minecraft.protection": "§f\uC148 §rProtección§r", - "enchantment.minecraft.punch": "§f\uC179 §rRetroceso§r", - "enchantment.minecraft.quick_charge": "§f\uC155 §rCarga rápida§r", - "enchantment.minecraft.respiration": "§f\uC153 §rRespiración§r", - "enchantment.minecraft.riptide": "§f\uC163 §rPropulsión acuática§r", - "enchantment.minecraft.sharpness": "§f\uC159 §rFilo§r", - "enchantment.minecraft.silk_touch": "§f\uC181 §rToque de seda§r", - "enchantment.minecraft.smite": "§f\uC176 §rGolpeo§r", - "enchantment.minecraft.soul_speed": "§f\uC161 §rVelocidad del alma§r", - "enchantment.minecraft.sweeping": "§f\uC160 §rBarrido§r", - "enchantment.minecraft.sweeping_edge": "§f\uC160 §rBarrido§r", - "enchantment.minecraft.swift_sneak": "§f\uC170 §rSigilo veloz§r", - "enchantment.minecraft.thorns": "§f\uC173 §rEspinas§r", - "enchantment.minecraft.unbreaking": "§f\uC166 §rIrrompibilidad§r", - "enchantment.minecraft.vanishing_curse": "§f\uC157 §rMaldición de desaparición§r", - "enchantment.minecraft.wind_burst": "§f\uC144 §rAeroimpulso§r" -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_mx.json b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_mx.json deleted file mode 100644 index 6794df178..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/lang/es_mx.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "enchantment.minecraft.aqua_affinity": "§f\uC141 §rAfinidad acuática§r", - "enchantment.minecraft.bane_of_arthropods": "§f\uC142 §rPerdición de los artrópodos§r", - "enchantment.minecraft.binding_curse": "§f\uC162 §rMaldición de ligamiento§r", - "enchantment.minecraft.blast_protection": "§f\uC143 §rProtección contra explosiones§r", - "enchantment.minecraft.breach": "§f\uC171 §rFisura§r", - "enchantment.minecraft.channeling": "§f\uC174 §rConductividad§r", - "enchantment.minecraft.density": "§f\uC175 §rDensidad§r", - "enchantment.minecraft.depth_strider": "§f\uC158 §rAgilidad acuática§r", - "enchantment.minecraft.efficiency": "§f\uC151 §rEficiencia§r", - "enchantment.minecraft.feather_falling": "§f\uC177 §rCaída de pluma§r", - "enchantment.minecraft.fire_aspect": "§f\uC140 §rAspecto ígneo§r", - "enchantment.minecraft.fire_protection": "§f\uC145 §rProtección contra el fuego§r", - "enchantment.minecraft.flame": "§f\uC152 §rFlecha de Fuego§r", - "enchantment.minecraft.fortune": "§f\uC150 §rFortuna§r", - "enchantment.minecraft.frost_walker": "§f\uC172 §rPaso helado§r", - "enchantment.minecraft.impaling": "§f\uC164 §rEmpalamiento§r", - "enchantment.minecraft.infinity": "§f\uC149 §rInfinidad§r", - "enchantment.minecraft.knockback": "§f\uC179 §rEmpuje§r", - "enchantment.minecraft.looting": "§f\uC165 §rBotín§r", - "enchantment.minecraft.loyalty": "§f\uC167 §rLealtad§r", - "enchantment.minecraft.luck_of_the_sea": "§f\uC169 §rSuerte marina§r", - "enchantment.minecraft.lure": "§f\uC146 §rAtracción§r", - "enchantment.minecraft.mending": "§f\uC147 §rReparación§r", - "enchantment.minecraft.multishot": "§f\uC154 §rMultidisparo§r", - "enchantment.minecraft.piercing": "§f\uC156 §rPerforación§r", - "enchantment.minecraft.power": "§f\uC178 §rPoder§r", - "enchantment.minecraft.projectile_protection": "§f\uC168 §rProtección contra proyectiles§r", - "enchantment.minecraft.protection": "§f\uC148 §rProtección§r", - "enchantment.minecraft.punch": "§f\uC179 §rRetroceso§r", - "enchantment.minecraft.quick_charge": "§f\uC155 §rCarga rápida§r", - "enchantment.minecraft.respiration": "§f\uC153 §rRespiración§r", - "enchantment.minecraft.riptide": "§f\uC163 §rPropulsión acuática§r", - "enchantment.minecraft.sharpness": "§f\uC159 §rFilo§r", - "enchantment.minecraft.silk_touch": "§f\uC181 §rToque de seda§r", - "enchantment.minecraft.smite": "§f\uC176 §rGolpeo§r", - "enchantment.minecraft.soul_speed": "§f\uC161 §rVelocidad del alma§r", - "enchantment.minecraft.sweeping": "§f\uC160 §rBarrido§r", - "enchantment.minecraft.sweeping_edge": "§f\uC160 §rBarrido§r", - "enchantment.minecraft.swift_sneak": "§f\uC170 §rSigilo veloz§r", - "enchantment.minecraft.thorns": "§f\uC173 §rEspinas§r", - "enchantment.minecraft.unbreaking": "§f\uC166 §rIrrompibilidad§r", - "enchantment.minecraft.vanishing_curse": "§f\uC157 §rMaldición de desaparición§r", - "enchantment.minecraft.wind_burst": "§f\uC144 §rAeroimpulso§r" -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/aquatic_affinity.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/aquatic_affinity.png deleted file mode 100644 index 82d7a6970..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/aquatic_affinity.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/bane_of_arthropods.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/bane_of_arthropods.png deleted file mode 100644 index b7552e334..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/bane_of_arthropods.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/binding_curse.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/binding_curse.png deleted file mode 100644 index 3a25680fe..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/binding_curse.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/blast_protection.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/blast_protection.png deleted file mode 100644 index 3be8e8b63..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/blast_protection.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/breach.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/breach.png deleted file mode 100644 index c9b32cb02..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/breach.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/channeling.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/channeling.png deleted file mode 100644 index bb09ddc74..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/channeling.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/density.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/density.png deleted file mode 100644 index c60992b9f..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/density.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/depth_strider.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/depth_strider.png deleted file mode 100644 index 38b651e7d..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/depth_strider.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/efficiency.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/efficiency.png deleted file mode 100644 index 4b4299196..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/efficiency.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/feather_falling.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/feather_falling.png deleted file mode 100644 index 556d11276..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/feather_falling.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_aspect.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_aspect.png deleted file mode 100644 index ce0b0353d..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_aspect.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_protection.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_protection.png deleted file mode 100644 index 62617174f..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fire_protection.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/flame.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/flame.png deleted file mode 100644 index db6867d16..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/flame.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fortune.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fortune.png deleted file mode 100644 index 191011f81..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/fortune.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/frost_walker.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/frost_walker.png deleted file mode 100644 index fa8b230d9..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/frost_walker.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/impaling.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/impaling.png deleted file mode 100644 index 01749960d..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/impaling.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/infinity.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/infinity.png deleted file mode 100644 index 74c9b44e3..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/infinity.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/knockback.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/knockback.png deleted file mode 100644 index 58b219457..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/knockback.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/looting.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/looting.png deleted file mode 100644 index 1ed8e9ea8..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/looting.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/loyalty.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/loyalty.png deleted file mode 100644 index 8708969b9..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/loyalty.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/luck_of_the_sea.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/luck_of_the_sea.png deleted file mode 100644 index 6dccb4161..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/luck_of_the_sea.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/lure.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/lure.png deleted file mode 100644 index 3ca4a30ce..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/lure.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/mending.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/mending.png deleted file mode 100644 index a707f682f..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/mending.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/multishot.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/multishot.png deleted file mode 100644 index 46708d7fb..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/multishot.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/one_boot.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/one_boot.png deleted file mode 100644 index e6725d4c5..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/one_boot.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/piercing.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/piercing.png deleted file mode 100644 index 07771f8b8..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/piercing.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/power.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/power.png deleted file mode 100644 index a96eda835..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/power.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/projectile_protection.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/projectile_protection.png deleted file mode 100644 index 9688b3f0e..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/projectile_protection.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/protection.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/protection.png deleted file mode 100644 index 194da9d23..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/protection.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/quick_charge.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/quick_charge.png deleted file mode 100644 index 9cf37298b..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/quick_charge.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/respiration.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/respiration.png deleted file mode 100644 index 5b5cfd33a..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/respiration.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/riptide.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/riptide.png deleted file mode 100644 index 9dbcfdd17..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/riptide.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sharpness.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sharpness.png deleted file mode 100644 index b2fc75c97..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sharpness.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/silk_touch.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/silk_touch.png deleted file mode 100644 index fa9c073f1..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/silk_touch.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/smite.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/smite.png deleted file mode 100644 index 60e26b1eb..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/smite.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/soul_speed.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/soul_speed.png deleted file mode 100644 index 8f053f11f..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/soul_speed.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sweeping_edge.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sweeping_edge.png deleted file mode 100644 index f4f22a347..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/sweeping_edge.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/swift_sneak.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/swift_sneak.png deleted file mode 100644 index 64a06e793..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/swift_sneak.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/thorns.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/thorns.png deleted file mode 100644 index 28ef99c08..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/thorns.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/unbreaking.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/unbreaking.png deleted file mode 100644 index 164172656..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/unbreaking.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/vanishing_curse.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/vanishing_curse.png deleted file mode 100644 index 2690855bc..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/vanishing_curse.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/wind_burst.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/wind_burst.png deleted file mode 100644 index 055833863..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/better_enchantments/wind_burst.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/items/enchantments_icons/level.png b/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/items/enchantments_icons/level.png deleted file mode 100644 index 13802ef40..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/minecraft/textures/items/enchantments_icons/level.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/lang/es_es.json b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/lang/es_es.json deleted file mode 100644 index 7ca68208e..000000000 --- a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/lang/es_es.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "enchantment.tombstone.spectral_bite": "Mordedura Espectral ", - "enchantment.tombstone.spectral_bite.desc": "posibilidad de provocar un mordisco espectral en el atacante", - "enchantment.tombstone.soulbound": "§f\uCF03 §rUnión del alma", - "enchantment.tombstone.soulbound.desc": "mantén el objeto en tu personaje cuando muera", - "enchantment.tombstone.magic_siphon": "§f\uCF04 §rSifón Mágico", - "enchantment.tombstone.magic_siphon.desc": "posibilidad de absorber los efectos beneficiosos del objetivo", - "enchantment.tombstone.plague_bringer": "Puerta de la peste", - "enchantment.tombstone.plague_bringer.desc": "posibilidad de aplicar efectos negativos", - "enchantment.tombstone.curse_of_bones": "§f\uCF02 §rLa maldición de los huesos§r", - "enchantment.tombstone.curse_of_bones.desc": "posibilidad de aplicar Bone Shield cuando se golpea", - "enchantment.tombstone.blessing": "Bendición", - "enchantment.tombstone.blessing.desc": "oportunidad de recibir un pequeño bono cuando te golpean", - "enchantment.tombstone.fishing_bad_luck": "Pesca desafortunada", - "enchantment.tombstone.frostbite": "§f\uCF01 §rMordida Fría§r", - "enchantment.tombstone.frostbite.desc": "posibilidad de congelar a los enemigos golpeados", - "enchantment.tombstone.spectral_conjurer": "§f\uCF05 §rConjurador Espectral§r", - "enchantment.tombstone.spectral_conjurer.desc": "posibilidad de generar un Lobo Espectral al atacar" -} diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/curse_of_bones.png b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/curse_of_bones.png deleted file mode 100644 index 27302038f..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/curse_of_bones.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/frostbite.png b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/frostbite.png deleted file mode 100644 index 5709034fa..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/frostbite.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/magic_siphon.png b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/magic_siphon.png deleted file mode 100644 index 729e23960..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/magic_siphon.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/soulbound.png b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/soulbound.png deleted file mode 100644 index 3d5dc64fe..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/soulbound.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/spectral_conjurer.png b/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/spectral_conjurer.png deleted file mode 100644 index 0551d9830..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/assets/tombstone/textures/icons/enchantments/spectral_conjurer.png and /dev/null differ diff --git a/src/main/resources/contents/rp_enchant_icons/pack.mcmeta b/src/main/resources/contents/rp_enchant_icons/pack.mcmeta deleted file mode 100644 index 26c8cd5e1..000000000 --- a/src/main/resources/contents/rp_enchant_icons/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "§7By §eRenovatedStudios\n§dMinecraft 1.20.1", - "pack_format": 15, - "supported_formats": {"min_inclusive": 15, "max_inclusive": 99} - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_enchant_icons/pack.png b/src/main/resources/contents/rp_enchant_icons/pack.png deleted file mode 100644 index 9f9f7d020..000000000 Binary files a/src/main/resources/contents/rp_enchant_icons/pack.png and /dev/null differ diff --git a/src/main/resources/contents/rp_low_fire/Info.txt b/src/main/resources/contents/rp_low_fire/Info.txt deleted file mode 100644 index 4c85f9fe6..000000000 --- a/src/main/resources/contents/rp_low_fire/Info.txt +++ /dev/null @@ -1,5 +0,0 @@ ----Info--- -Pack By Haikis -Version 1.2 -Date 14.06.2024 ----------- \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_floor1.json b/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_floor1.json deleted file mode 100644 index bd28b8eb4..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_floor1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fire_floor", - "textures": { - "fire": "minecraft:block/fire_2" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side1.json b/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side1.json deleted file mode 100644 index 2f6758c1c..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fire_side", - "textures": { - "fire": "minecraft:block/fire_2" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side_alt1.json b/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side_alt1.json deleted file mode 100644 index 747744200..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_side_alt1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fire_side_alt", - "textures": { - "fire": "minecraft:block/fire_2" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up1.json b/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up1.json deleted file mode 100644 index e155eaecb..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fire_up", - "textures": { - "fire": "minecraft:block/fire_2" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up_alt1.json b/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up_alt1.json deleted file mode 100644 index 985e5ab01..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/models/block/fire_up_alt1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fire_up_alt", - "textures": { - "fire": "minecraft:block/fire_2" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png deleted file mode 100644 index 6066dc496..000000000 Binary files a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png and /dev/null differ diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png.mcmeta b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png.mcmeta deleted file mode 100644 index 76446714d..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_0.png.mcmeta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "animation": { - "frames": [ - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15 - ] - } -} diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png deleted file mode 100644 index 389d1755a..000000000 Binary files a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png and /dev/null differ diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png.mcmeta b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png.mcmeta deleted file mode 100644 index 4f0718ac9..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_1.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png deleted file mode 100644 index fd439b175..000000000 Binary files a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png and /dev/null differ diff --git a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png.mcmeta b/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png.mcmeta deleted file mode 100644 index 4f0718ac9..000000000 --- a/src/main/resources/contents/rp_low_fire/assets/minecraft/textures/block/fire_2.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/pack.mcmeta b/src/main/resources/contents/rp_low_fire/pack.mcmeta deleted file mode 100644 index b4f738c0e..000000000 --- a/src/main/resources/contents/rp_low_fire/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 46, - "description": "\u00A74❏ Lower Fire Texture \u00A7r\n❏ By \u00A76Haikis" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_fire/pack.png b/src/main/resources/contents/rp_low_fire/pack.png deleted file mode 100644 index 277591510..000000000 Binary files a/src/main/resources/contents/rp_low_fire/pack.png and /dev/null differ diff --git a/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield.json b/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield.json deleted file mode 100644 index 8f9c2acb8..000000000 --- a/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "parent": "builtin/entity", - "gui_light": "front", - "textures": { - "particle": "block/dark_oak_planks" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, -4 ], - "scale": [ 1, 1, 1 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, 12 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ -10, 0, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ 10, -2, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "gui": { - "rotation": [ 15, -25, -5 ], - "translation": [ 2, 3, 0 ], - "scale": [ 0.65, 0.65, 0.65 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ -4.5, 4.5, -5], - "scale":[ 0.55, 0.55, 0.55] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 2, 4, 2], - "scale":[ 0.25, 0.25, 0.25] - } - }, - "overrides": [ - { - "predicate": { - "blocking": 1 - }, - "model": "item/shield_blocking" - } - ] -} - - -// Modified by Oculie -// modrinth.com/user/Oculie -// www.curseforge.com/members/oculie - - -// You can modify and redistribute this resource pack in any form, even commercially, AS LONG AS YOU CREDIT THE OWNER. (CC BY 4.0). \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield_blocking.json b/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield_blocking.json deleted file mode 100644 index 65405ea84..000000000 --- a/src/main/resources/contents/rp_low_shield/assets/minecraft/models/item/shield_blocking.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "builtin/entity", - "gui_light": "front", - "textures": { - "particle": "block/dark_oak_planks" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 45, 155, 0 ], - "translation": [ -3.49, 11, -2 ], - "scale": [ 1, 1, 1 ] - }, - "thirdperson_lefthand": { - "rotation": [ 45, 155, 0 ], - "translation": [ 11.51, 7, 2.5 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 180, -5 ], - "translation": [ -15, 0, -11 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 180, -5 ], - "translation": [ 5, 0, -11 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "gui": { - "rotation": [ 15, -25, -5 ], - "translation": [ 2, 3, 0 ], - "scale": [ 0.65, 0.65, 0.65 ] - } - } -} - - -// Modified by Oculie -// modrinth.com/user/Oculie -// www.curseforge.com/members/oculie - - -// You can modify and redistribute this resource pack in any form, even commercially, AS LONG AS YOU CREDIT THE OWNER. (CC BY 4.0). \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_shield/pack.mcmeta b/src/main/resources/contents/rp_low_shield/pack.mcmeta deleted file mode 100644 index 33a0cbec6..000000000 --- a/src/main/resources/contents/rp_low_shield/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "pack_format": 55, - "description": "§e• Version 1.0.0 -§6• by Oculie" - } -} \ No newline at end of file diff --git a/src/main/resources/contents/rp_low_shield/pack.png b/src/main/resources/contents/rp_low_shield/pack.png deleted file mode 100644 index ad1b27c92..000000000 Binary files a/src/main/resources/contents/rp_low_shield/pack.png and /dev/null differ