diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 4d2828b..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 57% rename from .gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index e7d7af9..d846268 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.0+build.371-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..05cbb42 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..2df7949 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..e9fbe5e Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-0.14.1+build.372-1.16@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 67% rename from .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index d27118f..014883e 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2.jar similarity index 53% rename from .gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2.jar index 2cb70a6..e7bcb49 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..0bb95b6 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..770444e Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-api-base-0.1.3+12a8474c02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.7-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.19-v2-sources.jar similarity index 77% rename from .gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 78e409f..b5c699c 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..38f7922 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.19-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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..2fa885a 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..0a83430 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.20-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.7-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.7-v2.jar deleted file mode 100644 index 31d5b25..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-biomes-v1-0.2.7+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 59% rename from .gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 5bdf7b5..4b75004 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..6bed8ce Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..69b3183 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..d25d97c Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index c44a3dd..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-blockrenderlayer-v1-1.1.4+c6a8ea8902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 56% rename from .gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index a7230fc..fe0e4dd 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..6ac7920 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..d2e9c27 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..6843b2f 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index 6063a84..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-command-api-v1-1.0.8+5ce5339802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-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.19-v2-sources.jar new file mode 100644 index 0000000..64e543b 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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..941c00a 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..fe91652 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..4c6a951 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.20-v2.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.7-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.7-v2-sources.jar deleted file mode 100644 index 029e119..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.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.7-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.7-v2.jar deleted file mode 100644 index db06612..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-commands-v0-0.2.0+52d3083602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 56% rename from .gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 96db59a..6ec4c9b 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..64dbd3d Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..847c05a Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..234574a Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index 6985d58..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-containers-v0-0.1.8+045df74f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 59% rename from .gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index f29a189..176dbd4 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..ed53cb6 Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..819bd3e Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..fa462fc Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index e87b1b5..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-content-registries-v0-0.1.9+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 50% rename from .gradle/loom-cache/remapped_mods/fabric-crash-report-info-v1-0.1.2+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 06501c8..bf73067 100644 Binary files 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.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..db702a2 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..001a7bd 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..083e3da 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index c0e5be9..0000000 Binary files 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.7-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.7-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.19-v2-sources.jar similarity index 70% rename from .gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 6cd50ba..9896337 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..c43de14 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..869d2b3 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..37f60f6 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index e0465e1..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-dimensions-v1-1.0.0+a71b305302@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2-sources.jar new file mode 100644 index 0000000..0fcd1b8 Binary files /dev/null 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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..13f5c88 Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..7f4d149 Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..31a2ad1 Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2-sources.jar deleted file mode 100644 index 1f7ba12..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index 632286d..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-interaction-v0-0.3.3+7066030f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2-sources.jar new file mode 100644 index 0000000..24d8c2b Binary files /dev/null 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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..0fcec81 Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..410f0a8 Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..5f8722e Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2-sources.jar deleted file mode 100644 index f2d5989..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index 7ede45b..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-events-lifecycle-v0-0.2.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 51% rename from .gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index c5760e1..87da10a 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar 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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..72f152b 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.19-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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..be731fa 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..612e1d0 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.20-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.7-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.7-v2.jar deleted file mode 100644 index 646f4cb..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-api-v1-1.0.0+16acbe5b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 58% rename from .gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 68a382a..39cb3a0 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..9af640f Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..d059f24 Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..e596aca Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index 588759b..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-item-groups-v0-0.2.0+438f963602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 57% rename from .gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 6ab7963..a8ae465 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..79f7bff Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..c4cd022 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..cb1f16c Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 4fa93cb..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-key-binding-api-v1-1.0.0+e16a977402@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 57% rename from .gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 08ae81f..8d4bb9b 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..59aefe6 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..8fad601 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..0e23880 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index cdda0a1..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-keybindings-v0-0.2.0+3fa9f7c502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar new file mode 100644 index 0000000..59b49cd Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..59fc09c Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..d5f6dce Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..1c6b468 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar deleted file mode 100644 index 6c1bcd0..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index fdc22d4..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-lifecycle-events-v1-1.0.0+b0993bc102@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar new file mode 100644 index 0000000..575f917 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..4e16f0f Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar similarity index 61% rename from .gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar index 8f9ad71..638028a 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar similarity index 64% rename from .gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar rename to .gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar index 61f6577..37ea841 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.8+build.202@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and b/.gradle/loom-cache/remapped_mods/fabric-loader-0.8.9+build.203@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 67% rename from .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 4846fdb..def88cf 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..409cd84 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..8d38429 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..9e2bef7 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 24805b0..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-loot-tables-v1-0.1.10+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 54% rename from .gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 0592787..c7e8b43 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..19e5060 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..a171597 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..968cc97 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index b9d5b07..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-mining-levels-v0-0.1.2+b764ce9902@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2-sources.jar new file mode 100644 index 0000000..def07fc Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..23539d9 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar similarity index 67% rename from .gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar index 8a72a0a..15bed9b 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..c6a7fda Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index f31108d..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-models-v0-0.1.0+dfdb52d602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 62% rename from .gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 1cc027a..0a2fb45 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..3f0e573 Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..f3cb2dc Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..aaa3d45 Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index b463ecc..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-blockentity-v0-0.2.5+b50ffc7b02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2-sources.jar new file mode 100644 index 0000000..f8069e8 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..ed9f008 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar similarity index 75% rename from .gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar index 3ff99c5..6a88c69 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..8c963d3 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index b4ae34f..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-networking-v0-0.1.10+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 71% rename from .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 2d00e8b..371b3de 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..3ef4682 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..0aa7e60 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..a187fe2 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 05712f0..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builder-api-v1-1.5.5+e00ecb5f02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar new file mode 100644 index 0000000..60a3323 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..048492a Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar similarity index 60% rename from .gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar index 81c0c26..c2e5a6a 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..a7f26c7 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index b1909fb..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-object-builders-v0-0.6.0+da175ad602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 62% rename from .gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index cc01638..dcf3aea 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..a51d1d8 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.19-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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..5eba4a9 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..9e7627e 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.20-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.7-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.7-v2.jar deleted file mode 100644 index 1fc7ca9..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-particles-v1-0.2.1+0a6f2a7002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-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.19-v2-sources.jar similarity index 67% rename from .gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 804f86b..978a1f6 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar 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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..58185e6 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..bf52c4b 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..0844852 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index 6c28934..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-registry-sync-v0-0.3.8+7dba2d6c02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 80% rename from .gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 16bd181..c6b3b4d 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..f707fe6 Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..213f20e Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..5b73d6e Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index efc5bf3..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-api-v1-0.2.13+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 78% rename from .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 4fd3ab4..4362b88 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..d5e5ad5 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..217735f Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..81896dd Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 7c21374..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-indigo-0.3.2+4d66bed502@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 57% rename from .gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 4df2e91..fb2f746 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..501f1fb Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..e1e7908 Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..7d0e77b Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index fc28f75..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-renderer-registries-v1-2.0.1+5a0f9a6002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 63% rename from .gradle/loom-cache/remapped_mods/fabric-rendering-data-attachment-v1-0.1.3+b7f9825d02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 771b8f5..4d8108e 100644 Binary files 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.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..f36b37d 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..c0413b0 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..1de3e9d 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index 9d0e450..0000000 Binary files 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.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2-sources.jar new file mode 100644 index 0000000..91b910e Binary files /dev/null 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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..f3a0c0c Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar similarity index 59% rename from .gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar index 65b13c3..7e2e651 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..50a969f Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index c312362..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-fluids-v1-0.1.8+b7084faa02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.19-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.19-v2-sources.jar new file mode 100644 index 0000000..3a17aca 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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..6cc8d53 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.19-v2.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.7-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.20-v2-sources.jar similarity index 58% rename from .gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-v2-sources.jar index 6742e4d..3a23f35 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..08748f8 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index 3ff0879..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v0-1.1.0+5341049002@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 68% rename from .gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index e48d126..cd34eb0 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..7405312 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.19-v2.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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..039c699 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..ecbf99f 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.20-v2.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.7-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.7-v2.jar deleted file mode 100644 index 7e47e0b..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-rendering-v1-1.1.2+346247d702@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 7caa11f..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 64% rename from .gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 0f8f028..4ec0798 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.5+059ea86602@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..ccb00ec Binary files /dev/null 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.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..0d5e8ce Binary files /dev/null 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.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-resource-loader-v0-0.2.6+f41e209802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..91de4af Binary files /dev/null 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.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar similarity index 58% rename from .gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 7e0e024..bb7e349 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..9444741 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar new file mode 100644 index 0000000..634607f Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..2fafdc7 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 7dbc33f..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-screen-handler-api-v1-1.0.1+f362c86e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null 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.7-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.19-v2-sources.jar similarity index 62% rename from .gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar index 0a7cff6..700ca53 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar 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.19-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.19-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.19-v2.jar new file mode 100644 index 0000000..454c97b 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.19-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.20-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.20-v2-sources.jar new file mode 100644 index 0000000..69f70d8 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.20-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.20-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.20-v2.jar new file mode 100644 index 0000000..ea3bf22 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.20-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.7-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.7-v2.jar deleted file mode 100644 index 0a24486..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-tag-extensions-v0-0.2.7+a4c57d8e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar similarity index 60% rename from .gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar index 94b8242..c3080b9 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.19-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.19-v2.jar new file mode 100644 index 0000000..a699590 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2-sources.jar new file mode 100644 index 0000000..efd7e88 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-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.20-v2.jar new file mode 100644 index 0000000..3c60789 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-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.7-v2.jar deleted file mode 100644 index 90850f0..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-textures-v0-1.0.4+eae12eb802@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar new file mode 100644 index 0000000..cb92e5d Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar new file mode 100644 index 0000000..9363110 Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.19-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar similarity index 70% rename from .gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar rename to .gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar index ae0c01b..a43ba4c 100644 Binary files a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2-sources.jar and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2-sources.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar new file mode 100644 index 0000000..8cdbabe Binary files /dev/null and b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.20-v2.jar differ diff --git a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar b/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar deleted file mode 100644 index 6bc25b6..0000000 Binary files a/.gradle/loom-cache/remapped_mods/fabric-tool-attribute-api-v1-1.1.4+5794386e02@net.fabricmc.yarn.1_16_1.1.16.1+build.7-v2.jar and /dev/null differ diff --git a/build/libs/SquidCraft-1.16-0.2.0-dev.jar b/build/libs/SquidCraft-1.16-0.2.0-dev.jar new file mode 100644 index 0000000..dd2780a Binary files /dev/null and b/build/libs/SquidCraft-1.16-0.2.0-dev.jar differ diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..525a95e --- /dev/null +++ b/changelog.txt @@ -0,0 +1,5 @@ +2020-7-7 ~ 7-8 1.16-0.2.0 + +1. delete 18 useless texture +2. fix shredded squid crop texture +3. delete some useless i18n \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index eaf75e2..9b5b95e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx1G -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1 # Fabric Properties # check these on https://fabricmc.net/use minecraft_version=1.16.1 - yarn_mappings=1.16.1+build.7 - loader_version=0.8.8+build.202 + yarn_mappings=1.16.1+build.20 + loader_version=0.8.9+build.203 # Mod Properties - mod_version = 1.16-0.1.0 + mod_version = 1.16-0.2.0 maven_group = io.github.squid233.squidcraft archives_base_name = SquidCraft # 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.14.0+build.371-1.16 + fabric_version=0.14.1+build.372-1.16 diff --git a/src/main/java/io/github/squid233/api/block/Block.java b/src/main/java/io/github/squid233/api/block/Block.java index 9b72bf5..ed0e3ea 100644 --- a/src/main/java/io/github/squid233/api/block/Block.java +++ b/src/main/java/io/github/squid233/api/block/Block.java @@ -1,11 +1,17 @@ package io.github.squid233.api.block; +/*This API is unused. public abstract class Block extends net.minecraft.block.Block { public Block(Settings settings) { super(settings); } + /** + * The registers will use the registry name. + * @return a string. + / public abstract String getRegistryName(); } +*/ \ No newline at end of file diff --git a/src/main/java/io/github/squid233/api/item/Item.java b/src/main/java/io/github/squid233/api/item/Item.java index dfd5660..4706ae6 100644 --- a/src/main/java/io/github/squid233/api/item/Item.java +++ b/src/main/java/io/github/squid233/api/item/Item.java @@ -34,6 +34,10 @@ public Item(Settings settings) { super(settings); } + /** + * The registers will use the registry name. + * @return a string. + */ public abstract String getRegistryName(); } diff --git a/src/main/java/io/github/squid233/api/util/Loggers.java b/src/main/java/io/github/squid233/api/util/Loggers.java index 05d327b..1ed633b 100644 --- a/src/main/java/io/github/squid233/api/util/Loggers.java +++ b/src/main/java/io/github/squid233/api/util/Loggers.java @@ -1,9 +1,13 @@ package io.github.squid233.api.util; +import io.github.squid233.squidcraft.config.CreateConfig; import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.NotNull; public class Loggers { + /** Default false */ + public static boolean enableRegisterLog = Boolean.parseBoolean(CreateConfig.PROPERTIES.getProperty("enableRegisterLog")); + /** * @param senderName logger name * @param message logger info diff --git a/src/main/java/io/github/squid233/api/util/MinecraftMod.java b/src/main/java/io/github/squid233/api/util/MinecraftMod.java index e79256b..820d4ed 100644 --- a/src/main/java/io/github/squid233/api/util/MinecraftMod.java +++ b/src/main/java/io/github/squid233/api/util/MinecraftMod.java @@ -4,6 +4,10 @@ public interface MinecraftMod extends ModInitializer { + /** + * {@link Loggers} will use this method. + * @return the mod name. + */ String getModName(); } diff --git a/src/main/java/io/github/squid233/squidcraft/SquidCraft.java b/src/main/java/io/github/squid233/squidcraft/SquidCraft.java index 51fe5e0..7835c53 100644 --- a/src/main/java/io/github/squid233/squidcraft/SquidCraft.java +++ b/src/main/java/io/github/squid233/squidcraft/SquidCraft.java @@ -16,7 +16,8 @@ public final class SquidCraft implements ModInitializer, MinecraftMod { @Override public void onInitialize() { String s = "SquidCraft register all"; - CreateConfig.config(); + CreateConfig.create(); + //noinspection InstantiationOfUtilityClass new ItemRegister(); log(s, "item register success"); new BlockRegister(); 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 24f0b2d..73af188 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.api.util.Loggers; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -25,7 +26,17 @@ public class BlockRegisters { 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)); - log(s, "register " + modid + ":" + name + " block success!"); + if (Loggers.enableRegisterLog) { + log(s, "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!"); + } return Registry.register(Registry.BLOCK, new Identifier(modid, name), block); } } diff --git a/src/main/java/io/github/squid233/squidcraft/api/FluidRegister.java b/src/main/java/io/github/squid233/squidcraft/api/FluidRegister.java index 2a5a6d6..e307eb0 100644 --- a/src/main/java/io/github/squid233/squidcraft/api/FluidRegister.java +++ b/src/main/java/io/github/squid233/squidcraft/api/FluidRegister.java @@ -16,14 +16,14 @@ private FluidRegister() { /** * This method can register still fluid and flowing fluid. * @param modid Mod identifier - * @param fluidID Still fluid's register name is fluidID. Flowing fluid's register name is flowing_ + fluidID. + * @param fluidName Still fluid's register name is fluidName. Flowing fluid's register name is flowing_ + fluidName. * @param stillFluid The still fluid. * @param flowingFluid The flowing fluid. * @param fluidBlock The fluid block. */ - public static void registerFluid(String modid, String fluidID, FlowableFluid stillFluid, FlowableFluid flowingFluid, Block fluidBlock) { - Registry.register(Registry.FLUID, new Identifier(modid, fluidID), stillFluid); - Registry.register(Registry.FLUID, new Identifier(modid, "flowing_"+fluidID), flowingFluid); - Registry.register(Registry.BLOCK, new Identifier(modid, fluidID), fluidBlock); + public static void registerFluid(String modid, String fluidName, FlowableFluid stillFluid, FlowableFluid flowingFluid, Block fluidBlock) { + Registry.register(Registry.FLUID, new Identifier(modid, fluidName), stillFluid); + Registry.register(Registry.FLUID, new Identifier(modid, "flowing_"+ fluidName), flowingFluid); + Registry.register(Registry.BLOCK, new Identifier(modid, fluidName), fluidBlock); } } 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 a0877e8..095acff 100644 --- a/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java +++ b/src/main/java/io/github/squid233/squidcraft/api/ItemRegisters.java @@ -1,5 +1,6 @@ package io.github.squid233.squidcraft.api; +import io.github.squid233.api.util.Loggers; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -22,7 +23,9 @@ public class ItemRegisters { * @return Register item. */ public static Item register(String modid, String name, Item item) { - log("Items Register", "register " + modid + ":" + name + " success!"); + if (Loggers.enableRegisterLog) { + log("Items Register", "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/SoundsRegister.java b/src/main/java/io/github/squid233/squidcraft/api/SoundsRegister.java deleted file mode 100644 index a4c693f..0000000 --- a/src/main/java/io/github/squid233/squidcraft/api/SoundsRegister.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.squid233.squidcraft.api; - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import static io.github.squid233.api.util.Loggers.log; - -public class SoundsRegister { - public static void registerSound(Identifier soundID, SoundEvent sound) { - Registry.register(Registry.SOUND_EVENT, soundID, sound); - log("register sounds", "register " + soundID + " success"); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/armor/ArmorMaterials.java b/src/main/java/io/github/squid233/squidcraft/armor/ArmorMaterials.java index 38a8961..edc0d1e 100644 --- a/src/main/java/io/github/squid233/squidcraft/armor/ArmorMaterials.java +++ b/src/main/java/io/github/squid233/squidcraft/armor/ArmorMaterials.java @@ -17,7 +17,7 @@ public enum ArmorMaterials implements ArmorMaterial { return Ingredient.ofItems(ItemRegister.SQUID_COOKIE); }); - private static final int[] baseDurability = {13, 15, 16, 11}; + private static final int[] BASE_DURABILITY = {13, 15, 16, 11}; private final String name; private final int durabilityMultiplier; private final int[] protectionAmounts; @@ -40,7 +40,7 @@ public enum ArmorMaterials implements ArmorMaterial { @Override public int getDurability(EquipmentSlot slot) { - return baseDurability[slot.getEntitySlotId()] * this.durabilityMultiplier; + return BASE_DURABILITY[slot.getEntitySlotId()] * this.durabilityMultiplier; } @Override 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 de90ce7..43e3a4c 100644 --- a/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java +++ b/src/main/java/io/github/squid233/squidcraft/block/BiggerChestBlock.java @@ -46,6 +46,8 @@ public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity p } } + + @SuppressWarnings("deprecation") @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { diff --git a/src/main/java/io/github/squid233/squidcraft/block/CompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/CompressSquidBlock.java deleted file mode 100644 index 609774c..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/CompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class CompressSquidBlock extends Block { - public CompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/HigherCompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/HigherCompressSquidBlock.java deleted file mode 100644 index a96df33..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/HigherCompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class HigherCompressSquidBlock extends Block { - public HigherCompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/HigherSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/HigherSquidBlock.java deleted file mode 100644 index 0194ed8..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/HigherSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class HigherSquidBlock extends Block { - public HigherSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/LowCompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/LowCompressSquidBlock.java deleted file mode 100644 index 97339cb..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/LowCompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class LowCompressSquidBlock extends Block { - public LowCompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/LowSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/LowSquidBlock.java deleted file mode 100644 index 368b5f8..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/LowSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class LowSquidBlock extends Block { - public LowSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/MediumCompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/MediumCompressSquidBlock.java deleted file mode 100644 index c407bf9..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/MediumCompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class MediumCompressSquidBlock extends Block { - public MediumCompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/MediumSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/MediumSquidBlock.java deleted file mode 100644 index ef07fbc..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/MediumSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class MediumSquidBlock extends Block { - public MediumSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/SoulJackOLantern.java b/src/main/java/io/github/squid233/squidcraft/block/SoulJackOLantern.java deleted file mode 100644 index 8109b27..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/SoulJackOLantern.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.CarvedPumpkinBlock; - -public class SoulJackOLantern extends CarvedPumpkinBlock { - public SoulJackOLantern(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/SquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/SquidBlock.java deleted file mode 100644 index ddb9124..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/SquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class SquidBlock extends Block { - public SquidBlock(Settings settings) { - super(settings); - } -} \ No newline at end of file diff --git a/src/main/java/io/github/squid233/squidcraft/block/SquidSideBlock.java b/src/main/java/io/github/squid233/squidcraft/block/SquidSideBlock.java index a364d5c..1bf2487 100644 --- a/src/main/java/io/github/squid233/squidcraft/block/SquidSideBlock.java +++ b/src/main/java/io/github/squid233/squidcraft/block/SquidSideBlock.java @@ -47,6 +47,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos } } + @Override public BlockState getPlacementState(ItemPlacementContext ctx) { return this.getDefaultState().with(FACING, ctx.getPlayerFacing()); } diff --git a/src/main/java/io/github/squid233/squidcraft/block/SuperCompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/SuperCompressSquidBlock.java deleted file mode 100644 index 4379130..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/SuperCompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class SuperCompressSquidBlock extends Block { - public SuperCompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/SuperSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/SuperSquidBlock.java deleted file mode 100644 index d2b9bea..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/SuperSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class SuperSquidBlock extends Block { - public SuperSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/UltimateCompressSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/UltimateCompressSquidBlock.java deleted file mode 100644 index f1a35fe..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/UltimateCompressSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class UltimateCompressSquidBlock extends Block { - public UltimateCompressSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/UltimateSquidBlock.java b/src/main/java/io/github/squid233/squidcraft/block/UltimateSquidBlock.java deleted file mode 100644 index aeecce1..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/UltimateSquidBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.squidcraft.block; - -import net.minecraft.block.Block; - -public class UltimateSquidBlock extends Block { - public UltimateSquidBlock(Settings settings) { - super(settings); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/msb/Eight.java b/src/main/java/io/github/squid233/squidcraft/block/msb/Eight.java deleted file mode 100644 index 7c0edd8..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/msb/Eight.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.block.msb; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; - -public class Eight extends Block { - public Eight() { - super(FabricBlockSettings.of(Material.SOIL).strength(3.0f, 0.75f)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/msb/Four.java b/src/main/java/io/github/squid233/squidcraft/block/msb/Four.java deleted file mode 100644 index d252fb9..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/msb/Four.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.block.msb; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; - -public class Four extends Block { - public Four() { - super(FabricBlockSettings.of(Material.SOIL).strength(2.5f, 0.7f)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/msb/One.java b/src/main/java/io/github/squid233/squidcraft/block/msb/One.java deleted file mode 100644 index e233275..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/msb/One.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.block.msb; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; - -public class One extends Block { - public One() { - super(FabricBlockSettings.of(Material.SOIL).strength(1.5f, 0.6f)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/block/msb/Two.java b/src/main/java/io/github/squid233/squidcraft/block/msb/Two.java deleted file mode 100644 index 6f720e9..0000000 --- a/src/main/java/io/github/squid233/squidcraft/block/msb/Two.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.block.msb; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; - -public class Two extends Block { - public Two() { - super(FabricBlockSettings.of(Material.SOIL).strength(2.0f, 0.65f)); - } -} 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 baa38b9..8e0a501 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 @@ -14,7 +14,8 @@ public class BiggerChestBlockEntity extends LootableContainerBlockEntity { private DefaultedList inventory; - private static final int INVENTORY_SIZE = 54; // 9 * 6 = 54 + // 9 * 6 = 54 + private static final int INVENTORY_SIZE = 54; public BiggerChestBlockEntity() { super(BlockRegister.BIGGER_CHEST_ENTITY_TYPE); diff --git a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java b/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java index 187da8c..9fc101f 100644 --- a/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java +++ b/src/main/java/io/github/squid233/squidcraft/block/tile/BiggerChestScreenHandler.java @@ -13,7 +13,7 @@ public class BiggerChestScreenHandler extends ScreenHandler { 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); // Since we didn't create a ContainerType, we will place null here. + super(BlockRegister.BIGGER_CHEST_SCREEN_HANDLER_TYPE, syncId); this.inventory = playerInventory; checkSize(inventory, INVENTORY_SIZE); inventory.onOpen(playerInventory.player); @@ -48,7 +48,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/client/SquidCraftClient.java b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java index 5f8fe8b..c080763 100644 --- a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java +++ b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftClient.java @@ -5,11 +5,13 @@ import io.github.squid233.squidcraft.util.ModEntities; import io.github.squid233.squidcraft.util.registers.BlockRegister; import net.fabricmc.api.ClientModInitializer; +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.impl.client.keybinding.KeyBindingRegistryImpl; +import net.minecraft.client.render.RenderLayer; import static io.github.squid233.squidcraft.util.KeyBindings.KEY_BINDING_0; @@ -20,11 +22,15 @@ public void onInitializeClient() { KeyBindingRegistryImpl.addCategory("SquidCraft"); KeyBindingHelper.registerKeyBinding(KEY_BINDING_0); ClientTickEvents.END_CLIENT_TICK.register(e -> { - if (KEY_BINDING_0.isPressed()) System.out.println("was pressed!"); + if (KEY_BINDING_0.isPressed()) { + System.out.println("was pressed!"); + } }); ScreenRegistry.register(BlockRegister.BIGGER_CHEST_SCREEN_HANDLER_TYPE, BiggerChestScreen::new); EntityRendererRegistry.INSTANCE.register(ModEntities.COOKIE_CREEPER, (entityRenderDispatcher, context) -> new CookieCreeperRenderer(entityRenderDispatcher)); + + 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 a1f951b..3bb88f7 100644 --- a/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java +++ b/src/main/java/io/github/squid233/squidcraft/client/SquidCraftFluidRenderingClient.java @@ -34,8 +34,7 @@ public void onInitializeClient() { } - public static void setupFluidRendering(final Fluid still, final Fluid flowing, final Identifier textureFluidId, final int color) - { + public static void setupFluidRendering(final Fluid still, final Fluid flowing, final Identifier textureFluidId, final int color) { final Identifier stillSpriteId = new Identifier(textureFluidId.getNamespace(), "block/" + textureFluidId.getPath() + "_still"); final Identifier flowingSpriteId = new Identifier(textureFluidId.getNamespace(), "block/" + textureFluidId.getPath() + "_flow"); @@ -49,13 +48,11 @@ public static void setupFluidRendering(final Fluid still, final Fluid flowing, f final Identifier fluidId = Registry.FLUID.getId(still); final Identifier listenerId = new Identifier(fluidId.getNamespace(), fluidId.getPath() + "_reload_listener"); - final Sprite[] fluidSprites = { null, null }; + final Sprite[] fluidSprites = {null, null}; - ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() - { + ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() { @Override - public Identifier getFabricId() - { + public Identifier getFabricId() { return listenerId; } @@ -63,8 +60,7 @@ public Identifier getFabricId() * Get the sprites from the block atlas when resources are reloaded */ @Override - public void apply(ResourceManager resourceManager) - { + public void apply(ResourceManager resourceManager) { final Function atlas = MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); fluidSprites[0] = atlas.apply(stillSpriteId); fluidSprites[1] = atlas.apply(flowingSpriteId); @@ -72,17 +68,14 @@ public void apply(ResourceManager resourceManager) }); // The FluidRenderer gets the sprites and color from a FluidRenderHandler during rendering - final FluidRenderHandler renderHandler = new FluidRenderHandler() - { + final FluidRenderHandler renderHandler = new FluidRenderHandler() { @Override - public Sprite[] getFluidSprites(BlockRenderView view, BlockPos pos, FluidState state) - { + public Sprite[] getFluidSprites(BlockRenderView view, BlockPos pos, FluidState state) { return fluidSprites; } @Override - public int getFluidColor(BlockRenderView view, BlockPos pos, FluidState state) - { + public int getFluidColor(BlockRenderView view, BlockPos pos, FluidState state) { return color; } }; diff --git a/src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGUI.java b/src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGui.java similarity index 60% rename from src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGUI.java rename to src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGui.java index 0a8e37b..43074d0 100644 --- a/src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGUI.java +++ b/src/main/java/io/github/squid233/squidcraft/client/gui/AuthorsGui.java @@ -6,26 +6,34 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; -public class AuthorsGUI extends Screen { +public class AuthorsGui extends Screen { private final Screen screen; - public AuthorsGUI(Screen screen) { + public AuthorsGui(Screen screen) { super(new LiteralText("")); this.screen = screen; } + @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta) { renderBackground(matrixStack); tooltip("authors.squidcraft.info", this.width / 100, this.height / 9); tooltip("squid233", 21 * this.width / 100, this.height / 9); - tooltip("baka4n", 41 * this.width / 100, this.height / 9); + tooltip("baka4n", 41 * this.width / 100, this.height / 9); super.render(matrixStack, mouseX, mouseY, delta); } + @Override public void init() { super.init(); - MyButton(3 * this.width / 4, 8 * this.height / 9, "authors.squidcraft.back", (buttonWidget) -> this.screen.onClose()); + myButton(3 * this.width / 4, 8 * this.height / 9, "authors.squidcraft.back", (buttonWidget) -> this.screen.onClose()); + } + + private void myButton(int x, int y, String translationKey, ButtonWidget.PressAction button) { + this.addButton(new ButtonWidget(x, y, 100, 20, new TranslatableText(translationKey), button)); + } + + private void tooltip(String translationKey, int x, int y) { + renderTooltip(new MatrixStack(), new TranslatableText(translationKey), x, y); } - private void MyButton(int x, int y, String translationKey, ButtonWidget.PressAction button) { this.addButton(new ButtonWidget(x, y, 100, 20, new TranslatableText(translationKey), button)); } - private void tooltip(String translationKey, int x, int y) { renderTooltip(new MatrixStack(), new TranslatableText(translationKey), x, y); } } 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 8c5a747..f857a4c 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.SquidCraft; import io.github.squid233.squidcraft.block.tile.BiggerChestScreenHandler; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.util.math.MatrixStack; @@ -10,18 +9,20 @@ 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"); - private static final Identifier TEXTURE = new Identifier(SquidCraft.MODID, "textures/gui/container/bigger_chest.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); 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); } + @SuppressWarnings("deprecation") @Override protected void drawBackground(MatrixStack matrixStack, float delta, int mouseX, int mouseY) { @@ -33,8 +34,10 @@ protected void drawBackground(MatrixStack matrixStack, float delta, int mouseX, blit(i, j, 0, 0, this.backgroundWidth, 6 * 18 + 17); blit(i, j + 6 * 18 + 17, 0, 126, this.backgroundWidth, 96); } - @SuppressWarnings("all") + + @SuppressWarnings("InfiniteRecursion") public void font(String t, float x, float y, int c) { this.font(t, x, y, c); } - @SuppressWarnings("all") + + @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/config/CreateConfig.java b/src/main/java/io/github/squid233/squidcraft/config/CreateConfig.java index f7cea66..a2627aa 100644 --- a/src/main/java/io/github/squid233/squidcraft/config/CreateConfig.java +++ b/src/main/java/io/github/squid233/squidcraft/config/CreateConfig.java @@ -5,32 +5,44 @@ /** *@author baka4n *

