diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index b04d5b9..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 4bb38e6..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-0.15.1+build.380-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..fbfd4ab
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..1fb7cfe
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-0.16.0+build.384-1.16.1@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 67%
rename from .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 8bc0bff..20cf5f0 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 58%
rename from .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index d8da7f4..cc6186c 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..80578af
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..b253adf
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 7c00282..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 5fd8dbe..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-1.0.1+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 59%
rename from .gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index e309102..ee3fbea 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 51%
rename from .gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 74380e4..56fbd4e 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 56%
rename from .gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index f4e5237..cc62bd2 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..887a59f
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 6be6e9f..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..70f0490
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..a3bbe6f
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 578f374..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index b0bdf38..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 66%
rename from .gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index db273a0..cc4e502 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 56%
rename from .gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index c31258a..5df21f3 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 69%
rename from .gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index e839475..0758649 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 62%
rename from .gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index c10f381..d1106fc 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 50%
rename from .gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 4df1f5d..6e472d8 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..92bcb3a
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 81c196d..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..c2a644d
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..c6d7392
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 72%
rename from .gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index e3b14b8..e3d6e64 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 69%
rename from .gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index eee77c5..8e26b0f 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 63%
rename from .gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index cae5326..530ccaa 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 59%
rename from .gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index fdf5199..d296598 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..c56b40d
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..5c0bc94
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-game-rule-api-v1-1.0.0+fe81e12502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..e115d19
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..d180f8d
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 7ef7d6e..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 5c77779..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 56%
rename from .gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 2f51d16..d27d9d1 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 57%
rename from .gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 0855ab7..1520fe6 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index efba976..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 55%
rename from .gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index b8c2c1e..9503e64 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+730711c651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..7db3f82
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.1+f404f3be02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 57%
rename from .gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 1f5cb07..668ec5c 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..bfcbe51
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 00c1932..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c551@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 69%
rename from .gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 7d29483..364eaee 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 58%
rename from .gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index dd38c27..28e7061 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+3b4b2c1351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.1.0+013e49d202@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index b20a866..9e90f59 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 46554f9..e2ff1e4 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.9.0+build.204@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 67%
rename from .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 001db22..f3f9553 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 58%
rename from .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index ca2677c..b3127b2 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+fac8f36651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-1.0.0+386eb69e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 54%
rename from .gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index a92b95a..9b2df70 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..38dd2f4
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 8b11144..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9951@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 67%
rename from .gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 1734cdd..059626d 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 58%
rename from .gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index a6b1303..48e0951 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d651@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 62%
rename from .gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 5ee883c..fe57767 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 56%
rename from .gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index eb7886a..ec6c0c4 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 75%
rename from .gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 22cbda2..eca711c 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 68%
rename from .gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 61707b0..b6f8ef9 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 72%
rename from .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 334f945..ce748cd 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 59%
rename from .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index dd75994..477ba2c 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.6+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..f07fe4b
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 66%
rename from .gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index f860089..c355fb6 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+ba4afa5751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.1+a2d21ddd02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..e999b1d
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..6b231ba
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 5632bd1..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 771c9fe..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 809ab1d..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 0f609fd..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.10+5553fa5851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..b514d99
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..85944e0
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 80%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 88e8b82..56e8ceb 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 62%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index e8c8316..f09bf06 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 72%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 21241af..7bfdbc7 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 67%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 4c560fb..f0b930f 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.3+7548be6d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.4+34d6c87102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 55%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index a411980..465bd96 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 53%
rename from .gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 6400c42..906bf90 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 63%
rename from .gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index c640315..13677fa 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..d6e0bf0
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 38665b5..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 59%
rename from .gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 215592e..b210ed5 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 52%
rename from .gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 3cf6da1..0160338 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 57%
rename from .gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index e9a47f9..0717bcb 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..390c3aa
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index ed01424..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049051@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 57%
rename from .gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index c3dae73..f22aec3 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..30495c0
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index e01fbe5..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d751@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 67%
rename from .gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index 9968507..c25e9c0 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 66%
rename from .gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 65ebcca..2f1ec97 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.8+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..9aea07c
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+8724984151@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 54%
rename from .gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+8724984151@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 1075868..813e0b6 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+8724984151@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.1.0+97324d1102@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..dec3a6d
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..701fb34
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index c3064ea..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index f2bc416..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-1.0.1+35e08e3351@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
similarity index 60%
rename from .gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
rename to .gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
index fbece57..d990945 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
similarity index 58%
rename from .gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
rename to .gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
index 13ee388..5a2bdad 100644
Binary files a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb851@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
deleted file mode 100644
index 2912d08..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
deleted file mode 100644
index 82c662b..0000000
Binary files a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e51@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar and /dev/null differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar
new file mode 100644
index 0000000..c76b9fe
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2-sources.jar differ
diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar
new file mode 100644
index 0000000..8ea6217
Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.2.0+55e0cc5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.21-v2.jar differ
diff --git a/build.gradle b/build.gradle
index a806b2a..3cfbef0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,9 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// uncomment to import JetBrains annotation
- compileOnly "org.jetbrains:annotations:18.0.0"
+ // compileOnly "org.jetbrains:annotations:18.0.0"
+
+ compileOnly "com.google.code.findbugs:jsr305:3.0.2"
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
diff --git a/build/libs/SquidCraft-1.16-0.2.0-dev.jar b/build/libs/SquidCraft-1.16-0.2.0-dev.jar
deleted file mode 100644
index dd2780a..0000000
Binary files a/build/libs/SquidCraft-1.16-0.2.0-dev.jar and /dev/null differ
diff --git a/changelog.txt b/changelog.txt
index 525a95e..16f4013 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,16 @@
-2020-7-7 ~ 7-8 1.16-0.2.0
+2020-7-7 ~ 7-26 1.16-0.2.0
-1. delete 18 useless texture
+1. delete 20 useless texture
2. fix shredded squid crop texture
-3. delete some useless i18n
\ No newline at end of file
+3. delete some useless translation
+4. move "io.github.squid233.api" to "io.github.squid233.squidcraft.api"
+5. delete "io.github.squid233.squidcraft.api.block" pack
+6. add new API: io.github.squid233.squidcraft.api.item.ItemFood"
+6. add new API: io.github.squid233.squidcraft.api.block.BlockFood"
+7. fix translation
+8. add new entity: cube
+9. cube can spawn in plains
+10. change some blocks' hunger and saturation
+
+To-do List
+TODO cookie creeper can't spawn
diff --git a/gradle.properties b/gradle.properties
index 042e250..6c14f74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1536M -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1 -Dhttps.proxyPort=7890 -Dhttp.proxyPort=7890
+org.gradle.jvmargs=-Xmx1536M \
+ -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1 -Dhttps.proxyPort=10809 -Dhttp.proxyPort=10809
# Fabric Properties
# check these on https://fabricmc.net/use
@@ -14,4 +15,4 @@ org.gradle.jvmargs=-Xmx1536M -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
- fabric_version=0.15.1+build.380-1.16
+ fabric_version=0.16.0+build.384-1.16.1
diff --git a/build/libs/2020/05/SquidCraft-1.16-0.1.0.jar b/release/2020/05/SquidCraft-1.16-0.1.0+build.1.jar
similarity index 100%
rename from build/libs/2020/05/SquidCraft-1.16-0.1.0.jar
rename to release/2020/05/SquidCraft-1.16-0.1.0+build.1.jar
diff --git a/build/libs/2020/05/SquidCraft-1.16-0.1.0-sources-dev.jar b/release/2020/05/SquidCraft-1.16-0.1.0-sources+build.1.jar
similarity index 100%
rename from build/libs/2020/05/SquidCraft-1.16-0.1.0-sources-dev.jar
rename to release/2020/05/SquidCraft-1.16-0.1.0-sources+build.1.jar
diff --git a/build/libs/2020/06/SquidCraft-1.16-0.1.0.jar b/release/2020/06/SquidCraft-1.16-0.1.1+build.1.jar
similarity index 100%
rename from build/libs/2020/06/SquidCraft-1.16-0.1.0.jar
rename to release/2020/06/SquidCraft-1.16-0.1.1+build.1.jar
diff --git a/build/libs/2020/06/SquidCraft-1.16-0.1.0-sources-dev.jar b/release/2020/06/SquidCraft-1.16-0.1.1-sources+build.1.jar
similarity index 100%
rename from build/libs/2020/06/SquidCraft-1.16-0.1.0-sources-dev.jar
rename to release/2020/06/SquidCraft-1.16-0.1.1-sources+build.1.jar
diff --git a/src/main/java/io/github/squid233/squidcraft/SquidCraft.java b/src/main/java/io/github/squid233/squidcraft/SquidCraft.java
index 97d84d8..fef286f 100644
--- a/src/main/java/io/github/squid233/squidcraft/SquidCraft.java
+++ b/src/main/java/io/github/squid233/squidcraft/SquidCraft.java
@@ -1,41 +1,43 @@
package io.github.squid233.squidcraft;
+import io.github.squid233.squidcraft.api.util.Loggers;
import io.github.squid233.squidcraft.api.util.MinecraftMod;
import io.github.squid233.squidcraft.config.CreateConfig;
+import io.github.squid233.squidcraft.util.ModEntities;
import io.github.squid233.squidcraft.util.handle.LootTablesHandle;
import io.github.squid233.squidcraft.util.registers.*;
import net.fabricmc.api.ModInitializer;
-import static io.github.squid233.squidcraft.api.util.Loggers.log;
-
/**
* @author squid233 and baka4n → (logger4j test)!
*/
-public final class SquidCraft implements ModInitializer, MinecraftMod {
+@MinecraftMod(modid = SquidCraft.MODID)
+public final class SquidCraft implements ModInitializer {
+
public static final String MODID = "squidcraft";
+
@Override
public void onInitialize() {
- String s = "SquidCraft register all";
CreateConfig.create();
- //noinspection InstantiationOfUtilityClass
new ItemRegister();
- log(s, "item register success");
+ logInfo("item register success");
new BlockRegister();
- log(s, "block register success");
+ logInfo("block register success");
new FluidRegister();
- log(s, "fluid register success");
+ logInfo("fluid register success");
new EnchantmentRegister();
- log(s, "enchantment register success");
+ logInfo("enchantment register success");
new WorldGenRegister();
- log(s, "world generator register success");
+ logInfo("world generator register success");
new LootTablesHandle();
- log(s, "loot table register success");
- log(s, "load on initialize success");
+ logInfo("loot table register success");
+ new ModEntities();
+ logInfo("entities register success");
+ logInfo("load on initialize success");
}
- @Override
- public String getModName() {
- return "SquidCraft";
+ public static void logInfo(String info) {
+ Loggers.logInfo(SquidCraft.class, info);
}
}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/BlockRegisters.java b/src/main/java/io/github/squid233/squidcraft/api/BlockRegisters.java
index de1c2ee..e4b60c5 100644
--- a/src/main/java/io/github/squid233/squidcraft/api/BlockRegisters.java
+++ b/src/main/java/io/github/squid233/squidcraft/api/BlockRegisters.java
@@ -1,5 +1,6 @@
package io.github.squid233.squidcraft.api;
+import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.api.util.Loggers;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;
@@ -7,8 +8,6 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
-import static io.github.squid233.squidcraft.api.util.Loggers.log;
-
public class BlockRegisters {
/**
* The register method
@@ -17,25 +16,24 @@ public class BlockRegisters {
* After register, log4j will be tell you:
* "register modid:example success!"
* "register modid:example block success!"
- * @param modid Mod identifier.
- * @param name Block registry name.
- * @param block Block.
+ *
+ * @param modid Mod identifier.
+ * @param name Block registry name.
+ * @param block Block.
* @param settings Block item settings.
* @return Register block.
*/
public static Block register(String modid, String name, Block block, Item.Settings settings) {
- String s = "register block and block item";
ItemRegisters.register(modid, name, new BlockItem(block, settings));
if (Loggers.enableRegisterLog) {
- log(s, "register " + modid + ":" + name + " block success!");
+ SquidCraft.logInfo("register " + modid + ":" + name + " block success!");
}
return Registry.register(Registry.BLOCK, new Identifier(modid, name), block);
}
public static Block register(String modid, String name, Block block) {
- String s = "register block";
if (Loggers.enableRegisterLog) {
- log(s, "register " + modid + ":" + name + " block success!");
+ SquidCraft.logInfo("register " + modid + ":" + name + " block success!");
}
return Registry.register(Registry.BLOCK, new Identifier(modid, name), block);
}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java b/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java
index c446c97..30cf6c8 100644
--- a/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java
+++ b/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java
@@ -1,12 +1,11 @@
package io.github.squid233.squidcraft.api;
+import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.api.util.Loggers;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
-import static io.github.squid233.squidcraft.api.util.Loggers.log;
-
/**
* items register api → (item, tool and armor) register.
*/
@@ -24,7 +23,7 @@ public class ItemRegisters {
*/
public static Item register(String modid, String name, Item item) {
if (Loggers.enableRegisterLog) {
- log("Items Register", "register " + modid + ":" + name + " success!");
+ SquidCraft.logInfo("register " + modid + ":" + name + " success!");
}
return Registry.register(Registry.ITEM, new Identifier(modid, name), item);
}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/block/BlockFood.java b/src/main/java/io/github/squid233/squidcraft/api/block/BlockFood.java
new file mode 100644
index 0000000..becd375
--- /dev/null
+++ b/src/main/java/io/github/squid233/squidcraft/api/block/BlockFood.java
@@ -0,0 +1,81 @@
+package io.github.squid233.squidcraft.api.block;
+
+import io.github.squid233.squidcraft.item.ItemGroups;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.Material;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class BlockFood {
+
+ public static class SquidCraftFood extends Block {
+
+ private final int hunger;
+ private final float saturationModifier;
+
+ public SquidCraftFood(float hardness, float resistance, int hunger, float saturation) {
+ super(FabricBlockSettings.of(Material.SOIL).strength(hardness, resistance));
+ this.hunger = hunger;
+ this.saturationModifier = saturation;
+ }
+
+ public SquidCraftFood(float hardness, int hunger, float saturation) {
+ this(hardness, 0, hunger, saturation);
+ }
+
+ @Override
+ public void buildTooltip(ItemStack stack,
+ @Nullable BlockView world,
+ List tooltip,
+ TooltipContext options) {
+ tooltip.add(new TranslatableText("item.food.hunger", hunger));
+ tooltip.add(new TranslatableText(
+ "item.food.saturation", saturationModifier));
+ tooltip.add(new TranslatableText("item.food.isWolfFood", true));
+ }
+
+ public static class ItemBlock extends BlockItem {
+
+ private final int hunger;
+ private final float saturationModifier;
+
+ public ItemBlock(SquidCraftFood block) {
+ super(block,
+ new Settings()
+ .group(ItemGroups.SQUID_CRAFT)
+ .food(
+ new FoodComponent.Builder()
+ .hunger(block.hunger)
+ .saturationModifier(block.saturationModifier)
+ .meat().alwaysEdible().build()));
+ hunger = block.hunger;
+ saturationModifier = block.saturationModifier;
+ }
+
+ public ItemBlock(Block block) {
+ this((SquidCraftFood) block);
+ }
+
+ @Override
+ public void appendTooltip(ItemStack stack,
+ @Nullable World world,
+ List tooltip,
+ TooltipContext context) {
+ tooltip.add(new TranslatableText("item.food.hunger", hunger));
+ tooltip.add(new TranslatableText(
+ "item.food.saturation", saturationModifier));
+ tooltip.add(new TranslatableText("item.food.isWolfFood", true));
+ }
+ }
+ }
+}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/item/ItemFood.java b/src/main/java/io/github/squid233/squidcraft/api/item/ItemFood.java
new file mode 100644
index 0000000..da30cfe
--- /dev/null
+++ b/src/main/java/io/github/squid233/squidcraft/api/item/ItemFood.java
@@ -0,0 +1,108 @@
+package io.github.squid233.squidcraft.api.item;
+
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+
+/**
+ * Extends this class to new your food.
+ */
+public class ItemFood extends Item {
+
+ private final int hunger;
+ private final float saturationModifier;
+
+ public ItemFood(Settings settings, int hunger, float saturationModifier) {
+ super(settings.food(new FoodComponent.Builder().hunger(hunger).saturationModifier(saturationModifier).build()));
+ this.hunger = hunger;
+ this.saturationModifier = saturationModifier;
+ }
+
+ /*public ItemFood(Settings settings, int hunger) {
+ this(settings, hunger, 0.8F);
+ }*/
+
+
+ /**
+ * In game, your item will be display like this below:
+ * |------------------------|
+ * | Item name |
+ * | |
+ * | Hunger: 1 |
+ * | Saturation: 0.8 |
+ * | Can feed the wolf: true|
+ * |------------------------|
+ *
+ * @param stack Stack
+ * @param world World
+ * @param tooltip Tooltip list
+ * @param context Tooltip Context
+ */
+ @Override
+ public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) {
+ tooltip.add(new TranslatableText("item.food.hunger", hunger));
+ tooltip.add(new TranslatableText("item.food.saturation", saturationModifier));
+ tooltip.add(new TranslatableText("item.food.isWolfFood", false));
+ }
+
+ /**
+ * This class is same as {@link ItemFood} but it can feed the wolves.
+ */
+ public static class Meat extends Item {
+
+ private final int hunger;
+ private final float saturationModifier;
+
+ @SuppressWarnings("unused")
+ public Meat(Settings settings, int hunger, float saturationModifier) {
+ super(settings.food(new FoodComponent.Builder().hunger(hunger).saturationModifier(saturationModifier).meat().build()));
+ this.hunger = hunger;
+ this.saturationModifier = saturationModifier;
+ }
+
+ public Meat(ItemGroup itemGroup, int hunger, float saturationModifier) {
+ this(new Settings().group(itemGroup), hunger, saturationModifier);
+ }
+
+ @Override
+ public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) {
+ tooltip.add(new TranslatableText("item.food.hunger", hunger));
+ tooltip.add(new TranslatableText("item.food.saturation", saturationModifier));
+ tooltip.add(new TranslatableText("item.food.isWolfFood", true));
+ }
+
+ public static class Big extends Item {
+
+ private final int hunger;
+ private final float saturationModifier;
+
+ @SuppressWarnings("unused")
+ public Big(Settings settings, int hunger, float saturationModifier) {
+ super(settings.food(new FoodComponent.Builder().hunger(hunger).saturationModifier(saturationModifier).meat().alwaysEdible().build()));
+ this.hunger = hunger;
+ this.saturationModifier = saturationModifier;
+ }
+
+ public Big(ItemGroup itemGroup, int hunger, float saturationModifier) {
+ this(new Settings().group(itemGroup), hunger, saturationModifier);
+ }
+
+ @Override
+ public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) {
+ tooltip.add(new TranslatableText("item.food.hunger", hunger));
+ tooltip.add(new TranslatableText("item.food.saturation", saturationModifier));
+ tooltip.add(new TranslatableText("item.food.isWolfFood", true));
+ }
+
+ }
+
+ }
+}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/util/Loggers.java b/src/main/java/io/github/squid233/squidcraft/api/util/Loggers.java
index 4824e00..40a8d0d 100644
--- a/src/main/java/io/github/squid233/squidcraft/api/util/Loggers.java
+++ b/src/main/java/io/github/squid233/squidcraft/api/util/Loggers.java
@@ -2,7 +2,8 @@
import io.github.squid233.squidcraft.config.CreateConfig;
import org.apache.logging.log4j.LogManager;
-import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
public class Loggers {
/** Default false */
@@ -10,14 +11,19 @@ public class Loggers {
/**
* @param senderName logger name
- * @param message logger info
+ * @param info logger info
*/
- public static void log(String senderName, String message) {
- LogManager.getLogger(senderName).info(message);
+ public static void logInfo(String senderName, String info) {
+ LogManager.getLogger(senderName).info(info);
}
- public static void log(@NotNull MinecraftMod mod, String message) {
- log(mod.getModName(), message);
- }
+ @SuppressWarnings("rawtypes")
+ public static void logInfo(Class minecraftMod, String info) {
+ Arrays.asList(minecraftMod.getDeclaredAnnotationsByType(MinecraftMod.class)).forEach(annotation -> {
+ if (annotation instanceof MinecraftMod) {
+ logInfo(((MinecraftMod) annotation).modid(), info);
+ }
+ });
+ }
}
diff --git a/src/main/java/io/github/squid233/squidcraft/api/util/MinecraftMod.java b/src/main/java/io/github/squid233/squidcraft/api/util/MinecraftMod.java
index f9dde9b..e4c1ec7 100644
--- a/src/main/java/io/github/squid233/squidcraft/api/util/MinecraftMod.java
+++ b/src/main/java/io/github/squid233/squidcraft/api/util/MinecraftMod.java
@@ -1,13 +1,11 @@
package io.github.squid233.squidcraft.api.util;
-import net.fabricmc.api.ModInitializer;
-
-public interface MinecraftMod extends ModInitializer {
+public @interface MinecraftMod {
/**
* {@link Loggers} will use this method.
- * @return the mod name.
+ * @return the mod id.
*/
- String getModName();
+ String modid();
}
diff --git a/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java b/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java
index 43e3a4c..eb5754f 100644
--- a/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java
+++ b/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java
@@ -1,17 +1,15 @@
package io.github.squid233.squidcraft.block;
import io.github.squid233.squidcraft.block.tile.BiggerChestBlockEntity;
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import io.github.squid233.squidcraft.util.registers.BlockRegister;
+import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
-import net.minecraft.block.Material;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
-import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
@@ -22,15 +20,18 @@
import net.minecraft.world.World;
public class BiggerChestBlock extends BlockWithEntity {
- public BiggerChestBlock() {
- super(FabricBlockSettings.of(Material.METAL));
+
+ public BiggerChestBlock(Settings settings) {
+ super(settings);
}
+ // A side effect of extending BlockWithEntity is it changes the render type to INVISIBLE, so we have to revert this
@Override
public BlockRenderType getRenderType(BlockState state) {
return BlockRenderType.MODEL;
}
+ // We will create the BlockEntity later.
@Override
public BlockEntity createBlockEntity(BlockView view) {
return new BiggerChestBlockEntity();
@@ -46,28 +47,26 @@ public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity p
}
}
-
-
- @SuppressWarnings("deprecation")
@Override
+ @SuppressWarnings("deprecation")
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
if (!world.isClient) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof BiggerChestBlockEntity) {
- NamedScreenHandlerFactory factory = new BiggerChestBlockEntity();
- player.openHandledScreen(factory);
+ ContainerProviderRegistry.INSTANCE.openContainer(BlockRegister.BIGGER_CHEST, player, buf -> buf.writeBlockPos(pos));
}
}
return ActionResult.SUCCESS;
}
- @SuppressWarnings("deprecation")
+ // Scatter the items in the chest when it is removed.
@Override
+ @SuppressWarnings("deprecation")
public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
if (state.getBlock() != newState.getBlock()) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof BiggerChestBlockEntity) {
- ItemScatterer.spawn(world, pos, (Inventory) blockEntity);
+ ItemScatterer.spawn(world, pos, (BiggerChestBlockEntity)blockEntity);
// update comparators
world.updateComparators(pos, this);
}
@@ -75,15 +74,16 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt
}
}
- @SuppressWarnings("deprecation")
@Override
+ @SuppressWarnings("deprecation")
public boolean hasComparatorOutput(BlockState state) {
return true;
}
- @SuppressWarnings("deprecation")
@Override
+ @SuppressWarnings("deprecation")
public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
}
+
}
diff --git a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestBlockEntity.java b/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestBlockEntity.java
index 8e0a501..abe0a0b 100644
--- a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestBlockEntity.java
+++ b/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestBlockEntity.java
@@ -1,5 +1,7 @@
package io.github.squid233.squidcraft.block.tile;
+import io.github.squid233.squidcraft.SquidCraft;
+import io.github.squid233.squidcraft.client.gui.BiggerChestScreenHandler;
import io.github.squid233.squidcraft.util.registers.BlockRegister;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.LootableContainerBlockEntity;
@@ -14,8 +16,7 @@
public class BiggerChestBlockEntity extends LootableContainerBlockEntity {
private DefaultedList inventory;
- // 9 * 6 = 54
- private static final int INVENTORY_SIZE = 54;
+ private static final int INVENTORY_SIZE = 54; // 9 * 6 = 54
public BiggerChestBlockEntity() {
super(BlockRegister.BIGGER_CHEST_ENTITY_TYPE);
@@ -24,12 +25,12 @@ public BiggerChestBlockEntity() {
@Override
protected Text getContainerName() {
- return new TranslatableText("container.chest");
+ return new TranslatableText("container." + SquidCraft.MODID + ".bigger_chest");
}
@Override
- public ScreenHandler createScreenHandler(int syncId, PlayerInventory playerInventory) {
- return BlockRegister.BIGGER_CHEST_SCREEN_HANDLER_TYPE.create(syncId, playerInventory);
+ protected ScreenHandler createScreenHandler(int syncId, PlayerInventory playerInventory) {
+ return new BiggerChestScreenHandler(syncId, playerInventory, this);
}
@Override
diff --git a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java
index c080763..5776274 100644
--- a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java
+++ b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java
@@ -1,21 +1,28 @@
package io.github.squid233.squidcraft.client;
import io.github.squid233.squidcraft.client.gui.BiggerChestScreen;
+import io.github.squid233.squidcraft.client.gui.BiggerChestScreenHandler;
import io.github.squid233.squidcraft.entity.CookieCreeperRenderer;
+import io.github.squid233.squidcraft.entity.CubeEntityRenderer;
import io.github.squid233.squidcraft.util.ModEntities;
import io.github.squid233.squidcraft.util.registers.BlockRegister;
import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
-import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
+import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry;
import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
+import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer;
+import net.minecraft.text.TranslatableText;
import static io.github.squid233.squidcraft.util.KeyBindings.KEY_BINDING_0;
@SuppressWarnings("unused")
+@Environment(EnvType.CLIENT)
public final class SquidCraftClient implements ClientModInitializer {
@Override
public void onInitializeClient() {
@@ -27,10 +34,20 @@ public void onInitializeClient() {
}
});
- ScreenRegistry.register(BlockRegister.BIGGER_CHEST_SCREEN_HANDLER_TYPE, BiggerChestScreen::new);
+ ScreenProviderRegistry.INSTANCE.registerFactory(BlockRegister.BIGGER_CHEST, (container) -> {
+ assert MinecraftClient.getInstance().player != null;
+ return new BiggerChestScreen(container, MinecraftClient.getInstance().player.inventory, new TranslatableText(BlockRegister.BIGGER_CHEST_TRANSLATION_KEY));
+ });
EntityRendererRegistry.INSTANCE.register(ModEntities.COOKIE_CREEPER, (entityRenderDispatcher, context) -> new CookieCreeperRenderer(entityRenderDispatcher));
+ /*
+ * Registers our Cube Entity's renderer, which provides a model and texture for the entity.
+ *
+ * Entity Renderers can also manipulate the model before it renders based on entity context (EndermanEntityRenderer#render).
+ */
+ EntityRendererRegistry.INSTANCE.register(ModEntities.CUBE, (dispatcher, context) -> new CubeEntityRenderer(dispatcher));
+
BlockRenderLayerMap.INSTANCE.putBlock(BlockRegister.SHREDDED_SQUID_CROP, RenderLayer.getCutout());
}
}
diff --git a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java
index 3bb88f7..158c813 100644
--- a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java
+++ b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java
@@ -3,6 +3,8 @@
import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.util.registers.FluidRegister;
import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
@@ -25,6 +27,7 @@
import java.util.function.Function;
@SuppressWarnings("unused")
+@Environment(EnvType.CLIENT)
public final class SquidCraftFluidRenderingClient implements ClientModInitializer {
@Override
diff --git a/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreen.java b/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreen.java
index f857a4c..68c71cb 100644
--- a/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreen.java
+++ b/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreen.java
@@ -1,7 +1,6 @@
package io.github.squid233.squidcraft.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
-import io.github.squid233.squidcraft.block.tile.BiggerChestScreenHandler;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerInventory;
@@ -9,35 +8,41 @@
import net.minecraft.util.Identifier;
public class BiggerChestScreen extends HandledScreen {
- /** a path to gui texture, you may replace it with new Identifier(YourMod.MOD_ID, "textures/gui/container/your_container.png"); */
+
+ // a path to gui texture, you may replace it with new Identifier(YourMod.MOD_ID, "textures/gui/container/your_container.png");
private static final Identifier TEXTURE = new Identifier("textures/gui/container/generic_54.png");
- public BiggerChestScreen(BiggerChestScreenHandler handler, PlayerInventory playerInventory, Text title) {
- super(handler, playerInventory, title);
+ public BiggerChestScreen(BiggerChestScreenHandler container, PlayerInventory playerInventory, Text title) {
+ super(container, playerInventory, title);
this.backgroundHeight = 114 + 6 * 18;
}
@Override
- protected void drawForeground(MatrixStack matrixStack, int mouseX, int mouseY) {
- font(this.title.asString(), 8.0F, 6.0F, 4210752);
- font(this.playerInventory.getDisplayName().asString(), 8.0F, (float)(this.backgroundHeight - 96 + 2), 4210752);
+ protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) {
+ this.textRenderer.draw(matrices, this.title.asString(), 8.0F, 6.0F, 4210752);
+ this.textRenderer.draw(matrices, this.playerInventory.getDisplayName().asString(), 8.0F, (float) (this.backgroundHeight - 96 + 2), 4210752);
}
- @SuppressWarnings("deprecation")
@Override
- protected void drawBackground(MatrixStack matrixStack, float delta, int mouseX, int mouseY) {
+ @SuppressWarnings("deprecation")
+ protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
assert this.client != null;
this.client.getTextureManager().bindTexture(TEXTURE);
int i = (this.width - this.backgroundWidth) / 2;
int j = (this.height - this.backgroundHeight) / 2;
- blit(i, j, 0, 0, this.backgroundWidth, 6 * 18 + 17);
- blit(i, j + 6 * 18 + 17, 0, 126, this.backgroundWidth, 96);
+ this.blit(i, j, 0, 0, this.backgroundWidth, 6 * 18 + 17);
+ this.blit(i, j + 6 * 18 + 17, 0, 126, this.backgroundWidth, 96);
}
- @SuppressWarnings("InfiniteRecursion")
- public void font(String t, float x, float y, int c) { this.font(t, x, y, c); }
+ @SuppressWarnings({"InfiniteRecursion", "unused"})
+ public void font(String t, float x, float y, int c) {
+ this.font(t, x, y, c);
+ }
+
+ @SuppressWarnings({"InfiniteRecursion", "unused"})
+ public void blit(int i, int j, int u, int v, int width, int height) {
+ this.blit(i, j, u, v, width, height);
+ }
- @SuppressWarnings("InfiniteRecursion")
- public void blit(int i, int j, int u, int v, int width, int height) { this.blit(i, j, u, v, width, height); }
}
diff --git a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java b/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreenHandler.java
similarity index 89%
rename from src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java
rename to src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreenHandler.java
index 9fc101f..9aff709 100644
--- a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java
+++ b/src/main/java/io/github/squid233/squidcraft/client/gui/BiggerChestScreenHandler.java
@@ -1,6 +1,5 @@
-package io.github.squid233.squidcraft.block.tile;
+package io.github.squid233.squidcraft.client.gui;
-import io.github.squid233.squidcraft.util.registers.BlockRegister;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Inventory;
@@ -12,9 +11,9 @@ public class BiggerChestScreenHandler extends ScreenHandler {
private final Inventory inventory; // Chest inventory
private static final int INVENTORY_SIZE = 54; // 6 rows * 9 cols
- public BiggerChestScreenHandler(int syncId, PlayerInventory playerInventory) {
- super(BlockRegister.BIGGER_CHEST_SCREEN_HANDLER_TYPE, syncId);
- this.inventory = playerInventory;
+ public BiggerChestScreenHandler(int syncId, PlayerInventory playerInventory, Inventory inventory) {
+ super(null, syncId); // Since we didn't create a ContainerType, we will place null here.
+ this.inventory = inventory;
checkSize(inventory, INVENTORY_SIZE);
inventory.onOpen(playerInventory.player);
@@ -48,7 +47,7 @@ public boolean canUse(PlayerEntity player) {
return this.inventory.canPlayerUse(player);
}
- /** Shift + Player Inv Slot */
+ // Shift + Player Inv Slot
@Override
public ItemStack transferSlot(PlayerEntity player, int invSlot) {
ItemStack newStack = ItemStack.EMPTY;
diff --git a/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java b/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java
index fa46413..8b23a37 100644
--- a/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java
+++ b/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java
@@ -7,12 +7,13 @@
import net.minecraft.util.Identifier;
public class CookieCreeperRenderer extends MobEntityRenderer> {
+
public CookieCreeperRenderer(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new CreeperEntityModel<>(), 1);
}
@Override
- public Identifier getTexture(CookieCreeperEntity cookieCreeperEntity) {
- return new Identifier(SquidCraft.MODID+":textures/entity/cookie_creeper/creeper.png");
+ public Identifier getTexture(CookieCreeperEntity entity) {
+ return new Identifier(SquidCraft.MODID, "textures/entity/cookie_creeper.png");
}
}
diff --git a/src/main/java/io/github/squid233/squidcraft/entity/CubeEntity.java b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntity.java
new file mode 100644
index 0000000..b2cbe75
--- /dev/null
+++ b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntity.java
@@ -0,0 +1,20 @@
+package io.github.squid233.squidcraft.entity;
+
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.mob.PathAwareEntity;
+import net.minecraft.world.World;
+
+/*
+ * Our Cube Entity extends MobEntityWithAi, which extends MobEntity, which extends LivingEntity.
+ *
+ * LivingEntity has health and can deal damage.
+ * MobEntity has movement controls and AI capabilities.
+ * PathAwareEntity has path finding favor and slightly tweaked leash behavior.
+ */
+@SuppressWarnings("EntityConstructor")
+public class CubeEntity extends PathAwareEntity {
+
+ public CubeEntity(EntityType entityType, World world) {
+ super(entityType, world);
+ }
+}
diff --git a/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityModel.java b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityModel.java
new file mode 100644
index 0000000..bc7212b
--- /dev/null
+++ b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityModel.java
@@ -0,0 +1,33 @@
+package io.github.squid233.squidcraft.entity;
+
+import net.minecraft.client.model.ModelPart;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+
+public class CubeEntityModel extends EntityModel {
+
+ private final ModelPart base;
+
+ public CubeEntityModel() {
+ this.textureHeight = 64;
+ this.textureWidth = 64;
+ base = new ModelPart(this, 0, 0);
+ base.addCuboid(-6, -6, -6, 12, 12, 12);
+ }
+
+ @Override
+ public void setAngles(CubeEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
+
+ }
+
+ @Override
+ public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+ // translate model down
+ matrices.translate(0, 1.125, 0);
+
+ // render cube
+ base.render(matrices, vertices, light, overlay);
+ }
+
+}
diff --git a/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityRenderer.java b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityRenderer.java
new file mode 100644
index 0000000..1e7c8bb
--- /dev/null
+++ b/src/main/java/io/github/squid233/squidcraft/entity/CubeEntityRenderer.java
@@ -0,0 +1,21 @@
+package io.github.squid233.squidcraft.entity;
+
+import io.github.squid233.squidcraft.SquidCraft;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+/*
+ * A renderer is used to provide an entity model, shadow size, and texture.
+ */
+public class CubeEntityRenderer extends MobEntityRenderer {
+
+ public CubeEntityRenderer(EntityRenderDispatcher entityRenderDispatcher) {
+ super(entityRenderDispatcher, new CubeEntityModel(), 0.5f);
+ }
+
+ @Override
+ public Identifier getTexture(CubeEntity entity) {
+ return new Identifier(SquidCraft.MODID, "textures/entity/cube.png");
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java b/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java
index d75517f..26a7715 100644
--- a/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java
+++ b/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java
@@ -1,6 +1,6 @@
package io.github.squid233.squidcraft.mixin;
-import io.github.squid233.squidcraft.api.util.Loggers;
+import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.client.gui.AuthorsGui;
import io.github.squid233.squidcraft.config.CreateConfig;
import net.minecraft.client.MinecraftClient;
@@ -32,7 +32,7 @@ private void init(CallbackInfo info) {
}
private void log(String message) {
- Loggers.log("SquidCraft", message);
+ SquidCraft.logInfo(message);
}
/**
diff --git a/src/main/java/io/github/squid233/squidcraft/util/KeyBindings.java b/src/main/java/io/github/squid233/squidcraft/util/KeyBindings.java
index d173a6d..d1a8519 100644
--- a/src/main/java/io/github/squid233/squidcraft/util/KeyBindings.java
+++ b/src/main/java/io/github/squid233/squidcraft/util/KeyBindings.java
@@ -7,7 +7,7 @@
public class KeyBindings {
public static final KeyBinding KEY_BINDING_0 = new KeyBinding(
- "key" + SquidCraft.MODID + "." + "useless_key",
+ "key." + SquidCraft.MODID + ".useless_key",
InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_CAPS_LOCK,
"SquidCraft"
diff --git a/src/main/java/io/github/squid233/squidcraft/util/ModEntities.java b/src/main/java/io/github/squid233/squidcraft/util/ModEntities.java
index e254e0c..ed021b2 100644
--- a/src/main/java/io/github/squid233/squidcraft/util/ModEntities.java
+++ b/src/main/java/io/github/squid233/squidcraft/util/ModEntities.java
@@ -2,18 +2,54 @@
import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.entity.CookieCreeperEntity;
+import io.github.squid233.squidcraft.entity.CubeEntity;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.Biomes;
public class ModEntities {
- public static final EntityType COOKIE_CREEPER =
- Registry.register(
- Registry.ENTITY_TYPE,
- new Identifier(SquidCraft.MODID, "cookie_creeper"),
- FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, CookieCreeperEntity::new).dimensions(EntityDimensions.fixed(1, 2)).build()
- );
+
+ /*
+ * Registers our Cube Entity under the ID "squidcraft:cube".
+ *
+ * The entity is registered under the SpawnGroup#CREATURE category, which is what most animals and passive/neutral mobs use.
+ * It has a hitbox size of .75x.75, or 12 "pixels" wide (3/4ths of a block).
+ */
+ public static final EntityType CUBE = Registry.register(
+ Registry.ENTITY_TYPE,
+ new Identifier(SquidCraft.MODID, "cube"),
+ FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, CubeEntity::new).dimensions(EntityDimensions.fixed(0.75f, 0.75f)).build()
+ );
+
+ public static final EntityType COOKIE_CREEPER = Registry.register(
+ Registry.ENTITY_TYPE,
+ new Identifier(SquidCraft.MODID, "cookie_creeper"),
+ FabricEntityTypeBuilder.create(SpawnGroup.MONSTER, CookieCreeperEntity::new).dimensions(EntityDimensions.fixed(1, 2)).build()
+ );
+
+ public ModEntities() {
+ add();
+ Biomes.PLAINS.getEntitySpawnList(SpawnGroup.MONSTER).add(new Biome.SpawnEntry(ModEntities.COOKIE_CREEPER, 30, 1, 2));
+ Biomes.PLAINS.getEntitySpawnList(SpawnGroup.CREATURE).add(new Biome.SpawnEntry(ModEntities.CUBE, 30, 1, 2));
+
+ }
+
+ public void add() {
+ /*
+ * Register our Cube Entity's default attributes.
+ * Attributes are properties or stats of the mobs, including things like attack damage and health.
+ * The game will crash if the entity doesn't have the proper attributes registered in time.
+ *
+ * In 1.16, this was done by a method override inside the entity class.
+ * Most vanilla entities have a static method (eg. ZombieEntity#createZombieAttributes) for initializing their attributes.
+ */
+ FabricDefaultAttributeRegistry.register(CUBE, CubeEntity.createMobAttributes());
+ FabricDefaultAttributeRegistry.register(COOKIE_CREEPER, CookieCreeperEntity.createCreeperAttributes());
+ }
}
diff --git a/src/main/java/io/github/squid233/squidcraft/util/registers/BlockRegister.java b/src/main/java/io/github/squid233/squidcraft/util/registers/BlockRegister.java
index 62e7627..bfccad1 100644
--- a/src/main/java/io/github/squid233/squidcraft/util/registers/BlockRegister.java
+++ b/src/main/java/io/github/squid233/squidcraft/util/registers/BlockRegister.java
@@ -2,21 +2,27 @@
import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.api.BlockRegisters;
+import io.github.squid233.squidcraft.api.ItemRegisters;
+import io.github.squid233.squidcraft.api.block.BlockFood.SquidCraftFood;
+import io.github.squid233.squidcraft.api.block.BlockFood.SquidCraftFood.ItemBlock;
+import io.github.squid233.squidcraft.api.util.Loggers;
import io.github.squid233.squidcraft.block.BiggerChestBlock;
import io.github.squid233.squidcraft.block.SquidSideBlock;
import io.github.squid233.squidcraft.block.tile.BiggerChestBlockEntity;
-import io.github.squid233.squidcraft.block.tile.BiggerChestScreenHandler;
import io.github.squid233.squidcraft.item.ItemGroups;
+import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.*;
-import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
-import static io.github.squid233.squidcraft.api.util.Loggers.log;
+import java.util.Objects;
+
+import static io.github.squid233.squidcraft.item.ItemGroups.SQUID_CRAFT;
/**
* You always register block, add {@link ItemGroups}, add lang, add blockstates, add models, add textures, add loot tables and add recipes.
@@ -35,6 +41,15 @@ private static Block register(String name, Block block) {
return BlockRegisters.register(SquidCraft.MODID, name, block);
}
+ private void register(String name, Block block, ItemBlock itemBlock) {
+ ItemRegisters.register(SquidCraft.MODID, name, itemBlock);
+ if (Loggers.enableRegisterLog) {
+ SquidCraft.logInfo("register " + SquidCraft.MODID + ":" + name + " block success!");
+ }
+ Registry.register(Registry.BLOCK, new Identifier(SquidCraft.MODID, name),
+ block);
+ }
+
public static final Block SQUID_BLOCK;
public static final Block COMPRESS_SQUID_BLOCK;
public static final Block LOW_SQUID_BLOCK;
@@ -57,39 +72,43 @@ private static Block register(String name, Block block) {
public static final Block SHREDDED_SQUID_CROP;
public static final Identifier BIGGER_CHEST = new Identifier(SquidCraft.MODID, "bigger_chest_block");
- //public static final String BIGGER_CHEST_TRANSLATION_KEY = Util.createTranslationKey("container", BIGGER_CHEST);
- public static final ScreenHandlerType BIGGER_CHEST_SCREEN_HANDLER_TYPE = ScreenHandlerRegistry.registerSimple(BIGGER_CHEST, BiggerChestScreenHandler::new);
+ public static final String BIGGER_CHEST_TRANSLATION_KEY = Util.createTranslationKey("container", BIGGER_CHEST);
+ /*public static final ScreenHandlerType BIGGER_CHEST_SCREEN_HANDLER_TYPE =
+ ScreenHandlerRegistry.registerSimple(BIGGER_CHEST, BiggerChestScreenHandler::new); */
public static BlockEntityType BIGGER_CHEST_ENTITY_TYPE;
static {
// Squid blocks begin
- SQUID_BLOCK = register("squid_block", new Block(FabricBlockSettings.of(Material.SOIL).hardness(0.5f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(1458).saturationModifier(165.651f).meat().alwaysEdible().build()));
- COMPRESS_SQUID_BLOCK = register("compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).hardness(0.525f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(13122).saturationModifier(256.0f).meat().alwaysEdible().build()));
- LOW_SQUID_BLOCK = register("low_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.55f, 0.1f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(118098).saturationModifier(512.0f).meat().alwaysEdible().build()));
- LOW_COMPRESS_SQUID_BLOCK = register("low_compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.6f, 0.15f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(1062882).saturationModifier(1024.0f).meat().alwaysEdible().build()));
- MEDIUM_SQUID_BLOCK = register("medium_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.65f, 0.2f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(1417176).saturationModifier(1365.3f).meat().alwaysEdible().build()));
- MEDIUM_COMPRESS_SQUID_BLOCK = register("medium_compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.7f, 0.25f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(1889568).saturationModifier(1820.4f).meat().alwaysEdible().build()));
- HIGHER_SQUID_BLOCK = register("higher_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.75f, 0.3f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(2519424).saturationModifier(2427.2f).meat().alwaysEdible().build()));
- HIGHER_COMPRESS_SQUID_BLOCK = register("higher_compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.8f, 0.35f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(3359232).saturationModifier(3236.266666666666f).meat().alwaysEdible().build()));
- SUPER_SQUID_BLOCK = register("super_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.85f, 0.4f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(4478976).saturationModifier(4315.023f).meat().alwaysEdible().build()));
- SUPER_COMPRESS_SQUID_BLOCK = register("super_compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.9f, 0.45f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(5971968).saturationModifier(5753.3629629629629629629629629631f).meat().alwaysEdible().build()));
- ULTIMATE_SQUID_BLOCK = register("ultimate_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(0.95f, 0.5f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(7962624).saturationModifier(7671.15061728395f).meat().alwaysEdible().build()));
- ULTIMATE_COMPRESS_SQUID_BLOCK = register("ultimate_compress_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(1.0f, 0.55f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(10616832).saturationModifier(10228.200823045267489711934156379f).meat().alwaysEdible().build()));
+ SQUID_BLOCK = new SquidCraftFood(0.5f, 1400, 128);
+ COMPRESS_SQUID_BLOCK = new SquidCraftFood(0.525f, 6300, 192);
+ LOW_SQUID_BLOCK = new SquidCraftFood(0.55f, 0.1f, 28350, 288);
+ LOW_COMPRESS_SQUID_BLOCK = new SquidCraftFood(0.6f, 0.15f, 127575, 432);
+ MEDIUM_SQUID_BLOCK = new SquidCraftFood(0.65f, 0.2f, 574088, 648);
+ MEDIUM_COMPRESS_SQUID_BLOCK = new SquidCraftFood(0.7f, 0.25f, 1148175, 972);
+ HIGHER_SQUID_BLOCK = new SquidCraftFood(0.75f, 0.3f, 1722262, 1458);
+ HIGHER_COMPRESS_SQUID_BLOCK = new SquidCraftFood(0.8f, 0.35f, 2583394, 2187);
+ SUPER_SQUID_BLOCK = new SquidCraftFood(0.85f, 0.4f, 3875091, 3281);
+ SUPER_COMPRESS_SQUID_BLOCK = new SquidCraftFood(0.9f, 0.45f, 5812636, 4921);
+ ULTIMATE_SQUID_BLOCK = new SquidCraftFood(0.95f, 0.5f, 6393900, 7381);
+ ULTIMATE_COMPRESS_SQUID_BLOCK = new SquidCraftFood(1, 0.55f, 7033289, 11072);
// Squid blocks end
// Multi squid blocks begin
- ONE_SQUID_BLOCK = register("one_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(1.5f, 0.6f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(14155776).saturationModifier(13637.601097393689f).meat().alwaysEdible().build()));
- TWO_SQUID_BLOCK = register("two_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(2.0f, 0.65f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(18874368).saturationModifier(18183.468129858253f).meat().alwaysEdible().build()));
- FOUR_SQUID_BLOCK = register("four_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(2.5f, 0.7f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(25165824).saturationModifier(24244.6241731443f).meat().alwaysEdible().build()));
- EIGHT_SQUID_BLOCK = register("eight_squid_block", new Block(FabricBlockSettings.of(Material.SOIL).strength(3.0f, 0.75f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(33554432).saturationModifier(32326.165564192f).meat().alwaysEdible().build()));
+ ONE_SQUID_BLOCK = new SquidCraftFood(1.5f, 0.6f, 7384954, 12179);
+ TWO_SQUID_BLOCK = new SquidCraftFood(2, 0.65f, 7754202, 13397);
+ FOUR_SQUID_BLOCK = new SquidCraftFood(2.5f, 0.7f, 8141912, 14736);
+ EIGHT_SQUID_BLOCK = new SquidCraftFood(3, 0.75f, 8549007, 16210);
// Multi squid blocks end
- SQUID_SIDE_BLOCK = register("squid_side_block", new SquidSideBlock(FabricBlockSettings.of(Material.SOIL).hardness(1.5f)), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(729).saturationModifier(82.8255f).meat().alwaysEdible().build()));
+ SQUID_SIDE_BLOCK = register("squid_side_block", new SquidSideBlock(FabricBlockSettings.of(Material.SOIL).hardness(0.5f)),
+ new Item.Settings().group(SQUID_CRAFT).food(
+ new FoodComponent.Builder().hunger(700).saturationModifier(64).meat().alwaysEdible().build()));
- BIGGER_CHEST_BLOCK = new BiggerChestBlock();
+ BIGGER_CHEST_BLOCK = new BiggerChestBlock(FabricBlockSettings.of(Material.METAL));
- SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new CarvedPumpkinBlock(AbstractBlock.Settings.copy(Blocks.JACK_O_LANTERN)){}, ItemGroups.SQUID_CRAFT);
+ SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new CarvedPumpkinBlock(AbstractBlock.Settings.copy(Blocks.JACK_O_LANTERN)) {
+ }, SQUID_CRAFT);
SHREDDED_SQUID_CROP = register("shredded_squid_crop", new CarrotsBlock(FabricBlockSettings.copyOf(Blocks.CARROTS)) {
@Override
@@ -100,21 +119,41 @@ protected ItemConvertible getSeedsItem() {
}
public BlockRegister() {
- registerContainer(new Item.Settings().group(ItemGroups.SQUID_CRAFT));
- BIGGER_CHEST_ENTITY_TYPE = Registry.register(Registry.BLOCK_ENTITY_TYPE, BIGGER_CHEST, BlockEntityType.Builder.create(BiggerChestBlockEntity::new, BIGGER_CHEST_BLOCK).build(null));
- /*ContainerProviderRegistry.INSTANCE.registerFactory(BIGGER_CHEST, ((syncId, identifier, player, buf) -> {
- final BlockEntity blockEntity = player.world.getBlockEntity(buf.readBlockPos());
- assert blockEntity != null;
- return ((BiggerChestBlockEntity) blockEntity).createScreenHandler(syncId, player.inventory);
- }));*/
+ registerContainer(new Item.Settings().group(SQUID_CRAFT));
+ BIGGER_CHEST_ENTITY_TYPE = Registry.register(Registry.BLOCK_ENTITY_TYPE, BIGGER_CHEST,
+ BlockEntityType.Builder.create(BiggerChestBlockEntity::new, BIGGER_CHEST_BLOCK).build(null));
+
+ ContainerProviderRegistry.INSTANCE.registerFactory(BIGGER_CHEST, (syncId, identifier, player, buf) -> {
+ final BlockPos pos = buf.readBlockPos();
+ return Objects.requireNonNull(player.world.getBlockState(pos).createScreenHandlerFactory(player.world, pos))
+ .createMenu(syncId, player.inventory, player);
+ });
+
+ register("squid_block", SQUID_BLOCK, new ItemBlock(SQUID_BLOCK));
+ register("compress_squid_block", COMPRESS_SQUID_BLOCK, new ItemBlock(COMPRESS_SQUID_BLOCK));
+ register("low_squid_block", LOW_SQUID_BLOCK, new ItemBlock(LOW_SQUID_BLOCK));
+ register("low_compress_squid_block", LOW_COMPRESS_SQUID_BLOCK, new ItemBlock(LOW_COMPRESS_SQUID_BLOCK));
+ register("medium_squid_block", MEDIUM_SQUID_BLOCK, new ItemBlock(MEDIUM_SQUID_BLOCK));
+ register("medium_compress_squid_block", MEDIUM_COMPRESS_SQUID_BLOCK, new ItemBlock(MEDIUM_COMPRESS_SQUID_BLOCK));
+ register("higher_squid_block", HIGHER_SQUID_BLOCK, new ItemBlock(HIGHER_SQUID_BLOCK));
+ register("higher_compress_squid_block", HIGHER_COMPRESS_SQUID_BLOCK, new ItemBlock(HIGHER_COMPRESS_SQUID_BLOCK));
+ register("super_squid_block", SUPER_SQUID_BLOCK, new ItemBlock(SUPER_SQUID_BLOCK));
+ register("super_compress_squid_block", SUPER_COMPRESS_SQUID_BLOCK, new ItemBlock(SUPER_COMPRESS_SQUID_BLOCK));
+ register("ultimate_squid_block", ULTIMATE_SQUID_BLOCK, new ItemBlock(ULTIMATE_SQUID_BLOCK));
+ register("ultimate_compress_squid_block", ULTIMATE_COMPRESS_SQUID_BLOCK, new ItemBlock(ULTIMATE_COMPRESS_SQUID_BLOCK));
+
+ register("one_squid_block", ONE_SQUID_BLOCK, new ItemBlock(ONE_SQUID_BLOCK));
+ register("two_squid_block", TWO_SQUID_BLOCK, new ItemBlock(TWO_SQUID_BLOCK));
+ register("four_squid_block", FOUR_SQUID_BLOCK, new ItemBlock(FOUR_SQUID_BLOCK));
+ register("eight_squid_block", EIGHT_SQUID_BLOCK, new ItemBlock(EIGHT_SQUID_BLOCK));
+
}
private void registerContainer(Item.Settings settings) {
- String s = "register container";
Registry.register(Registry.BLOCK, BIGGER_CHEST, BIGGER_CHEST_BLOCK);
Registry.register(Registry.ITEM, BIGGER_CHEST, new BlockItem(BIGGER_CHEST_BLOCK, settings));
- log(s, "register container");
+ SquidCraft.logInfo("register container");
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/squid233/squidcraft/util/registers/ItemRegister.java b/src/main/java/io/github/squid233/squidcraft/util/registers/ItemRegister.java
index f01e6f1..13209a6 100644
--- a/src/main/java/io/github/squid233/squidcraft/util/registers/ItemRegister.java
+++ b/src/main/java/io/github/squid233/squidcraft/util/registers/ItemRegister.java
@@ -1,8 +1,8 @@
package io.github.squid233.squidcraft.util.registers;
import io.github.squid233.squidcraft.api.ItemRegisters;
+import io.github.squid233.squidcraft.api.item.ItemFood;
import io.github.squid233.squidcraft.armor.ArmorMaterials;
-import io.github.squid233.squidcraft.item.ItemGroups;
import io.github.squid233.squidcraft.item.ModToolMaterial;
import io.github.squid233.squidcraft.item.YourItem;
import io.github.squid233.squidcraft.item.YourItem2;
@@ -17,10 +17,11 @@
import java.util.List;
import static io.github.squid233.squidcraft.SquidCraft.MODID;
+import static io.github.squid233.squidcraft.item.ItemGroups.SQUID_CRAFT;
import static io.github.squid233.squidcraft.item.ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS;
public class ItemRegister {
- // TODO Always register item, add item group, add models, add textures and add recipes.
+ // Always register item, add item group, add models, add textures and add recipes.
public static final Item SHREDDED_SQUID;
public static final Item COOKED_SHREDDED_SQUID;
public static final Item A_PILE_COOKED_SHREDDED_SQUID;
@@ -35,39 +36,72 @@ public class ItemRegister {
public static final Item SQUID_SHOVEL;
public static final Item SQUID_SWORD;
public static final Item COOKIE_CREEPER_SPAWN_EGG;
+ public static final Item CUBE_SPAWN_EGG;
public static final Item MILK_BUCKET;
-
public static final io.github.squid233.squidcraft.api.item.Item
YOUR_ITEM = new YourItem(),
YOUR_ITEM_2 = new YourItem2();
static {
- SHREDDED_SQUID = register("shredded_squid", new Item(new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(1).saturationModifier(0.4f).meat().build())));
- COOKED_SHREDDED_SQUID = register("cooked_shredded_squid", new Item(new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(2).saturationModifier(0.6f).meat().build())));
- A_PILE_COOKED_SHREDDED_SQUID = register("a_pile_cooked_shredded_squid", new Item(new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(18).saturationModifier(0.7f).meat().build())));
- SQUID_COOKIE = register("squid_cookie", new Item(new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(162).saturationModifier(3.1415926535897932384626f).meat().alwaysEdible().build())) {
- @Override
- public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) {
- tooltip.add(new TranslatableText("item.squidcraft.squid_cookie.tooltip"));
- }
+ SHREDDED_SQUID = register("shredded_squid",
+ new ItemFood.Meat(SQUID_CRAFT, 1, 0.4f));
+ COOKED_SHREDDED_SQUID = register("cooked_shredded_squid",
+ new ItemFood.Meat(SQUID_CRAFT, 2, 0.6f));
+ A_PILE_COOKED_SHREDDED_SQUID = register("a_pile_cooked_shredded_squid",
+ new ItemFood.Meat(SQUID_CRAFT, 18, 0.8f));
+ SQUID_COOKIE = register("squid_cookie",
+ new ItemFood.Meat.Big(SQUID_CRAFT, 162, 3.2f) {
+ @Override
+ public void appendTooltip(ItemStack stack, World world,
+ List tooltip, TooltipContext context) {
+ super.appendTooltip(stack, world, tooltip, context);
+ tooltip.add(new TranslatableText(
+ "item.squidcraft.squid_cookie.tooltip"));
+ }
+ });
+
+ SQUID_HELMET = registerHelmet(new ArmorItem(ArmorMaterials.SQUID,
+ EquipmentSlot.HEAD,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+ SQUID_CHESTPLATE = registerChestplate(new ArmorItem(
+ ArmorMaterials.SQUID, EquipmentSlot.CHEST,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+ SQUID_LEGGINGS = registerLeggings(new ArmorItem(ArmorMaterials.SQUID,
+ EquipmentSlot.LEGS,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+ SQUID_BOOTS = registerBoots(new ArmorItem(ArmorMaterials.SQUID,
+ EquipmentSlot.FEET,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+
+ SQUID_AXE = registerAxe(new AxeItem(ModToolMaterial.SQUID,
+ -0, -2.2f,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)) {
});
-
- SQUID_HELMET = registerHelmet("squid", new ArmorItem(ArmorMaterials.SQUID, EquipmentSlot.HEAD, new Item.Settings().group(ItemGroups.SQUID_CRAFT)));
- SQUID_CHESTPLATE = registerChestplate("squid", new ArmorItem(ArmorMaterials.SQUID, EquipmentSlot.CHEST, new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
- SQUID_LEGGINGS = registerLeggings("squid", new ArmorItem(ArmorMaterials.SQUID, EquipmentSlot.LEGS, new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
- SQUID_BOOTS = registerBoots("squid", new ArmorItem(ArmorMaterials.SQUID, EquipmentSlot.FEET, new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
-
- SQUID_AXE = registerAxe("squid", new AxeItem(ModToolMaterial.SQUID, -0, -2.2f, new Item.Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)) {
+ SQUID_HOE = registerHoe(new HoeItem(ModToolMaterial.SQUID,
+ -4, -2.4f,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)) {
});
- SQUID_HOE = registerHoe("squid", new HoeItem(ModToolMaterial.SQUID, -4, -2.4f, new Item.Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)) {
+ SQUID_PICKAXE = registerPickaxe(new PickaxeItem(ModToolMaterial.SQUID,
+ -1, -1,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)) {
});
- SQUID_PICKAXE = registerPickaxe("squid", new PickaxeItem(ModToolMaterial.SQUID, -1, -1, new Item.Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)) {
- });
- SQUID_SHOVEL = registerShovel("squid", new ShovelItem(ModToolMaterial.SQUID, -2, -2, new Item.Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)));
- SQUID_SWORD = registerSword("squid", new SwordItem(ModToolMaterial.SQUID, +1, -0, new Item.Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)));
-
- COOKIE_CREEPER_SPAWN_EGG = register("cookie_creeper_spawn_egg", new SpawnEggItem(ModEntities.COOKIE_CREEPER, 0x0DA70B, 0x73420E, new Item.Settings().group(ItemGroups.SQUID_CRAFT)));
- MILK_BUCKET = register("milk_bucket", new Item(new Item.Settings().group(ItemGroups.SQUID_CRAFT)));
+ SQUID_SHOVEL = registerShovel(new ShovelItem(ModToolMaterial.SQUID, -2,
+ -2, new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+ SQUID_SWORD = registerSword(new SwordItem(ModToolMaterial.SQUID,
+ 1, -0,
+ new Item.Settings().group(SQUID_CRAFT_COMBAT_AND_TOOLS)));
+
+ COOKIE_CREEPER_SPAWN_EGG = register("cookie_creeper_spawn_egg",
+ new SpawnEggItem(ModEntities.COOKIE_CREEPER, 0x0DA70B,
+ 0x73420E, new Item.Settings().group(SQUID_CRAFT)));
+ CUBE_SPAWN_EGG = register("cube_spawn_egg",
+ new SpawnEggItem(ModEntities.CUBE, 0xFFA7A4, 0x7BD4FF,
+ new Item.Settings().group(SQUID_CRAFT)));
+
+ MILK_BUCKET = register("milk_bucket",
+ new BucketItem(FluidRegister.STILL_MILK,
+ new Item.Settings().group(SQUID_CRAFT)
+ .recipeRemainder(Items.BUCKET).maxCount(1)));
}
public ItemRegister() {
@@ -78,43 +112,44 @@ private static Item register(String itemName, Item item) {
return ItemRegisters.register(MODID, itemName, item);
}
- public static Item registerHelmet(String name, Item item) {
- return ItemRegisters.registerHelmet(MODID, name, item);
+ private static Item registerHelmet(Item item) {
+ return ItemRegisters.registerHelmet(MODID, "squid", item);
}
- public static Item registerChestplate(String name, Item item) {
- return ItemRegisters.registerChestplate(MODID, name, item);
+ private static Item registerChestplate(Item item) {
+ return ItemRegisters.registerChestplate(MODID, "squid", item);
}
- public static Item registerLeggings(String name, Item item) {
- return ItemRegisters.registerLeggings(MODID, name, item);
+ private static Item registerLeggings(Item item) {
+ return ItemRegisters.registerLeggings(MODID, "squid", item);
}
- public static Item registerBoots(String name, Item item) {
- return ItemRegisters.registerBoots(MODID, name, item);
+ private static Item registerBoots(Item item) {
+ return ItemRegisters.registerBoots(MODID, "squid", item);
}
- public static Item registerAxe(String name, Item item) {
- return ItemRegisters.registerAxe(MODID, name, item);
+ private static Item registerAxe(Item item) {
+ return ItemRegisters.registerAxe(MODID, "squid", item);
}
- public static Item registerHoe(String name, Item item) {
- return ItemRegisters.registerHoe(MODID, name, item);
+ private static Item registerHoe(Item item) {
+ return ItemRegisters.registerHoe(MODID, "squid", item);
}
- public static Item registerPickaxe(String name, Item item) {
- return ItemRegisters.registerPickaxe(MODID, name, item);
+ private static Item registerPickaxe(Item item) {
+ return ItemRegisters.registerPickaxe(MODID, "squid", item);
}
- public static Item registerShovel(String name, Item item) {
- return ItemRegisters.registerShovel(MODID, name, item);
+ private static Item registerShovel(Item item) {
+ return ItemRegisters.registerShovel(MODID, "squid", item);
}
- public static Item registerSword(String name, Item item) {
- return ItemRegisters.registerSword(MODID, name, item);
+ private static Item registerSword(Item item) {
+ return ItemRegisters.registerSword(MODID, "squid", item);
}
- private static void registerAll(io.github.squid233.squidcraft.api.item.Item... items) {
+ private void registerAll(
+ io.github.squid233.squidcraft.api.item.Item... items) {
ItemRegisters.registerAll(MODID, items);
}
}
diff --git a/src/main/java/io/github/squid233/squidcraft/world/biome/ChaosSquidBiome.java b/src/main/java/io/github/squid233/squidcraft/world/biome/ChaosSquidBiome.java
index 1ed88ad..9fa8c58 100644
--- a/src/main/java/io/github/squid233/squidcraft/world/biome/ChaosSquidBiome.java
+++ b/src/main/java/io/github/squid233/squidcraft/world/biome/ChaosSquidBiome.java
@@ -1,11 +1,8 @@
package io.github.squid233.squidcraft.world.biome;
import com.google.common.collect.ImmutableList;
-import io.github.squid233.squidcraft.util.ModBiomes;
-import io.github.squid233.squidcraft.util.ModEntities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnGroup;
import net.minecraft.sound.BiomeMoodSound;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
@@ -27,7 +24,7 @@
public class ChaosSquidBiome extends Biome {
public ChaosSquidBiome() {
- super((new Biome.Settings()).configureSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.GRASS_CONFIG).precipitation(Biome.Precipitation.RAIN).category(Category.OCEAN).depth(0.125F).scale(0.05F).temperature(0.8F).downfall(0.4F).effects((new BiomeEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).moodSound(BiomeMoodSound.CAVE).build()).parent(ModBiomes.SQUID_BIOME.getName().asString()).noises(ImmutableList.of(new Biome.MixedNoisePoint(0.0F, 0.0F, 0.0F, 0.0F, 1.0F))));
+ super((new Biome.Settings()).configureSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.GRASS_CONFIG).precipitation(Biome.Precipitation.RAIN).category(Category.OCEAN).depth(0.125F).scale(0.05F).temperature(0.8F).downfall(0.4F).effects((new BiomeEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).moodSound(BiomeMoodSound.CAVE).build()).parent(null).noises(ImmutableList.of(new Biome.MixedNoisePoint(0.0F, 0.0F, 0.0F, 0.0F, 1.0F))));
this.addStructureFeature(MINESHAFT.configure(new MineshaftFeatureConfig(0.004D, NORMAL)));
this.addStructureFeature(SHIPWRECK.configure(new ShipwreckFeatureConfig(false)));
adds(this);
@@ -35,7 +32,6 @@ public ChaosSquidBiome() {
spawn(SQUID, 96, 4, 6);
spawn(COD, 10, 3, 6);
spawn(DOLPHIN, 2, 1, 2);
- this.addSpawn(SpawnGroup.CREATURE, new SpawnEntry(ModEntities.COOKIE_CREEPER, 1, 1, 2));
}
diff --git a/src/main/java/io/github/squid233/squidcraft/world/biome/SquidBiome.java b/src/main/java/io/github/squid233/squidcraft/world/biome/SquidBiome.java
index bb3814b..a6b7388 100644
--- a/src/main/java/io/github/squid233/squidcraft/world/biome/SquidBiome.java
+++ b/src/main/java/io/github/squid233/squidcraft/world/biome/SquidBiome.java
@@ -34,7 +34,6 @@ public SquidBiome() {
spawn(SQUID, 96, 4, 6);
spawn(COD, 10, 3, 6);
spawn(DOLPHIN, 2, 1, 2);
- this.addSpawn(SpawnGroup.CREATURE, new SpawnEntry(ModEntities.COOKIE_CREEPER, 1, 1, 2));
}
diff --git a/src/main/java/io/github/squid233/yummyfood/YummyFood.java b/src/main/java/io/github/squid233/yummyfood/YummyFood.java
index a18d29e..3257b6d 100644
--- a/src/main/java/io/github/squid233/yummyfood/YummyFood.java
+++ b/src/main/java/io/github/squid233/yummyfood/YummyFood.java
@@ -2,34 +2,15 @@
import io.github.squid233.squidcraft.SquidCraft;
import io.github.squid233.squidcraft.api.ItemRegisters;
+import io.github.squid233.squidcraft.api.item.ItemFood;
import io.github.squid233.yummyfood.item.ItemGroup;
import net.fabricmc.api.ModInitializer;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.item.FoodComponent;
import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.world.World;
-
-import java.time.LocalDateTime;
-import java.util.List;
public final class YummyFood implements ModInitializer {
- public static final Item PINEAPPLE = register("pineapple", new Item(new Item.Settings().group(ItemGroup.YUMMYFOOD).food(new FoodComponent.Builder().hunger(4).saturationModifier(0.4f).build())));
- public static final Item TOMATO = register("tomato", new Item(new Item.Settings().group(ItemGroup.YUMMYFOOD).food(new FoodComponent.Builder().hunger(2).saturationModifier(0.5f).build())) {
- @Override
- public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) {
- int currentEra, currentYear, currentMonth, currentDay;
- LocalDateTime time = LocalDateTime.now();
- currentEra = time.toLocalDate().getEra().getValue();
- currentYear = time.getYear();
- currentMonth = time.getMonthValue();
- currentDay = time.getDayOfMonth();
- tooltip.add(new TranslatableText(this.getTranslationKey() + ".tooltip", currentEra, currentYear, currentMonth, currentDay));
- }
- });
+ public static final Item PINEAPPLE = register("pineapple", new ItemFood(new Item.Settings().group(ItemGroup.YUMMYFOOD), 4, 0.4f));
+ public static final Item TOMATO = register("tomato", new ItemFood(new Item.Settings().group(ItemGroup.YUMMYFOOD), 2, 0.5f));
private static Item register(String name, Item item) {
return ItemRegisters.register(SquidCraft.MODID, name, item);
diff --git a/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_1.png
deleted file mode 100644
index ebcbbaa..0000000
Binary files a/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_1.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_2.png
deleted file mode 100644
index b8d47eb..0000000
Binary files a/src/main/resources/assets/minecraft/textures/models/armor/netherite_layer_2.png and /dev/null differ
diff --git a/src/main/resources/assets/squidcraft/lang/en_us.json b/src/main/resources/assets/squidcraft/lang/en_us.json
index 22cdd3c..8bc56f5 100644
--- a/src/main/resources/assets/squidcraft/lang/en_us.json
+++ b/src/main/resources/assets/squidcraft/lang/en_us.json
@@ -13,7 +13,8 @@
"item.squidcraft.squid_shovel": "Squid Shovel",
"item.squidcraft.squid_sword": "Squid Sword",
- "item.squidcraft.cookie_creeper_spawn_egg":"Spawn Cookie Creeper",
+ "item.squidcraft.cookie_creeper_spawn_egg":"Cookie Creeper Spawn Egg",
+ "item.squidcraft.cube_spawn_egg":"Cube Spawn Egg",
"item.squidcraft.your_item": "Your Item",
"item.squidcraft.your_item_2": "Your Item 2",
@@ -51,12 +52,14 @@
"block.squidcraft.shredded_squid_crop": "Shredded Squid Crop",
+ "container.squidcraft.bigger_chest": "Bigger Chest",
"container.squidcraft.bigger_chest_block": "Bigger Chest",
"biome.squidcraft.squid_biome": "Squid Biome",
"biome.squidcraft.chaos_squid_biome": "Chaos Squid Biome",
- "entity_type.squidcraft.cookie_creeper": "Cookie Creeper",
+ "entity.squidcraft.cookie_creeper": "Cookie Creeper",
+ "entity.squidcraft.cube": "Cube",
"enchantment.squidcraft.frost": "Frost",
"enchantment.squidcraft.fire_boom": "Fire Boom",
@@ -84,5 +87,8 @@
"itemGroup.squidcraft.yummyfood": "YummyFood",
"item.squidcraft.pineapple": "Pineapple",
"item.squidcraft.tomato": "Tomato",
- "item.squidcraft.tomato.tooltip": "Now date: era of %n, year of %n, month of %n, day of %n"
+
+ "item.food.hunger": "Hunger: %d",
+ "item.food.saturation": "Saturation: %f",
+ "item.food.isWolfFood": "Can feed the wolf: %s"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/squidcraft/lang/zh_cn.json b/src/main/resources/assets/squidcraft/lang/zh_cn.json
index 8e67203..3ca00b2 100644
--- a/src/main/resources/assets/squidcraft/lang/zh_cn.json
+++ b/src/main/resources/assets/squidcraft/lang/zh_cn.json
@@ -13,7 +13,8 @@
"item.squidcraft.squid_shovel": "鱿鱼铲",
"item.squidcraft.squid_sword": "鱿鱼剑",
- "item.squidcraft.cookie_creeper_spawn_egg":"生成曲奇苦力怕",
+ "item.squidcraft.cookie_creeper_spawn_egg":"曲奇苦力怕刷怪蛋",
+ "item.squidcraft.cube_spawn_egg":"立方体刷怪蛋",
"item.squidcraft.your_item": "你的物品",
"item.squidcraft.your_item_2": "你的物品2",
@@ -43,7 +44,7 @@
"block.squidcraft.four_squid_block": "四个鱿鱼块",
"block.squidcraft.eight_squid_block": "八个鱿鱼块",
- "block.squidcraft.squid_side_block": "鱿鱼块台阶",
+ "block.squidcraft.squid_side_block": "边侧鱿鱼块",
"block.squidcraft.bigger_chest_block": "大箱子",
@@ -51,12 +52,14 @@
"block.squidcraft.shredded_squid_crop": "鱿鱼丝作物",
+ "container.squidcraft.bigger_chest": "大箱子",
"container.squidcraft.bigger_chest_block": "大箱子",
"biome.squidcraft.squid_biome": "鱿鱼群系",
"biome.squidcraft.chaos_squid_biome": "混乱鱿鱼群系",
- "entity_type.squidcraft.cookie_creeper": "曲奇苦力怕",
+ "entity.squidcraft.cookie_creeper": "曲奇苦力怕",
+ "entity.squidcraft.cube": "立方体",
"enchantment.squidcraft.frost": "霜冻",
"enchantment.squidcraft.fire_boom": "火焰爆炸",
@@ -66,8 +69,8 @@
"advancements.squidcraft.root.title": "鱿鱼工艺",
"advancements.squidcraft.root.desc": "要想开始，烤它！",
"advancements.squidcraft.first_cooking.title": "第一次烘烤",
- "advancements.squidcraft.first_cooking.desc": "现在，我们可以制作\"一堆熟鱿鱼丝\"了！",
- "advancements.squidcraft.a_pile.title": "一堆鱿鱼丝",
+ "advancements.squidcraft.first_cooking.desc": "现在，我们可以制作”一堆熟鱿鱼丝”了！",
+ "advancements.squidcraft.a_pile.title": "一堆熟鱿鱼丝",
"advancements.squidcraft.a_pile.desc": "如果你制作一块鱿鱼饼，你会发现更多惊喜的！",
"advancements.squidcraft.cookie.title": "鱿鱼饼",
"advancements.squidcraft.cookie.desc": "真香！你可以制作一个方块，用于吃甚至是建筑！",
@@ -84,5 +87,8 @@
"itemGroup.squidcraft.yummyfood": "美味的食物",
"item.squidcraft.pineapple": "菠萝",
"item.squidcraft.tomato": "番茄",
- "item.squidcraft.tomato.tooltip": "当前日期：%n世纪%n年%n月%n日"
+
+ "item.food.hunger": "饥饿值：%d",
+ "item.food.saturation": "饱和度：%f",
+ "item.food.isWolfFood": "能喂狼吗：%s"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/squidcraft/lang/zh_tw.json b/src/main/resources/assets/squidcraft/lang/zh_tw.json
new file mode 100644
index 0000000..9a3087f
--- /dev/null
+++ b/src/main/resources/assets/squidcraft/lang/zh_tw.json
@@ -0,0 +1,94 @@
+{
+ "item.squidcraft.shredded_squid": "魷魚絲",
+ "item.squidcraft.cooked_shredded_squid": "熟魷魚絲",
+ "item.squidcraft.a_pile_cooked_shredded_squid": "一堆熟魷魚絲",
+ "item.squidcraft.squid_cookie": "魷魚餅",
+ "item.squidcraft.squid_helmet": "魷魚頭盔",
+ "item.squidcraft.squid_chestplate": "魷魚胸甲",
+ "item.squidcraft.squid_leggings": "魷魚護腿",
+ "item.squidcraft.squid_boots": "魷魚靴子",
+ "item.squidcraft.squid_axe": "魷魚斧",
+ "item.squidcraft.squid_hoe": "魷魚鋤",
+ "item.squidcraft.squid_pickaxe": "魷魚鎬",
+ "item.squidcraft.squid_shovel": "魷魚鏟",
+ "item.squidcraft.squid_sword": "魷魚劍",
+
+ "item.squidcraft.cookie_creeper_spawn_egg":"曲奇苦力怕刷怪蛋",
+ "item.squidcraft.cube_spawn_egg":"立方體刷怪蛋",
+
+ "item.squidcraft.your_item": "你的物品",
+ "item.squidcraft.your_item_2": "你的物品2",
+
+ "item.squidcraft.milk_bucket": "牛奶桶",
+
+ "item.squidcraft.squid_cookie.tooltip": "合成一個魷魚塊！",
+
+ "itemGroup.squidcraft.squid_craft": "魷魚工藝",
+ "itemGroup.squidcraft.sc_combat_and_tools": "魷魚工藝 戰鬥用品與工具",
+
+ "block.squidcraft.squid_block": "魷魚塊",
+ "block.squidcraft.compress_squid_block": "壓縮魷魚塊",
+ "block.squidcraft.low_squid_block": "低級魷魚塊",
+ "block.squidcraft.low_compress_squid_block": "低級壓縮魷魚塊",
+ "block.squidcraft.medium_squid_block": "中級魷魚塊",
+ "block.squidcraft.medium_compress_squid_block": "中級壓縮魷魚塊",
+ "block.squidcraft.higher_squid_block": "高級魷魚塊",
+ "block.squidcraft.higher_compress_squid_block": "高級壓縮魷魚塊",
+ "block.squidcraft.super_squid_block": "超級魷魚塊",
+ "block.squidcraft.super_compress_squid_block": "超級壓縮魷魚塊",
+ "block.squidcraft.ultimate_squid_block": "终极魷魚塊",
+ "block.squidcraft.ultimate_compress_squid_block": "终极壓縮魷魚塊",
+
+ "block.squidcraft.one_squid_block": "一個魷魚塊",
+ "block.squidcraft.two_squid_block": "两個魷魚塊",
+ "block.squidcraft.four_squid_block": "四個魷魚塊",
+ "block.squidcraft.eight_squid_block": "八個魷魚塊",
+
+ "block.squidcraft.squid_side_block": "邊側魷魚塊",
+
+ "block.squidcraft.bigger_chest_block": "大箱子",
+
+ "block.squidcraft.soul_jack_o_lantern": "靈魂南瓜燈",
+
+ "block.squidcraft.shredded_squid_crop": "魷魚絲作物",
+
+ "container.squidcraft.bigger_chest": "大箱子",
+ "container.squidcraft.bigger_chest_block": "大箱子",
+
+ "biome.squidcraft.squid_biome": "魷魚群係",
+ "biome.squidcraft.chaos_squid_biome": "混亂魷魚群係",
+
+ "entity.squidcraft.cookie_creeper": "曲奇苦力怕",
+ "entity.squidcraft.cube": "立方體",
+
+ "enchantment.squidcraft.frost": "霜凍",
+ "enchantment.squidcraft.fire_boom": "火焰爆炸",
+ "enchantment.squidcraft.insane": "瘋狂附魔",
+ "enchantment.squidcraft.electric_power": "電力能源",
+
+ "advancements.squidcraft.root.title": "魷魚工藝",
+ "advancements.squidcraft.root.desc": "要想開始，烤它！",
+ "advancements.squidcraft.first_cooking.title": "第一次烘烤",
+ "advancements.squidcraft.first_cooking.desc": "現在，我們可以製作“一堆熟魷魚絲”了！",
+ "advancements.squidcraft.a_pile.title": "一堆熟魷魚絲",
+ "advancements.squidcraft.a_pile.desc": "如果你製作一塊魷魚餅，你會發現更多驚喜的！",
+ "advancements.squidcraft.cookie.title": "魷魚餅",
+ "advancements.squidcraft.cookie.desc": "真香！你可以製作一個方塊，用於吃甚至是建築！",
+
+ "fluid.squidcraft.milk": "牛奶",
+ "fluid.squidcraft.flowing_milk": "流動的牛奶",
+
+ "key.squidcraft.useless_key": "沒用的按鍵",
+
+ "authors.squidcraft.back": "返回",
+ "squidcraft.button.text": "魷魚工藝",
+ "authors.squidcraft.info": "作者名單：",
+
+ "itemGroup.squidcraft.yummyfood": "美味的食物",
+ "item.squidcraft.pineapple": "菠蘿",
+ "item.squidcraft.tomato": "番茄",
+
+ "item.food.hunger": "飢餓值：%d",
+ "item.food.saturation": "飽和度：%f",
+ "item.food.isWolfFood": "能餵狼嗎：%s"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/squidcraft/models/item/cube_spawn_egg.json b/src/main/resources/assets/squidcraft/models/item/cube_spawn_egg.json
new file mode 100644
index 0000000..7a2c6da
--- /dev/null
+++ b/src/main/resources/assets/squidcraft/models/item/cube_spawn_egg.json
@@ -0,0 +1,3 @@
+{
+ "parent": "item/template_spawn_egg"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal.png b/src/main/resources/assets/squidcraft/textures/entity/bigger_chest.png
similarity index 100%
rename from src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal.png
rename to src/main/resources/assets/squidcraft/textures/entity/bigger_chest.png
diff --git a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_left.png b/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_left.png
deleted file mode 100644
index d1d7f2c..0000000
Binary files a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_left.png and /dev/null differ
diff --git a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_right.png b/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_right.png
deleted file mode 100644
index 804aedf..0000000
Binary files a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest/normal_right.png and /dev/null differ
diff --git a/src/main/resources/assets/squidcraft/textures/entity/bigger_chest_block.png b/src/main/resources/assets/squidcraft/textures/entity/bigger_chest_block.png
new file mode 100644
index 0000000..ac361a5
Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/entity/bigger_chest_block.png differ
diff --git a/src/main/resources/assets/squidcraft/textures/entity/cookie_creeper/creeper.png b/src/main/resources/assets/squidcraft/textures/entity/cookie_creeper.png
similarity index 100%
rename from src/main/resources/assets/squidcraft/textures/entity/cookie_creeper/creeper.png
rename to src/main/resources/assets/squidcraft/textures/entity/cookie_creeper.png
diff --git a/src/main/resources/assets/squidcraft/textures/entity/cube.png b/src/main/resources/assets/squidcraft/textures/entity/cube.png
new file mode 100644
index 0000000..5ca5e99
Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/entity/cube.png differ
diff --git a/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato.png b/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato.png
index bd5466e..47c5864 100644
Binary files a/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato.png and b/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato.png differ
diff --git a/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_2.json b/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_campfire.json
similarity index 100%
rename from src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_2.json
rename to src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_campfire.json
diff --git a/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_1.json b/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_smoking.json
similarity index 100%
rename from src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_1.json
rename to src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_smoking.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0f101dc..5920127 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -35,8 +35,8 @@
"depends": {
"fabricloader": ">=0.8.0",
- "fabric": "*",
- "minecraft": "1.16.x"
+ "fabric": ">=0.14.0",
+ "minecraft": "1.16.1"
},
"suggests": {
"flamingo": "*"