对 properties 进行有序排列

- *

windows about s → \\ , linux about s → // , you can to linux server to running it.

+ *

windows about SEPARATOR → \\ , linux about SEPARATOR → // , you can to linux server to running it.

*/ public class CreateConfig { - public static final String s = File.separator + File.separator; - public static final MyProperties properties = new MyProperties(); - public static void config() { + public static final String SEPARATOR = File.separator + File.separator; + public static final MyProperties PROPERTIES = new MyProperties(); + public static void create() { File configs = new File("config"); - File squidcraft = new File("config" + s + "squidcraft"); - if (!configs.exists() && !configs.isDirectory()) configs.mkdir(); - if (!squidcraft.exists() && !squidcraft.isDirectory()) squidcraft.mkdir(); + File squidcraft = new File("config" + SEPARATOR + "squidcraft"); + if (!configs.exists() && !configs.isDirectory()) { + configs.mkdir(); + } + if (!squidcraft.exists() && !squidcraft.isDirectory()) { + squidcraft.mkdir(); + } try { - properties.load(new BufferedInputStream(new FileInputStream("config" + s + "squidcraft" + s + "config.properties"))); + PROPERTIES.load(new BufferedInputStream(new FileInputStream("config" + SEPARATOR + "squidcraft" + SEPARATOR + "config.properties"))); } catch (FileNotFoundException e) { - putin("hideMainScreenButton", "false", "squidBlockSpawnSize", "3"); - putin("squidBlockPerChunkSpawnCount", "8", "squidBlockSpawnMinYLevel", "16"); - putin("squidBlockSpawnMaxYLevel", "64", "electricPowerMaxLevel", "5"); - putin("yourItemMaxCount", "64", "yourItemTwoMaxCount", "64"); + putIn2("hideMainScreenButton", "false", "squidBlockSpawnSize", "3"); + putIn2("squidBlockPerChunkSpawnCount", "8", "squidBlockSpawnMinYLevel", "16"); + putIn2("squidBlockSpawnMaxYLevel", "64", "electricPowerMaxLevel", "5"); + putIn2("yourItemMaxCount", "64", "yourItemTwoMaxCount", "64"); + putIn("enableRegisterLog", "false"); try { - properties.store(new BufferedOutputStream(new FileOutputStream("config" + s + "squidcraft" + s + "config.properties")), "save Config File."); - } catch (IOException f) { f.printStackTrace(); } - } catch (IOException i) { i.printStackTrace(); } + PROPERTIES.store(new BufferedOutputStream(new FileOutputStream("config" + SEPARATOR + "squidcraft" + SEPARATOR + "config.properties")), "save Config File."); + } catch (IOException f) { + f.printStackTrace(); + } + } catch (IOException i) { + i.printStackTrace(); + } } - public static void putin(String s1, String s2, String s3, String s4) - { - properties.put(s1, s2); - if (!s3.equals("null")) - properties.put(s3, s4); + + public static void putIn(String s1, String s2) { + PROPERTIES.put(s1, s2); + } + + public static void putIn2(String s1, String s2, String s3, String s4) { + putIn(s1, s2); + PROPERTIES.put(s3, s4); } } diff --git a/src/main/java/io/github/squid233/squidcraft/config/MyProperties.java b/src/main/java/io/github/squid233/squidcraft/config/MyProperties.java index 01c0bbc..88f96c4 100644 --- a/src/main/java/io/github/squid233/squidcraft/config/MyProperties.java +++ b/src/main/java/io/github/squid233/squidcraft/config/MyProperties.java @@ -123,10 +123,12 @@ public EnumerationAdapter(List list) { this.isEmpty = list.isEmpty(); } + @Override public boolean hasMoreElements() { return !isEmpty && index < list.size(); } + @Override public T nextElement() { if (this.hasMoreElements()) { return list.get(index++); diff --git a/src/main/java/io/github/squid233/squidcraft/enchantment/ElectricPowerEnchantment.java b/src/main/java/io/github/squid233/squidcraft/enchantment/ElectricPowerEnchantment.java index a230256..33dd110 100644 --- a/src/main/java/io/github/squid233/squidcraft/enchantment/ElectricPowerEnchantment.java +++ b/src/main/java/io/github/squid233/squidcraft/enchantment/ElectricPowerEnchantment.java @@ -14,12 +14,14 @@ public ElectricPowerEnchantment(Rarity rarity, EnchantmentTarget type, Equipment super(rarity, type, slotTypes); } - public int getMinimumPower(int level) { + @Override + public int getMinPower(int level) { return 5; } - public int getMaximumLevel() { - return Integer.parseInt(CreateConfig.properties.getProperty("electricPowerMaxLevel")); + @Override + public int getMaxLevel() { + return Integer.parseInt(CreateConfig.PROPERTIES.getProperty("electricPowerMaxLevel")); } @Override diff --git a/src/main/java/io/github/squid233/squidcraft/enchantment/FireBoomEnchantment.java b/src/main/java/io/github/squid233/squidcraft/enchantment/FireBoomEnchantment.java index ad7c69e..dda6c88 100644 --- a/src/main/java/io/github/squid233/squidcraft/enchantment/FireBoomEnchantment.java +++ b/src/main/java/io/github/squid233/squidcraft/enchantment/FireBoomEnchantment.java @@ -14,11 +14,13 @@ public FireBoomEnchantment(Rarity rarity, EnchantmentTarget type, EquipmentSlot[ super(rarity, type, slotTypes); } - public int getMinimumPower(int level) { + @Override + public int getMinPower(int level) { return 2; } - public int getMaximumLevel() { + @Override + public int getMaxLevel() { return 5; } diff --git a/src/main/java/io/github/squid233/squidcraft/enchantment/FrostEnchantment.java b/src/main/java/io/github/squid233/squidcraft/enchantment/FrostEnchantment.java index de3f9d2..60649d2 100644 --- a/src/main/java/io/github/squid233/squidcraft/enchantment/FrostEnchantment.java +++ b/src/main/java/io/github/squid233/squidcraft/enchantment/FrostEnchantment.java @@ -13,11 +13,13 @@ public FrostEnchantment(Rarity rarity, EnchantmentTarget target, EquipmentSlot[] super(rarity, target, slots); } - public int getMinimumPower(int int_1) { + @Override + public int getMinPower(int level) { return 3; } - public int getMaximumLevel() { + @Override + public int getMaxLevel() { return 10; } diff --git a/src/main/java/io/github/squid233/squidcraft/enchantment/InsaneEnchantment.java b/src/main/java/io/github/squid233/squidcraft/enchantment/InsaneEnchantment.java index 858dc0d..d0a2c8a 100644 --- a/src/main/java/io/github/squid233/squidcraft/enchantment/InsaneEnchantment.java +++ b/src/main/java/io/github/squid233/squidcraft/enchantment/InsaneEnchantment.java @@ -13,7 +13,8 @@ public InsaneEnchantment(Rarity rarity, EnchantmentTarget type, EquipmentSlot[] super(rarity, type, slotTypes); } - public int getMinimumPower(int level) { + @Override + public int getMinPower(int level) { return 29; } 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 9038e97..fa46413 100644 --- a/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java +++ b/src/main/java/io/github/squid233/squidcraft/entity/CookieCreeperRenderer.java @@ -7,8 +7,8 @@ import net.minecraft.util.Identifier; public class CookieCreeperRenderer extends MobEntityRenderer> { - public CookieCreeperRenderer(EntityRenderDispatcher entityRenderDispatcher_1) { - super(entityRenderDispatcher_1, new CreeperEntityModel<>(), 1); + public CookieCreeperRenderer(EntityRenderDispatcher entityRenderDispatcher) { + super(entityRenderDispatcher, new CreeperEntityModel<>(), 1); } @Override diff --git a/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluidBase.java b/src/main/java/io/github/squid233/squidcraft/fluid/BaseMilkFluid.java similarity index 76% rename from src/main/java/io/github/squid233/squidcraft/fluid/MilkFluidBase.java rename to src/main/java/io/github/squid233/squidcraft/fluid/BaseMilkFluid.java index eab2f8b..833db92 100644 --- a/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluidBase.java +++ b/src/main/java/io/github/squid233/squidcraft/fluid/BaseMilkFluid.java @@ -6,19 +6,19 @@ import net.minecraft.fluid.FlowableFluid; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; +import net.minecraft.tag.FluidTags; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -public abstract class MilkFluidBase extends FlowableFluid { +public abstract class BaseMilkFluid extends FlowableFluid { /** * @return is the given fluid an instance of this fluid? */ @Override - public boolean matchesType(Fluid fluid) - { + public boolean matchesType(Fluid fluid) { return fluid == getStill() || fluid == getFlowing(); } @@ -26,8 +26,7 @@ public boolean matchesType(Fluid fluid) * @return is the fluid infinite like water? */ @Override - protected boolean isInfinite() - { + protected boolean isInfinite() { return true; } @@ -36,8 +35,7 @@ protected boolean isInfinite() * the block's loot table. Lava plays the "block.lava.extinguish" sound. */ @Override - protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState state) - { + protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState state) { final BlockEntity blockEntity = state.getBlock().hasBlockEntity() ? world.getBlockEntity(pos) : null; Block.dropStacks(state, world.getWorld(), pos, blockEntity); } @@ -49,9 +47,8 @@ protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState s * @return if the given Fluid can flow into this FluidState? */ @Override - protected boolean canBeReplacedWith(FluidState fluidState, BlockView blockView, BlockPos blockPos, Fluid fluid, Direction direction) - { - return false; + protected boolean canBeReplacedWith(FluidState state, BlockView world, BlockPos pos, Fluid fluid, Direction direction) { + return direction == Direction.DOWN && !fluid.isIn(FluidTags.WATER); } /** @@ -59,8 +56,7 @@ protected boolean canBeReplacedWith(FluidState fluidState, BlockView blockView, * Water returns 4. Lava returns 2 in the Overworld and 4 in the Nether. */ @Override - protected int getFlowSpeed(WorldView worldView) - { + protected int getFlowSpeed(WorldView worldView) { return 4; } @@ -68,8 +64,7 @@ protected int getFlowSpeed(WorldView worldView) * Water returns 1. Lava returns 2 in the Overworld and 1 in the Nether. */ @Override - protected int getLevelDecreasePerBlock(WorldView worldView) - { + protected int getLevelDecreasePerBlock(WorldView worldView) { return 1; } @@ -77,8 +72,7 @@ protected int getLevelDecreasePerBlock(WorldView worldView) * Water returns 5. Lava returns 30 in the Overworld and 10 in the Nether. */ @Override - public int getTickRate(WorldView worldView) - { + public int getTickRate(WorldView worldView) { return 5; } @@ -86,8 +80,7 @@ public int getTickRate(WorldView worldView) * Water and Lava both return 100.0F. */ @Override - protected float getBlastResistance() - { + protected float getBlastResistance() { return 100.0F; } } diff --git a/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluid.java b/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluid.java index 9e84716..ba0b266 100644 --- a/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluid.java +++ b/src/main/java/io/github/squid233/squidcraft/fluid/MilkFluid.java @@ -1,71 +1,62 @@ package io.github.squid233.squidcraft.fluid; import io.github.squid233.squidcraft.util.registers.FluidRegister; +import io.github.squid233.squidcraft.util.registers.ItemRegister; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.state.StateManager; import net.minecraft.state.property.Properties; -public abstract class MilkFluid extends MilkFluidBase { +public abstract class MilkFluid extends BaseMilkFluid { @Override - public Fluid getStill() - { + public Fluid getStill() { return FluidRegister.STILL_MILK; } @Override - public Fluid getFlowing() - { + public Fluid getFlowing() { return FluidRegister.FLOWING_MILK; } @Override - public Item getBucketItem() - { - return Items.MILK_BUCKET; + public Item getBucketItem() { + return ItemRegister.MILK_BUCKET; } @Override - protected BlockState toBlockState(FluidState fluidState) - { + protected BlockState toBlockState(FluidState fluidState) { // method_15741 converts the LEVEL_1_8 of the fluid state to the LEVEL_15 the fluid block uses return FluidRegister.MILK.getDefaultState().with(Properties.LEVEL_15, method_15741(fluidState)); } public static class Flowing extends MilkFluid { @Override - protected void appendProperties(StateManager.Builder builder) - { + protected void appendProperties(StateManager.Builder builder) { super.appendProperties(builder); builder.add(LEVEL); } @Override - public int getLevel(FluidState fluidState) - { + public int getLevel(FluidState fluidState) { return fluidState.get(LEVEL); } @Override - public boolean isStill(FluidState fluidState) - { + public boolean isStill(FluidState fluidState) { return false; } } public static class Still extends MilkFluid { @Override - public int getLevel(FluidState fluidState) - { + public int getLevel(FluidState fluidState) { return 8; } @Override - public boolean isStill(FluidState fluidState) - { + public boolean isStill(FluidState fluidState) { return true; } } diff --git a/src/main/java/io/github/squid233/squidcraft/item/APileCSSquid.java b/src/main/java/io/github/squid233/squidcraft/item/APileCSSquid.java deleted file mode 100644 index 2768b86..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/APileCSSquid.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.squid233.squidcraft.item; - -import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; - -public class APileCSSquid extends Item { - public APileCSSquid() { - super(new Settings() - .group(ItemGroups.SQUID_CRAFT) - .food(new FoodComponent.Builder().hunger(18).saturationModifier(0.7f).meat().build()) - ); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/CookedShreddedSquid.java b/src/main/java/io/github/squid233/squidcraft/item/CookedShreddedSquid.java deleted file mode 100644 index 0b1e58b..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/CookedShreddedSquid.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.squid233.squidcraft.item; - -import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; - -public class CookedShreddedSquid extends Item { - public CookedShreddedSquid() { - super(new Settings() - .group(ItemGroups.SQUID_CRAFT) - .food(new FoodComponent.Builder().hunger(2).saturationModifier(0.6f).meat().build()) - ); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/ItemGroups.java b/src/main/java/io/github/squid233/squidcraft/item/ItemGroups.java index c4da0a6..cabf98c 100644 --- a/src/main/java/io/github/squid233/squidcraft/item/ItemGroups.java +++ b/src/main/java/io/github/squid233/squidcraft/item/ItemGroups.java @@ -9,7 +9,7 @@ import static io.github.squid233.squidcraft.util.registers.ItemRegister.*; import static io.github.squid233.squidcraft.util.registers.BlockRegister.*; -public abstract class ItemGroups { +public class ItemGroups { /** * Let it cannot constructing */ @@ -20,19 +20,24 @@ private ItemGroups() { public static final ItemGroup SQUID_CRAFT = FabricItemGroupBuilder.create( new Identifier(SquidCraft.MODID, "squid_craft")) .icon(() -> new ItemStack(SQUID_BLOCK)) - .appendItems(stacks -> - { + .appendItems(stacks -> { stacks.add(new ItemStack(SHREDDED_SQUID)); stacks.add(new ItemStack(COOKED_SHREDDED_SQUID)); stacks.add(new ItemStack(A_PILE_COOKED_SHREDDED_SQUID)); stacks.add(new ItemStack(SQUID_COOKIE)); - stacks.add(new ItemStack(SQUID_BLOCK)); /*/*/stacks.add(new ItemStack(COMPRESS_SQUID_BLOCK)); - stacks.add(new ItemStack(LOW_SQUID_BLOCK)); /*/*/stacks.add(new ItemStack(LOW_COMPRESS_SQUID_BLOCK)); - stacks.add(new ItemStack(MEDIUM_SQUID_BLOCK)); /*/*/stacks.add(new ItemStack(MEDIUM_COMPRESS_SQUID_BLOCK)); - stacks.add(new ItemStack(HIGHER_SQUID_BLOCK)); /*/*/stacks.add(new ItemStack(HIGHER_COMPRESS_SQUID_BLOCK)); - stacks.add(new ItemStack(SUPER_SQUID_BLOCK)); /*/*/stacks.add(new ItemStack(SUPER_COMPRESS_SQUID_BLOCK)); - stacks.add(new ItemStack(ULTIMATE_SQUID_BLOCK));/*/*/stacks.add(new ItemStack(ULTIMATE_COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(SQUID_BLOCK)); + stacks.add(new ItemStack(COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(LOW_SQUID_BLOCK)); + stacks.add(new ItemStack(LOW_COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(MEDIUM_SQUID_BLOCK)); + stacks.add(new ItemStack(MEDIUM_COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(HIGHER_SQUID_BLOCK)); + stacks.add(new ItemStack(HIGHER_COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(SUPER_SQUID_BLOCK)); + stacks.add(new ItemStack(SUPER_COMPRESS_SQUID_BLOCK)); + stacks.add(new ItemStack(ULTIMATE_SQUID_BLOCK)); + stacks.add(new ItemStack(ULTIMATE_COMPRESS_SQUID_BLOCK)); stacks.add(new ItemStack(ONE_SQUID_BLOCK)); stacks.add(new ItemStack(TWO_SQUID_BLOCK)); @@ -46,6 +51,9 @@ private ItemGroups() { stacks.add(new ItemStack(COOKIE_CREEPER_SPAWN_EGG)); stacks.add(new ItemStack(YOUR_ITEM)); stacks.add(new ItemStack(YOUR_ITEM_2)); + + stacks.add(new ItemStack(SOUL_JACK_O_LANTERN)); + stacks.add(new ItemStack(MILK_BUCKET)); }) .build(); @@ -54,8 +62,7 @@ private ItemGroups() { public static final ItemGroup SQUID_CRAFT_COMBAT_AND_TOOLS = FabricItemGroupBuilder.create( new Identifier(SquidCraft.MODID, "sc_combat_and_tools")) .icon(() -> new ItemStack(SQUID_SWORD)) - .appendItems(stacks -> - { + .appendItems(stacks -> { stacks.add(new ItemStack(SQUID_HELMET)); stacks.add(new ItemStack(SQUID_CHESTPLATE)); stacks.add(new ItemStack(SQUID_LEGGINGS)); diff --git a/src/main/java/io/github/squid233/squidcraft/item/ShreddedSquid.java b/src/main/java/io/github/squid233/squidcraft/item/ShreddedSquid.java deleted file mode 100644 index dfb8251..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/ShreddedSquid.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.squid233.squidcraft.item; - -import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; - -public class ShreddedSquid extends Item { - public ShreddedSquid() { - super(new Settings() - .group(ItemGroups.SQUID_CRAFT) - .food(new FoodComponent.Builder().hunger(1).saturationModifier(0.4f).meat().build()) - ); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/SquidCookie.java b/src/main/java/io/github/squid233/squidcraft/item/SquidCookie.java deleted file mode 100644 index bc0a17b..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/SquidCookie.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.github.squid233.squidcraft.item; - -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.util.List; - -public class SquidCookie extends Item { - public SquidCookie() { - super(new 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")); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/YourItem.java b/src/main/java/io/github/squid233/squidcraft/item/YourItem.java index 8e82a3a..66a55b5 100644 --- a/src/main/java/io/github/squid233/squidcraft/item/YourItem.java +++ b/src/main/java/io/github/squid233/squidcraft/item/YourItem.java @@ -7,7 +7,7 @@ public class YourItem extends Item { public YourItem() { - super(new Settings().group(ItemGroups.SQUID_CRAFT).maxCount(parseInt(CreateConfig.properties.getProperty("yourItemMaxCount")))); + super(new Settings().group(ItemGroups.SQUID_CRAFT).maxCount(parseInt(CreateConfig.PROPERTIES.getProperty("yourItemMaxCount")))); } @Override diff --git a/src/main/java/io/github/squid233/squidcraft/item/YourItem2.java b/src/main/java/io/github/squid233/squidcraft/item/YourItem2.java index 8468b67..c717fbc 100644 --- a/src/main/java/io/github/squid233/squidcraft/item/YourItem2.java +++ b/src/main/java/io/github/squid233/squidcraft/item/YourItem2.java @@ -5,7 +5,7 @@ public class YourItem2 extends Item { public YourItem2() { - super(new Settings().group(ItemGroups.SQUID_CRAFT).maxCount(Integer.parseInt(CreateConfig.properties.getProperty("yourItemTwoMaxCount")))); + super(new Settings().group(ItemGroups.SQUID_CRAFT).maxCount(Integer.parseInt(CreateConfig.PROPERTIES.getProperty("yourItemTwoMaxCount")))); } @Override diff --git a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidAxe.java b/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidAxe.java deleted file mode 100644 index ae2c949..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidAxe.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.item.tools.squid; - -import io.github.squid233.squidcraft.item.ItemGroups; -import io.github.squid233.squidcraft.item.ModToolMaterial; -import net.minecraft.item.AxeItem; - -public class SquidAxe extends AxeItem { - public SquidAxe() { - super(ModToolMaterial.SQUID, -0, -2.2f, new Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidHoe.java b/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidHoe.java deleted file mode 100644 index 8ace19d..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidHoe.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.item.tools.squid; - -import io.github.squid233.squidcraft.item.ItemGroups; -import io.github.squid233.squidcraft.item.ModToolMaterial; -import net.minecraft.item.HoeItem; - -public class SquidHoe extends HoeItem { - public SquidHoe() { - super(ModToolMaterial.SQUID, -4, -2.4f, new Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidPickaxe.java b/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidPickaxe.java deleted file mode 100644 index 3dc5848..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidPickaxe.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.item.tools.squid; - -import io.github.squid233.squidcraft.item.ItemGroups; -import io.github.squid233.squidcraft.item.ModToolMaterial; -import net.minecraft.item.PickaxeItem; - -public class SquidPickaxe extends PickaxeItem { - public SquidPickaxe() { - super(ModToolMaterial.SQUID, -1, -1, new Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidShovel.java b/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidShovel.java deleted file mode 100644 index 5853206..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidShovel.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.item.tools.squid; - -import io.github.squid233.squidcraft.item.ItemGroups; -import io.github.squid233.squidcraft.item.ModToolMaterial; -import net.minecraft.item.ShovelItem; - -public class SquidShovel extends ShovelItem { - public SquidShovel() { - super(ModToolMaterial.SQUID, -2, -2, new Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidSword.java b/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidSword.java deleted file mode 100644 index 9f7ab1c..0000000 --- a/src/main/java/io/github/squid233/squidcraft/item/tools/squid/SquidSword.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.squid233.squidcraft.item.tools.squid; - -import io.github.squid233.squidcraft.item.ItemGroups; -import io.github.squid233.squidcraft.item.ModToolMaterial; -import net.minecraft.item.SwordItem; - -public class SquidSword extends SwordItem { - public SquidSword() { - super(ModToolMaterial.SQUID, +1, -0, new Settings().group(ItemGroups.SQUID_CRAFT_COMBAT_AND_TOOLS)); - } -} diff --git a/src/main/java/io/github/squid233/squidcraft/mixin/PlayerEntityMixin.java b/src/main/java/io/github/squid233/squidcraft/mixin/PlayerEntityMixin.java new file mode 100644 index 0000000..90d536e --- /dev/null +++ b/src/main/java/io/github/squid233/squidcraft/mixin/PlayerEntityMixin.java @@ -0,0 +1,39 @@ +package io.github.squid233.squidcraft.mixin; + +import io.github.squid233.squidcraft.util.registers.ItemRegister; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerEntity.class) +public abstract class PlayerEntityMixin extends LivingEntity { + @Shadow + public abstract void addExperience(int experience); + + protected PlayerEntityMixin(EntityType entityType, World world) { + super(entityType, world); + } + + @Inject(method = "tick", at = @At("HEAD")) + private void tick(CallbackInfo c) { + Item helmet = this.getEquippedStack(EquipmentSlot.HEAD).getItem(); + Item chestplate = this.getEquippedStack(EquipmentSlot.CHEST).getItem(); + Item leggings = this.getEquippedStack(EquipmentSlot.LEGS).getItem(); + Item boots = this.getEquippedStack(EquipmentSlot.FEET).getItem(); + + if (helmet.equals(ItemRegister.SQUID_HELMET) && chestplate.equals(ItemRegister.SQUID_CHESTPLATE) && leggings.equals(ItemRegister.SQUID_LEGGINGS) && boots.equals(ItemRegister.SQUID_BOOTS)) { + this.addStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 20 * 3, 0)); + } + } + +} 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 b4bea6a..5e0c7ac 100644 --- a/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java +++ b/src/main/java/io/github/squid233/squidcraft/mixin/SquidCraftMixin.java @@ -1,7 +1,7 @@ package io.github.squid233.squidcraft.mixin; import io.github.squid233.api.util.Loggers; -import io.github.squid233.squidcraft.client.gui.AuthorsGUI; +import io.github.squid233.squidcraft.client.gui.AuthorsGui; import io.github.squid233.squidcraft.config.CreateConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; @@ -43,9 +43,9 @@ private void log(String message) { */ @Overwrite private void initWidgetsNormal(int y, int spacingY) { - if (CreateConfig.properties.getProperty("hideMainScreenButton").equals("false")) { + if ("false".equals(CreateConfig.PROPERTIES.getProperty("hideMainScreenButton"))) { this.addButton(new ButtonWidget(this.width / 2, y + spacingY, 100, 20, new TranslatableText("squidcraft.button.text"), (action) -> { - MinecraftClient.getInstance().openScreen(new AuthorsGUI(this)); + MinecraftClient.getInstance().openScreen(new AuthorsGui(this)); log("By Squid233 & baka4n"); })); } diff --git a/src/main/java/io/github/squid233/squidcraft/util/ModBiomes.java b/src/main/java/io/github/squid233/squidcraft/util/ModBiomes.java index 96264d6..e250cdc 100644 --- a/src/main/java/io/github/squid233/squidcraft/util/ModBiomes.java +++ b/src/main/java/io/github/squid233/squidcraft/util/ModBiomes.java @@ -1,6 +1,7 @@ package io.github.squid233.squidcraft.util; import io.github.squid233.squidcraft.SquidCraft; +import io.github.squid233.squidcraft.world.biome.ChaosSquidBiome; import io.github.squid233.squidcraft.world.biome.SquidBiome; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -8,5 +9,6 @@ public class ModBiomes { public static final Biome SQUID_BIOME = Registry.register(Registry.BIOME, new Identifier(SquidCraft.MODID, "squid_biome"), new SquidBiome()); + public static final Biome CHAOS_SQUID_BIOME = Registry.register(Registry.BIOME, new Identifier(SquidCraft.MODID, "chaos_squid_biome"), new ChaosSquidBiome()); } 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 1163316..52171df 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,11 +2,8 @@ import io.github.squid233.squidcraft.SquidCraft; import io.github.squid233.squidcraft.api.BlockRegisters; -import io.github.squid233.squidcraft.block.*; -import io.github.squid233.squidcraft.block.msb.Eight; -import io.github.squid233.squidcraft.block.msb.Four; -import io.github.squid233.squidcraft.block.msb.One; -import io.github.squid233.squidcraft.block.msb.Two; +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; @@ -14,10 +11,7 @@ import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.BlockItem; -import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; +import net.minecraft.item.*; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -37,6 +31,10 @@ private static Block register(String name, Block block, ItemGroup group) { return register(name, block, new Item.Settings().group(group)); } + private static Block register(String name, Block block) { + return BlockRegisters.register(SquidCraft.MODID, name, block); + } + public static final Block SQUID_BLOCK; public static final Block COMPRESS_SQUID_BLOCK; public static final Block LOW_SQUID_BLOCK; @@ -56,6 +54,7 @@ private static Block register(String name, Block block, ItemGroup group) { public static final Block SQUID_SIDE_BLOCK; public static final Block BIGGER_CHEST_BLOCK; public static final Block SOUL_JACK_O_LANTERN; + 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); @@ -63,39 +62,45 @@ private static Block register(String name, Block block, ItemGroup group) { public static BlockEntityType BIGGER_CHEST_ENTITY_TYPE; - static - { + static { // Squid blocks begin - SQUID_BLOCK = register("squid_block", new SquidBlock(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 CompressSquidBlock(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 LowSquidBlock(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 LowCompressSquidBlock(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 MediumSquidBlock(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 MediumCompressSquidBlock(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 HigherSquidBlock(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 HigherCompressSquidBlock(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 SuperSquidBlock(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 SuperCompressSquidBlock(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 UltimateSquidBlock(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 UltimateCompressSquidBlock(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 = 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 blocks end // Multi squid blocks begin - ONE_SQUID_BLOCK = register("one_squid_block", new One(), 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 Two(), 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 Four(), 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 Eight(), new Item.Settings().group(ItemGroups.SQUID_CRAFT).food(new FoodComponent.Builder().hunger(33554432).saturationModifier(32326.165564192f).meat().alwaysEdible().build())); + 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())); // 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())); BIGGER_CHEST_BLOCK = new BiggerChestBlock(); - SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new SoulJackOLantern(AbstractBlock.Settings.copy(Blocks.JACK_O_LANTERN)), ItemGroup.DECORATIONS); + SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new CarvedPumpkinBlock(AbstractBlock.Settings.copy(Blocks.JACK_O_LANTERN)){}, ItemGroups.SQUID_CRAFT); + + SHREDDED_SQUID_CROP = register("shredded_squid_crop", new CarrotsBlock(FabricBlockSettings.copyOf(Blocks.CARROTS)) { + @Override + protected ItemConvertible getSeedsItem() { + return ItemRegister.SHREDDED_SQUID; + } + }); } public BlockRegister() { - registerContainer(BIGGER_CHEST, BIGGER_CHEST_BLOCK, new Item.Settings().group(ItemGroups.SQUID_CRAFT)); + 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()); @@ -105,10 +110,10 @@ public BlockRegister() { } - private void registerContainer(Identifier id, Block block, Item.Settings settings) { + private void registerContainer(Item.Settings settings) { String s = "register container"; - Registry.register(Registry.BLOCK, id, block); - Registry.register(Registry.ITEM, id, new BlockItem(block, settings)); + 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"); } diff --git a/src/main/java/io/github/squid233/squidcraft/util/registers/FluidRegister.java b/src/main/java/io/github/squid233/squidcraft/util/registers/FluidRegister.java index 8787765..db74f26 100644 --- a/src/main/java/io/github/squid233/squidcraft/util/registers/FluidRegister.java +++ b/src/main/java/io/github/squid233/squidcraft/util/registers/FluidRegister.java @@ -17,7 +17,7 @@ public FluidRegister() { registerFluid("milk", STILL_MILK, FLOWING_MILK, MILK); } - public void registerFluid(String fluidID, FlowableFluid stillFluid, FlowableFluid flowingFluid, Block fluidBlock) { - io.github.squid233.squidcraft.api.FluidRegister.registerFluid(SquidCraft.MODID, fluidID, stillFluid, flowingFluid, fluidBlock); + public void registerFluid(String fluidName, FlowableFluid stillFluid, FlowableFluid flowingFluid, Block fluidBlock) { + io.github.squid233.squidcraft.api.FluidRegister.registerFluid(SquidCraft.MODID, fluidName, stillFluid, flowingFluid, fluidBlock); } } 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 0a84745..eab4389 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 @@ -2,59 +2,72 @@ import io.github.squid233.squidcraft.api.ItemRegisters; import io.github.squid233.squidcraft.armor.ArmorMaterials; -import io.github.squid233.squidcraft.item.*; -import io.github.squid233.squidcraft.item.tools.squid.*; +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; import io.github.squid233.squidcraft.util.ModEntities; +import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SpawnEggItem; -import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; +import net.minecraft.item.*; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; +import java.util.List; + import static io.github.squid233.squidcraft.SquidCraft.MODID; 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. - public static final Item - SHREDDED_SQUID, COOKED_SHREDDED_SQUID, A_PILE_COOKED_SHREDDED_SQUID, SQUID_COOKIE, - SQUID_HELMET, SQUID_CHESTPLATE, SQUID_LEGGINGS, SQUID_BOOTS, - SQUID_AXE, SQUID_HOE, SQUID_PICKAXE, SQUID_SHOVEL, SQUID_SWORD, - COOKIE_CREEPER_SPAWN_EGG; + public static final Item SHREDDED_SQUID; + public static final Item COOKED_SHREDDED_SQUID; + public static final Item A_PILE_COOKED_SHREDDED_SQUID; + public static final Item SQUID_COOKIE; + public static final Item SQUID_HELMET; + public static final Item SQUID_CHESTPLATE; + public static final Item SQUID_LEGGINGS; + public static final Item SQUID_BOOTS; + public static final Item SQUID_AXE; + public static final Item SQUID_HOE; + public static final Item SQUID_PICKAXE; + public static final Item SQUID_SHOVEL; + public static final Item SQUID_SWORD; + public static final Item COOKIE_CREEPER_SPAWN_EGG; + public static final Item MILK_BUCKET; public static final io.github.squid233.api.item.Item YOUR_ITEM = new YourItem(), YOUR_ITEM_2 = new YourItem2(); static { - SHREDDED_SQUID = register("shredded_squid", new ShreddedSquid()); - COOKED_SHREDDED_SQUID = register("cooked_shredded_squid", new CookedShreddedSquid()); - A_PILE_COOKED_SHREDDED_SQUID = register("a_pile_cooked_shredded_squid", new APileCSSquid()); - SQUID_COOKIE = register("squid_cookie", new SquidCookie()); - - SQUID_HELMET = registerHelmet("squid", new ArmorItem(ArmorMaterials.SQUID, EquipmentSlot.HEAD, new Item.Settings().group(ItemGroups.SQUID_CRAFT)) { + 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 TypedActionResult use(World world, PlayerEntity user, Hand hand) { - user.addStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 999999)); - return TypedActionResult.success(new ItemStack(this)); - }}); + public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) { + tooltip.add(new TranslatableText("item.squidcraft.squid_cookie.tooltip")); + } + }); + + 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 SquidAxe()); - SQUID_HOE = registerHoe("squid", new SquidHoe()); - SQUID_PICKAXE = registerPickaxe("squid", new SquidPickaxe()); - SQUID_SHOVEL = registerShovel("squid", new SquidShovel()); - SQUID_SWORD = registerSword("squid", new SquidSword()); + SQUID_AXE = registerAxe("squid", new AxeItem(ModToolMaterial.SQUID, -0, -2.2f, new Item.Settings().group(ItemGroups.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("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))); } public ItemRegister() { diff --git a/src/main/java/io/github/squid233/squidcraft/util/registers/WorldGenRegister.java b/src/main/java/io/github/squid233/squidcraft/util/registers/WorldGenRegister.java index 1f6e279..f453d81 100644 --- a/src/main/java/io/github/squid233/squidcraft/util/registers/WorldGenRegister.java +++ b/src/main/java/io/github/squid233/squidcraft/util/registers/WorldGenRegister.java @@ -14,11 +14,13 @@ public class WorldGenRegister { public WorldGenRegister() { OverworldBiomes.addContinentalBiome(ModBiomes.SQUID_BIOME, OverworldClimate.TEMPERATE, 3d); - OverworldBiomes.addShoreBiome(ModBiomes.SQUID_BIOME, Biomes.BEACH, 1); - FabricBiomes.addSpawnBiome(ModBiomes.SQUID_BIOME); + OverworldBiomes.addContinentalBiome(ModBiomes.CHAOS_SQUID_BIOME, OverworldClimate.TEMPERATE, 3d); + OverworldBiomes.addShoreBiome(ModBiomes.CHAOS_SQUID_BIOME, Biomes.BEACH, 1); + FabricBiomes.addSpawnBiome(ModBiomes.CHAOS_SQUID_BIOME); + Registry.BIOME.forEach(biome -> biome.addFeature( GenerationStep.Feature.RAW_GENERATION, Features.SQUID_SPIRAL.configure( 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 new file mode 100644 index 0000000..1ed88ad --- /dev/null +++ b/src/main/java/io/github/squid233/squidcraft/world/biome/ChaosSquidBiome.java @@ -0,0 +1,56 @@ +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; +import net.minecraft.world.gen.feature.MineshaftFeatureConfig; +import net.minecraft.world.gen.feature.SeagrassFeatureConfig; +import net.minecraft.world.gen.feature.ShipwreckFeatureConfig; +import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; + +import static net.minecraft.entity.EntityType.*; +import static net.minecraft.entity.SpawnGroup.WATER_CREATURE; +import static net.minecraft.world.gen.GenerationStep.Feature.VEGETAL_DECORATION; +import static net.minecraft.world.gen.decorator.Decorator.TOP_SOLID_HEIGHTMAP; +import static net.minecraft.world.gen.decorator.DecoratorConfig.DEFAULT; +import static net.minecraft.world.gen.feature.DefaultBiomeFeatures.*; +import static net.minecraft.world.gen.feature.Feature.SEAGRASS; +import static net.minecraft.world.gen.feature.MineshaftFeature.Type.NORMAL; +import static net.minecraft.world.gen.feature.StructureFeature.MINESHAFT; +import static net.minecraft.world.gen.feature.StructureFeature.SHIPWRECK; + +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)))); + this.addStructureFeature(MINESHAFT.configure(new MineshaftFeatureConfig(0.004D, NORMAL))); + this.addStructureFeature(SHIPWRECK.configure(new ShipwreckFeatureConfig(false))); + adds(this); + this.addFeature(VEGETAL_DECORATION, SEAGRASS.configure(new SeagrassFeatureConfig(48, 0.3D)).createDecoratedFeature(TOP_SOLID_HEIGHTMAP.configure(DEFAULT))); + 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)); + + } + + protected void adds(Biome b) { + addOceanCarvers(b);addDefaultLakes(b); + addDungeons(b);addDefaultOres(b); + addDefaultDisks(b);addMineables(b); + addWaterBiomeOakTrees(b);addDefaultFlowers(b); + addDefaultGrass(b);addDefaultMushrooms(b); + addDefaultVegetation(b);addSprings(b); + addSeagrassOnStone(b);addKelp(b); + addFrozenTopLayer(b);addClay(b); + addDefaultUndergroundStructures(b); + } + protected void spawn(EntityType entityType, int w, int min, int max) { + this.addSpawn(WATER_CREATURE, new SpawnEntry(entityType, w, min, max)); + } +} diff --git a/src/main/java/io/github/squid233/squidcraft/world/feature/OreFeature.java b/src/main/java/io/github/squid233/squidcraft/world/feature/OreFeature.java index 75d09e4..7b477e0 100644 --- a/src/main/java/io/github/squid233/squidcraft/world/feature/OreFeature.java +++ b/src/main/java/io/github/squid233/squidcraft/world/feature/OreFeature.java @@ -17,13 +17,13 @@ public static void spawnSquidBlock(Biome biome) { new OreFeatureConfig( OreFeatureConfig.Target.NATURAL_STONE, BlockRegister.SQUID_BLOCK.getDefaultState(), - parseInt(CreateConfig.properties.getProperty("squidBlockSpawnSize")) // Vein size + parseInt(CreateConfig.PROPERTIES.getProperty("squidBlockSpawnSize")) // Vein size )).createDecoratedFeature( Decorator.COUNT_RANGE.configure(new RangeDecoratorConfig( - parseInt(CreateConfig.properties.getProperty("squidBlockPerChunkSpawnCount")), // Vein count of per chunk + parseInt(CreateConfig.PROPERTIES.getProperty("squidBlockPerChunkSpawnCount")), // Vein count of per chunk 0, // Bottom offset - parseInt(CreateConfig.properties.getProperty("squidBlockSpawnMinYLevel")), // Minimum y level - parseInt(CreateConfig.properties.getProperty("squidBlockSpawnMaxYLevel")) // Maximum y level + parseInt(CreateConfig.PROPERTIES.getProperty("squidBlockSpawnMinYLevel")), // Minimum y level + parseInt(CreateConfig.PROPERTIES.getProperty("squidBlockSpawnMaxYLevel")) // Maximum y level )))); } } diff --git a/src/main/java/io/github/squid233/yummyfood/YummyFood.java b/src/main/java/io/github/squid233/yummyfood/YummyFood.java index 08ad9c5..a18d29e 100644 --- a/src/main/java/io/github/squid233/yummyfood/YummyFood.java +++ b/src/main/java/io/github/squid233/yummyfood/YummyFood.java @@ -3,14 +3,33 @@ import io.github.squid233.squidcraft.SquidCraft; import io.github.squid233.squidcraft.api.ItemRegisters; import io.github.squid233.yummyfood.item.ItemGroup; -import io.github.squid233.yummyfood.item.Pineapple; 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 Pineapple(new Item.Settings().group(ItemGroup.YUMMYFOOD).food(new FoodComponent.Builder().hunger(4).saturationModifier(0.4f).build()))); + 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)); + } + }); private static Item register(String name, Item item) { return ItemRegisters.register(SquidCraft.MODID, name, item); diff --git a/src/main/java/io/github/squid233/yummyfood/item/ItemGroup.java b/src/main/java/io/github/squid233/yummyfood/item/ItemGroup.java index 31743f7..849bd02 100644 --- a/src/main/java/io/github/squid233/yummyfood/item/ItemGroup.java +++ b/src/main/java/io/github/squid233/yummyfood/item/ItemGroup.java @@ -7,11 +7,13 @@ import static io.github.squid233.yummyfood.YummyFood.*; -public abstract class ItemGroup { +public class ItemGroup { public static final net.minecraft.item.ItemGroup YUMMYFOOD = FabricItemGroupBuilder.create( - new Identifier(SquidCraft.MODID, "yummyfood") - ).icon(() -> new ItemStack(PINEAPPLE)) - .appendItems(stacks -> { - stacks.add(new ItemStack(PINEAPPLE)); - }).build(); + new Identifier(SquidCraft.MODID, "yummyfood")) + .icon(() -> new ItemStack(PINEAPPLE)) + .appendItems(stacks -> { + stacks.add(new ItemStack(PINEAPPLE)); + stacks.add(new ItemStack(TOMATO)); + }) + .build(); } diff --git a/src/main/java/io/github/squid233/yummyfood/item/Pineapple.java b/src/main/java/io/github/squid233/yummyfood/item/Pineapple.java deleted file mode 100644 index 3b0ef6e..0000000 --- a/src/main/java/io/github/squid233/yummyfood/item/Pineapple.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.squid233.yummyfood.item; - -import net.minecraft.item.Item; - -public class Pineapple extends Item { - public Pineapple(Settings settings) { - super(settings); - } -} diff --git a/src/main/resources/assets/squidcraft/blockstates/shredded_squid_crop.json b/src/main/resources/assets/squidcraft/blockstates/shredded_squid_crop.json new file mode 100644 index 0000000..ae9703e --- /dev/null +++ b/src/main/resources/assets/squidcraft/blockstates/shredded_squid_crop.json @@ -0,0 +1,28 @@ +{ + "variants": { + "age=0": { + "model": "squidcraft:block/shredded_squid_crop_stage0" + }, + "age=1": { + "model": "squidcraft:block/shredded_squid_crop_stage0" + }, + "age=2": { + "model": "squidcraft:block/shredded_squid_crop_stage1" + }, + "age=3": { + "model": "squidcraft:block/shredded_squid_crop_stage1" + }, + "age=4": { + "model": "squidcraft:block/shredded_squid_crop_stage2" + }, + "age=5": { + "model": "squidcraft:block/shredded_squid_crop_stage2" + }, + "age=6": { + "model": "squidcraft:block/shredded_squid_crop_stage2" + }, + "age=7": { + "model": "squidcraft:block/shredded_squid_crop_stage3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/lang/en_us.json b/src/main/resources/assets/squidcraft/lang/en_us.json index 3be75c6..22cdd3c 100644 --- a/src/main/resources/assets/squidcraft/lang/en_us.json +++ b/src/main/resources/assets/squidcraft/lang/en_us.json @@ -12,35 +12,18 @@ "item.squidcraft.squid_pickaxe": "Squid Pickaxe", "item.squidcraft.squid_shovel": "Squid Shovel", "item.squidcraft.squid_sword": "Squid Sword", - "item.squidcraft.netherite_scrap": "Netherite Scrap", - "item.squidcraft.netherite_ingot": "Netherite Ingot", - - "item.squidcraft.netherite_helmet": "Netherite Helmet", - "item.squidcraft.netherite_chestplate": "Netherite Chestplate", - "item.squidcraft.netherite_leggings": "Netherite Leggings", - "item.squidcraft.netherite_boots": "Netherite Boots", - "item.squidcraft.netherite_axe": "Netherite Axe", - "item.squidcraft.netherite_hoe": "Netherite Hoe", - "item.squidcraft.netherite_pickaxe": "Netherite Pickaxe", - "item.squidcraft.netherite_shovel": "Netherite Shovel", - "item.squidcraft.netherite_sword": "Netherite Sword", - - "item.squidcraft.copper_nugget": "Copper Nugget", - "item.squidcraft.copper_ingot": "Copper Ingot", "item.squidcraft.cookie_creeper_spawn_egg":"Spawn Cookie Creeper", "item.squidcraft.your_item": "Your Item", "item.squidcraft.your_item_2": "Your Item 2", + "item.squidcraft.milk_bucket": "Milk Bucket", + "item.squidcraft.squid_cookie.tooltip": "Craft a squid block!", "itemGroup.squidcraft.squid_craft": "SquidCraft", "itemGroup.squidcraft.sc_combat_and_tools": "SquidCraft Combat and Tools", - "itemGroup.squidcraft.netherite_mod": "SquidCraft Addons of Netherite Mod", - - "block.squidcraft.copper_ore": "Copper Ore", - "block.squidcraft.copper_block": "Copper Block", "block.squidcraft.squid_block": "Block of Squid", "block.squidcraft.compress_squid_block": "Compress Block of Squid", @@ -62,15 +45,16 @@ "block.squidcraft.squid_side_block": "Block of Squid Side Slab", - "block.squidcraft.ancient_debris": "Ancient Debris", - "block.squidcraft.netherite_block": "Block of Netherite", "block.squidcraft.bigger_chest_block": "Bigger Chest", "block.squidcraft.soul_jack_o_lantern": "Soul Jack o'Lantern", + "block.squidcraft.shredded_squid_crop": "Shredded Squid Crop", + "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", @@ -79,8 +63,6 @@ "enchantment.squidcraft.insane": "Insane Enchantment", "enchantment.squidcraft.electric_power": "Electric Power", - "subtitles.item.armor.equip_netherite": "Netherite Armor:Equip", - "advancements.squidcraft.root.title": "SquidCraft", "advancements.squidcraft.root.desc": "Get started, Cooking it!", "advancements.squidcraft.first_cooking.title": "First Cooking", @@ -99,7 +81,8 @@ "squidcraft.button.text":"SquidCraft", "authors.squidcraft.info": "authors:", - "itemGroup.squidcraft.yummyfood": "YummyFood", - "item.squidcraft.pineapple": "Pineapple" + "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" } \ 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 cfb0b45..8e67203 100644 --- a/src/main/resources/assets/squidcraft/lang/zh_cn.json +++ b/src/main/resources/assets/squidcraft/lang/zh_cn.json @@ -12,35 +12,18 @@ "item.squidcraft.squid_pickaxe": "鱿鱼镐", "item.squidcraft.squid_shovel": "鱿鱼铲", "item.squidcraft.squid_sword": "鱿鱼剑", - "item.squidcraft.netherite_scrap": "下界合金碎片", - "item.squidcraft.netherite_ingot": "下界合金锭", - - "item.squidcraft.netherite_helmet": "下界合金头盔", - "item.squidcraft.netherite_chestplate": "下界合金胸甲", - "item.squidcraft.netherite_leggings": "下界合金护腿", - "item.squidcraft.netherite_boots": "下界合金靴子", - "item.squidcraft.netherite_axe": "下界合金斧", - "item.squidcraft.netherite_hoe": "下界合金锄", - "item.squidcraft.netherite_pickaxe": "下界合金镐", - "item.squidcraft.netherite_shovel": "下界合金锹", - "item.squidcraft.netherite_sword": "下界合金剑", - - "item.squidcraft.copper_nugget": "铜粒", - "item.squidcraft.copper_ingot": "铜锭", "item.squidcraft.cookie_creeper_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": "鱿鱼工艺 战斗用品与工具", - "itemGroup.squidcraft.netherite_mod": "鱿鱼工艺附属下界合金Mod", - - "block.squidcraft.copper_ore": "铜矿石", - "block.squidcraft.copper_block": "铜块", "block.squidcraft.squid_block": "鱿鱼块", "block.squidcraft.compress_squid_block": "压缩鱿鱼块", @@ -62,15 +45,16 @@ "block.squidcraft.squid_side_block": "鱿鱼块台阶", - "block.squidcraft.ancient_debris": "远古残骸", - "block.squidcraft.netherite_block": "下界合金块", "block.squidcraft.bigger_chest_block": "大箱子", "block.squidcraft.soul_jack_o_lantern": "灵魂南瓜灯", + "block.squidcraft.shredded_squid_crop": "鱿鱼丝作物", + "container.squidcraft.bigger_chest_block": "大箱子", "biome.squidcraft.squid_biome": "鱿鱼群系", + "biome.squidcraft.chaos_squid_biome": "混乱鱿鱼群系", "entity_type.squidcraft.cookie_creeper": "曲奇苦力怕", @@ -79,8 +63,6 @@ "enchantment.squidcraft.insane": "疯狂附魔", "enchantment.squidcraft.electric_power": "电力能源", - "subtitles.item.armor.equip_netherite": "下界合金盔甲:碰擦", - "advancements.squidcraft.root.title": "鱿鱼工艺", "advancements.squidcraft.root.desc": "要想开始,烤它!", "advancements.squidcraft.first_cooking.title": "第一次烘烤", @@ -100,5 +82,7 @@ "authors.squidcraft.info": "作者名单:", "itemGroup.squidcraft.yummyfood": "美味的食物", - "item.squidcraft.pineapple": "菠萝" + "item.squidcraft.pineapple": "菠萝", + "item.squidcraft.tomato": "番茄", + "item.squidcraft.tomato.tooltip": "当前日期:%n世纪%n年%n月%n日" } \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage0.json b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage0.json new file mode 100644 index 0000000..2a47891 --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/crop", + "textures": { + "crop": "squidcraft:block/shredded_squid_crop_stage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage1.json b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage1.json new file mode 100644 index 0000000..bcc093a --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/crop", + "textures": { + "crop": "squidcraft:block/shredded_squid_crop_stage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage2.json b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage2.json new file mode 100644 index 0000000..a0b456b --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/crop", + "textures": { + "crop": "squidcraft:block/shredded_squid_crop_stage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage3.json b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage3.json new file mode 100644 index 0000000..0ea474a --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/block/shredded_squid_crop_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/crop", + "textures": { + "crop": "squidcraft:block/shredded_squid_crop_stage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/item/milk_bucket.json b/src/main/resources/assets/squidcraft/models/item/milk_bucket.json new file mode 100644 index 0000000..497f871 --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/item/milk_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "item/milk_bucket" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/models/item/tomato.json b/src/main/resources/assets/squidcraft/models/item/tomato.json new file mode 100644 index 0000000..11f88f2 --- /dev/null +++ b/src/main/resources/assets/squidcraft/models/item/tomato.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "squidcraft:yummyfood/item/tomato" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/squidcraft/textures/block/ancient_debris_side.png b/src/main/resources/assets/squidcraft/textures/block/ancient_debris_side.png deleted file mode 100644 index ee2d0dd..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/block/ancient_debris_side.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/block/ancient_debris_top.png b/src/main/resources/assets/squidcraft/textures/block/ancient_debris_top.png deleted file mode 100644 index 3893cdd..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/block/ancient_debris_top.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/block/copper_block.png b/src/main/resources/assets/squidcraft/textures/block/copper_block.png deleted file mode 100644 index 21682b0..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/block/copper_block.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/block/copper_ore.png b/src/main/resources/assets/squidcraft/textures/block/copper_ore.png deleted file mode 100644 index be0896a..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/block/copper_ore.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/block/netherite_block.png b/src/main/resources/assets/squidcraft/textures/block/netherite_block.png deleted file mode 100644 index 60957f0..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/block/netherite_block.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage0.png b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage0.png new file mode 100644 index 0000000..9a0a5d3 Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage0.png differ diff --git a/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage1.png b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage1.png new file mode 100644 index 0000000..92b881d Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage1.png differ diff --git a/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage2.png b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage2.png new file mode 100644 index 0000000..575e83b Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage2.png differ diff --git a/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage3.png b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage3.png new file mode 100644 index 0000000..1c2bf32 Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/block/shredded_squid_crop_stage3.png differ diff --git a/src/main/resources/assets/squidcraft/textures/item/copper_ingot.png b/src/main/resources/assets/squidcraft/textures/item/copper_ingot.png deleted file mode 100644 index d262453..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/copper_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/copper_nugget.png b/src/main/resources/assets/squidcraft/textures/item/copper_nugget.png deleted file mode 100644 index 0061a04..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/copper_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_axe.png b/src/main/resources/assets/squidcraft/textures/item/netherite_axe.png deleted file mode 100644 index 322bf45..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_axe.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_boots.png b/src/main/resources/assets/squidcraft/textures/item/netherite_boots.png deleted file mode 100644 index ec4183e..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_boots.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_chestplate.png b/src/main/resources/assets/squidcraft/textures/item/netherite_chestplate.png deleted file mode 100644 index f2f0ad5..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_helmet.png b/src/main/resources/assets/squidcraft/textures/item/netherite_helmet.png deleted file mode 100644 index 17bf7f8..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_hoe.png b/src/main/resources/assets/squidcraft/textures/item/netherite_hoe.png deleted file mode 100644 index b41b1ee..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_ingot.png b/src/main/resources/assets/squidcraft/textures/item/netherite_ingot.png deleted file mode 100644 index 90aab05..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_leggings.png b/src/main/resources/assets/squidcraft/textures/item/netherite_leggings.png deleted file mode 100644 index af45363..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_pickaxe.png b/src/main/resources/assets/squidcraft/textures/item/netherite_pickaxe.png deleted file mode 100644 index 088283b..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_scrap.png b/src/main/resources/assets/squidcraft/textures/item/netherite_scrap.png deleted file mode 100644 index f72e21d..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_scrap.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_shovel.png b/src/main/resources/assets/squidcraft/textures/item/netherite_shovel.png deleted file mode 100644 index 0cbaf61..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/netherite_sword.png b/src/main/resources/assets/squidcraft/textures/item/netherite_sword.png deleted file mode 100644 index 4bc0809..0000000 Binary files a/src/main/resources/assets/squidcraft/textures/item/netherite_sword.png and /dev/null differ diff --git a/src/main/resources/assets/squidcraft/textures/item/your_item.png b/src/main/resources/assets/squidcraft/textures/item/your_item.png new file mode 100644 index 0000000..50ebbb4 Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/item/your_item.png differ diff --git a/src/main/resources/assets/squidcraft/textures/item/your_item_2.png b/src/main/resources/assets/squidcraft/textures/item/your_item_2.png new file mode 100644 index 0000000..50ebbb4 Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/item/your_item_2.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 new file mode 100644 index 0000000..bd5466e Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato.png differ diff --git a/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato_old.png b/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato_old.png new file mode 100644 index 0000000..204447b Binary files /dev/null and b/src/main/resources/assets/squidcraft/textures/yummyfood/item/tomato_old.png differ diff --git a/src/main/resources/data/minecraft/tags/fluids/water.json b/src/main/resources/data/minecraft/tags/fluids/water.json deleted file mode 100644 index f937249..0000000 --- a/src/main/resources/data/minecraft/tags/fluids/water.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": - [ - "squidcraft:milk", - "squidcraft:flowing_milk" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/squidcraft/loot_tables/blocks/shredded_squid_crop.json b/src/main/resources/data/squidcraft/loot_tables/blocks/shredded_squid_crop.json new file mode 100644 index 0000000..f6cca54 --- /dev/null +++ b/src/main/resources/data/squidcraft/loot_tables/blocks/shredded_squid_crop.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "squidcraft:shredded_squid" + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:binomial_with_bonus_count", + "parameters": { + "extra": 3, + "probability": 0.5714286 + } + } + ], + "name": "minecraft:carrot" + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "squidcraft:shredded_squid_crop", + "properties": { + "age": "7" + } + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/squidcraft/recipes/milk_bucket.json b/src/main/resources/data/squidcraft/recipes/milk_bucket.json new file mode 100644 index 0000000..7e8166b --- /dev/null +++ b/src/main/resources/data/squidcraft/recipes/milk_bucket.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "minecraft:milk_bucket" + } + }, + "result": { + "item": "squidcraft:milk_bucket" + } +} \ No newline at end of file diff --git a/src/main/resources/data/squidcraft/recipes/minecraft_milk_bucket_from_milk_bucket.json b/src/main/resources/data/squidcraft/recipes/minecraft_milk_bucket_from_milk_bucket.json new file mode 100644 index 0000000..b63d41a --- /dev/null +++ b/src/main/resources/data/squidcraft/recipes/minecraft_milk_bucket_from_milk_bucket.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "squidcraft:milk_bucket" + } + }, + "result": { + "item": "minecraft:milk_bucket" + } +} \ No newline at end of file diff --git a/src/main/resources/squid233.json b/src/main/resources/squid233.json index 0e0dcd2..370bdfb 100644 --- a/src/main/resources/squid233.json +++ b/src/main/resources/squid233.json @@ -1,3 +1,10 @@ { - + "versions": { + "minecraft": "1.16.1", + "fabric": { + "yarn": "1.16.1+build.20", + "loader": "0.8.9+build.203", + "api": "0.14.1+build.372-1.16" + } + } } \ No newline at end of file diff --git a/src/main/resources/squidcraft.mixins.json b/src/main/resources/squidcraft.mixins.json index 3435436..3eb14cb 100644 --- a/src/main/resources/squidcraft.mixins.json +++ b/src/main/resources/squidcraft.mixins.json @@ -4,6 +4,7 @@ "package": "io.github.squid233.squidcraft.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "PlayerEntityMixin" ], "client": [ "SquidCraftMixin"