diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 8c4caf3..4b3d549 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 2ce3dfa..6af7c65 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Fri Dec 09 20:58:56 EST 2022 -gradle.version=7.4 +#Wed Jan 24 08:59:29 EST 2024 +gradle.version=8.5 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 2bbfb66..840d5f0 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index a77a3ce..4cc9768 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.gradle/loom-cache/launch.cfg b/.gradle/loom-cache/launch.cfg index 079dbf3..39d5cfd 100644 --- a/.gradle/loom-cache/launch.cfg +++ b/.gradle/loom-cache/launch.cfg @@ -1,11 +1,11 @@ commonProperties fabric.development=true - fabric.remapClasspathFile=C:\Users\inscr\Documents\GitHub\enhanced-turtle-items\.gradle\loom-cache\remapClasspath.txt - log4j.configurationFile=C:\Users\inscr\Documents\GitHub\enhanced-turtle-items\.gradle\loom-cache\log4j.xml + fabric.remapClasspathFile=/Users/lazuline/Documents/GitHub/enhanced-turtle-items/.gradle/loom-cache/remapClasspath.txt + log4j.configurationFile=/Users/lazuline/Documents/GitHub/enhanced-turtle-items/.gradle/loom-cache/log4j.xml log4j2.formatMsgNoLookups=true fabric.log.disableAnsi=false clientArgs --assetIndex - 1.19.2-1.19 + 1.20.4-12 --assetsDir - C:\Users\inscr\.gradle\caches\fabric-loom\assets \ No newline at end of file + /Users/lazuline/.gradle/caches/fabric-loom/assets \ No newline at end of file diff --git a/.gradle/loom-cache/log4j.xml b/.gradle/loom-cache/log4j.xml index 69c9c0d..9ebf46d 100644 --- a/.gradle/loom-cache/log4j.xml +++ b/.gradle/loom-cache/log4j.xml @@ -4,6 +4,12 @@ + + + + + + diff --git a/.gradle/loom-cache/remapClasspath.txt b/.gradle/loom-cache/remapClasspath.txt index 9ad54a8..2675b23 100644 --- a/.gradle/loom-cache/remapClasspath.txt +++ b/.gradle/loom-cache/remapClasspath.txt @@ -1 +1 @@ -C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-mappings-parser\0.3.0+build.17\2f10540a290e382a7cd35c16ec3900046a4e252\tiny-mappings-parser-0.3.0+build.17.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\sponge-mixin\0.11.4+mixin.0.8.5\c1dc27696aa4006e492c2485c9ccbcb26045a971\sponge-mixin-0.11.4+mixin.0.8.5.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.8.2\2cc6565989469ec38893bfb7802b31c0d0d11ea0\tiny-remapper-0.8.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\access-widener\2.1.0\f62a27adbfd8ab4d4fa5681793039f2c0b177155\access-widener-2.1.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm\9.4\b4e0e2d2e023aa317b7cfcfc916377ea348e07d1\asm-9.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-analysis\9.4\a5fec9dfc039448d4fd098fbaffcaf55373b223\asm-analysis-9.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-commons\9.4\8fc2810ddbcbbec0a8bbccb3f8eda58321839912\asm-commons-9.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-tree\9.4\a99175a17d7fdc18cbcbd0e8ea6a5d276844190a\asm-tree-9.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-util\9.4\ab1e0a84b72561dbaf1ee260321e72148ebf4b19\asm-util-9.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\blocklist\1.0.10\5c685c5ffa94c4cd39496c7184c1d122e515ecef\blocklist-1.0.10.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\patchy\2.2.10\da05971b07cbb379d002cf7eaec6a2048211fefc\patchy-2.2.10.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.ibm.icu\icu4j\70.1\dfa3a1fbc55bf5db8c6e79fc0935ac7ab1202950\icu4j-70.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.15\49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d\commons-codec-1.15.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-compress\1.21\4ec95b60d4e86b5c95a0e919cb172a0af98011ef\commons-compress-1.21.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.5.13\e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada\httpclient-4.5.13.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.2\4bfc12adfe4842bf07b657f0369c4cb522955686\commons-logging-1.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.4.14\9dd1a631c082d92ecd4bd8fd4cf55026c720a8c1\httpcore-4.4.14.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.3.1\ae58664f88e18a9bb2c77b063833ca7aaec484cb\lwjgl-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.3.1\36c37f16ab611b3aa11f3bcf80b1d509b4ce6b\lwjgl-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.3.1\3b14f4beae9dd39791ec9e12190a9380cd8a3ce6\lwjgl-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.3.1\a817bcf213db49f710603677457567c37d53e103\lwjgl-jemalloc-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.3.1\948a89b76a16aa324b046ae9308891216ffce5f9\lwjgl-jemalloc-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.3.1\fb476c8ec110e1c137ad3ce8a7f7bfe6b11c6324\lwjgl-jemalloc-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.3.1\2623a6b8ae1dfcd880738656a9f0243d2e6840bd\lwjgl-openal-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.3.1\30a474d0e57193d7bc128849a3ab66bc9316fdb1\lwjgl-openal-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.3.1\888349f7b1be6fbae58bf8edfb9ef12def04c4e3\lwjgl-openal-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.3.1\831a5533a21a5f4f81bbc51bb13e9899319b5411\lwjgl-opengl-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.3.1\c1807e9bd571402787d7e37e3029776ae2513bb8\lwjgl-opengl-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.3.1\deef3eb9b178ff2ff3ce893cc72ae741c3a17974\lwjgl-opengl-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.3.1\cbac1b8d30cb4795149c1ef540f912671a8616d0\lwjgl-glfw-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.3.1\ed892f945cf7e79c8756796f32d00fa4ceaf573b\lwjgl-glfw-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.3.1\b997e3391d6ce8f05487e7335d95c606043884a1\lwjgl-glfw-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.3.1\b119297cf8ed01f247abe8685857f8e7fcf5980f\lwjgl-stb-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.3.1\86315914ac119efdb02dc9e8e978ade84f1702af\lwjgl-stb-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.3.1\a8d41f419eecb430b7c91ea2ce2c5c451cae2091\lwjgl-stb-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.3.1\ff1914111ef2e3e0110ef2dabc8d8cdaad82347\lwjgl-tinyfd-3.3.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.3.1\a5d830475ec0958d9fdba1559efa99aef211e6ff\lwjgl-tinyfd-3.3.1-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.3.1\842eedd876fae354abc308c98a263f6bbc9e8a4d\lwjgl-tinyfd-3.3.1-natives-windows-x86.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.13.9\5f4e3a6ef86cb021f7ca87ca192cddb50c26eb59\text2speech-1.13.9.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.13.9\7a90898b29e5c72f90ba6ebe86fa78a6afd7d3eb\text2speech-1.13.9-natives-windows.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\logging\1.0.0\f6ca3b2eee0b80b384e8ed93d368faecb82dfb9b\logging-1.0.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.oshi\oshi-core\5.8.5\1d0ec654d820741327f5a9229d513732a4b7ce50\oshi-core-5.8.5.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna\5.10.0\7cf4c87dd802db50721db66947aa237d7ad09418\jna-5.10.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna-platform\5.10.0\fbed7d9669dba47714ad0d4f4454290a997aee69\jna-platform-5.10.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.8.0-beta4\83b0359d847ee053d745be7ec0d8e9e8a44304b4\slf4j-api-1.8.0-beta4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-slf4j18-impl\2.17.0\bd7f6c0b9224dd214afb4e684957e2349b529a8d\log4j-slf4j18-impl-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\javabridge\1.2.24\c876796229b2ef5120f186eab5acc870699d3b9\javabridge-1.2.24.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.sf.jopt-simple\jopt-simple\5.0.4\4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c\jopt-simple-5.0.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-common\4.1.77.Final\ea0fc20f4e6178966b9d62017b7fcb83dfe0e713\netty-common-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-buffer\4.1.77.Final\d97571f99e5e739d86824d0df99f35d295276b5f\netty-buffer-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-codec\4.1.77.Final\4efc5f59335301d6ba0d7cd31dd10651119b03c8\netty-codec-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-handler\4.1.77.Final\47a81089de03635a27f509f3e4e13386ae1db275\netty-handler-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-resolver\4.1.77.Final\4a239dbf8d8bb5f98aa51462c35011c0516395fd\netty-resolver-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-transport\4.1.77.Final\2a3373bbd20d520c821f210bd5ee886788512043\netty-transport-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-transport-native-unix-common\4.1.77.Final\c95d53486414b3270d08057957c5da8e0c37e4eb\netty-transport-native-unix-common-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-transport-classes-epoll\4.1.77.Final\dd70dbccbcf98382223a59044f3c08d8e9920cad\netty-transport-classes-epoll-4.1.77.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.guava\failureaccess\1.0.1\1dcf1de382a0bf95a3d8b0849546c88bac1292c9\failureaccess-1.0.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.guava\guava\31.0.1-jre\119ea2b2bc205b138974d351777b20f02b92704b\guava-31.0.1-jre.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.12.0\c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e\commons-lang3-3.12.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.11.0\a2503f302b11ebde7ebc3df41daebe0e4eea3689\commons-io-2.11.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\brigadier\1.0.18\c1ef1234282716483c92183f49bef47b1a89bfa9\brigadier-1.0.18.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\datafixerupper\5.0.28\e2157e236e529aff80a5fc3ccb506e56d46b130b\datafixerupper-5.0.28.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.9\8a432c1d6825781e21a02db2e2c33c5fde2833b9\gson-2.8.9.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\authlib\3.11.49\2e3055ec2a017c7f94b79744b4a68b65695a118c\authlib-3.11.49.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\it.unimi.dsi\fastutil\8.5.6\76f95700418a68fbc4ac050525261f05dc681ca1\fastutil-8.5.6.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-api\2.17.0\bbd791e9c8c9421e45337c4fe0a10851c086e36c\log4j-api-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-core\2.17.0\fe6e7a32c1228884b9691a744f953a55d0dd8ead\log4j-core-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\fabric-loader\0.14.12\f437455555659b4199fdbfeac2cc6c07a2161088\fabric-loader-0.14.12.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api\0.72.0+1.19.2\2c4c698167e23e30a5132a2ef3523a3b0e704352\fabric-api-0.72.0+1.19.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transfer-api-v1\2.1.5+413cbbc790\e5a7b1693a20707648ca3753a0c7bd8a182d5be6\fabric-transfer-api-v1-2.1.5+413cbbc790.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-lookup-api-v1\1.6.13+93d8cb8290\d5a57e51b66ce339f551a06e46372c779e1fa79c\fabric-api-lookup-api-v1-1.6.13+93d8cb8290.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-blockrenderlayer-v1\1.1.23+c6af733c90\80c6b67612c907d4185516c749dbe9c475680dd7\fabric-blockrenderlayer-v1-1.1.23+c6af733c90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-client-tags-api-v1\1.0.4+b35fea8390\322649bd6bbc6514c03dc6b43e7c42fb0951768e\fabric-client-tags-api-v1-1.0.4+b35fea8390.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-command-api-v2\2.2.0+413cbbc790\4c63bad074a406da6567da4758f6ffed069ba204\fabric-command-api-v2-2.2.0+413cbbc790.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-content-registries-v0\3.5.0+7c6cd14d90\6bc5a2b8ca9ceff63f5e2c66517e1fbe6b1859e4\fabric-content-registries-v0-3.5.0+7c6cd14d90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-convention-tags-v1\1.2.1+27265b3490\7d7c146da17e9f6c9b145dc33d62445f0c5802c6\fabric-convention-tags-v1-1.2.1+27265b3490.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-data-generation-api-v1\5.3.6+413cbbc790\cabab26775ce1169c71836c8f68fa0de3c879403\fabric-data-generation-api-v1-5.3.6+413cbbc790.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-dimensions-v1\2.1.34+0d0f210290\d36694123f4a218a33c8e1855b9ef849707d1329\fabric-dimensions-v1-2.1.34+0d0f210290.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-entity-events-v1\1.5.3+9244241690\660eacb1ec0cab22cae3a3ac92518656fe588950\fabric-entity-events-v1-1.5.3+9244241690.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-events-interaction-v0\0.4.33+562bff6e90\911f09d127f9a316ecbacd139118da7b2acdde01\fabric-events-interaction-v0-0.4.33+562bff6e90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-gametest-api-v1\1.1.6+4d0d570390\8cd6a7676006fa5afee87e0bf912847042a20c9a\fabric-gametest-api-v1-1.1.6+4d0d570390.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-api-v1\1.6.3+9785ec3590\71d054347cdce62cf83e646ab1b868ee1cfcc837\fabric-item-api-v1-1.6.3+9785ec3590.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-groups-v0\0.3.37+9244241690\3abde4b8af0c6181bfa1d563470f64370c428d94\fabric-item-groups-v0-0.3.37+9244241690.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-mining-level-api-v1\2.1.22+33fbc73890\f278c9be906ecd2c07ae579180697806ac4d1b6d\fabric-mining-level-api-v1-2.1.22+33fbc73890.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-lifecycle-events-v1\2.2.3+1b46dc7890\2bf7c1c7ce60410738b4510ef69800a9d6b47ebc\fabric-lifecycle-events-v1-2.2.3+1b46dc7890.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-loot-api-v2\1.1.11+83a8659290\f880a0525909db1937168bea15b4a22914753187\fabric-loot-api-v2-1.1.11+83a8659290.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-message-api-v1\5.0.6+93d8cb8290\4356c862fdf634b481cac98f41452e0e6c73d7fd\fabric-message-api-v1-5.0.6+93d8cb8290.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-models-v0\0.3.20+c6af733c90\6a9ae8042ef90481b0847b2ee3172536ef0ea393\fabric-models-v0-0.3.20+c6af733c90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-recipe-api-v1\1.0.0+413cbbc790\d4282e332ecb2da29e0665884dfeb2cc6cd57d46\fabric-recipe-api-v1-1.0.0+413cbbc790.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-registry-sync-v0\0.9.31+9244241690\260713a24b237e9dcb77e7c711a1b3bc884e10a8\fabric-registry-sync-v0-0.9.31+9244241690.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-handler-api-v1\1.3.6+1cc24b1b90\56d29f775bfa58e893e230cfad83ca55ad1a8d3e\fabric-screen-handler-api-v1-1.3.6+1cc24b1b90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-networking-api-v1\1.2.10+10eb22f490\fc1ef1cddaaaeb415dd6058835479355b97e05a6\fabric-networking-api-v1-1.2.10+10eb22f490.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-object-builder-api-v1\4.1.5+9785ec3590\918452591e5e8fdb20684549bfa1ec9273b62910\fabric-object-builder-api-v1-4.1.5+9785ec3590.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-particles-v1\1.0.13+4d0d570390\cff95e917152e4971196b186c88ead7ab92396f5\fabric-particles-v1-1.0.13+4d0d570390.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-indigo\0.7.0+2e5408b590\1902b5ff22d06b4c194c938398f9d82c20104efa\fabric-renderer-indigo-0.7.0+2e5408b590.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-api-v1\1.2.0+2e5408b590\5a11552af71028970403de3cc3edf8075a82aded\fabric-renderer-api-v1-1.2.0+2e5408b590.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-data-attachment-v1\0.3.18+6e0787e690\aaad72032906d97e92a161c4241e80b6e0bbd953\fabric-rendering-data-attachment-v1-0.3.18+6e0787e690.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-fluids-v1\3.0.10+4d0d570390\626b12e751e88a0d11262039a630693a703d1b4a\fabric-rendering-fluids-v1-3.0.10+4d0d570390.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-v1\1.12.0+08b73de490\6a6f831da0201379949ac2ddab9d9f64bdd74d33\fabric-rendering-v1-1.12.0+08b73de490.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-api-v1\1.0.31+4d0d570390\1c100cf299f1564dc37b0ba85f8f9cff916ccbbe\fabric-screen-api-v1-1.0.31+4d0d570390.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-textures-v0\1.0.23+aeb40ebe90\146adb5d21c14952102302f1108ccca6fae5f29b\fabric-textures-v0-1.0.23+aeb40ebe90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-base\0.4.14+6e0787e690\fb9acf39a231d0c93c92fd64d888f4379974252c\fabric-api-base-0.4.14+6e0787e690.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-biome-api-v1\9.1.0+82db024a90\16cadfe2a2291c8d9b4351c1abbc9ea0e0482eca\fabric-biome-api-v1-9.1.0+82db024a90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-block-api-v1\1.0.2+e415d50e90\f93a47116504a254dd036aa635738c75fe32675a\fabric-block-api-v1-1.0.2+e415d50e90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-crash-report-info-v1\0.2.8+aeb40ebe90\3fb24c536a2d569a609babadcf4b1814432dd17\fabric-crash-report-info-v1-0.2.8+aeb40ebe90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-game-rule-api-v1\1.0.24+b6b6abb490\8e882d48aa50d0563aec02c2c6f3503a3d95d053\fabric-game-rule-api-v1-1.0.24+b6b6abb490.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-key-binding-api-v1\1.0.25+5c4fce2890\680db6ad0ae2d5055be08f67ff20ca0fdcb95699\fabric-key-binding-api-v1-1.0.25+5c4fce2890.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-conditions-api-v1\2.1.2+aae9039d90\f615e85bbff1f798466bb7aa9a6d7d02ce931be5\fabric-resource-conditions-api-v1-2.1.2+aae9039d90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-loader-v0\0.8.3+251d254a90\df1879b52e2f70a2d11362e84711d4cf2a510e09\fabric-resource-loader-v0-0.8.3+251d254a90.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-sound-api-v1\1.0.2+c4f28df590\669d4e6d7e8d9e8e5aa92b8af4384cb0ed5b00a4\fabric-sound-api-v1-1.0.2+c4f28df590.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transitive-access-wideners-v1\1.3.3+08b73de490\28cfea3e319bfd4649b053879b77077765c4e068\fabric-transitive-access-wideners-v1-1.3.3+08b73de490.jar;C:\Users\inscr\.gradle\caches\fabric-loom\1.19.2\minecraft-merged-intermediary.jar \ No newline at end of file +/Users/lazuline/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.1/1227f9e0666314f9de41477e3ec277e542ed7f7b/java-objc-bridge-1.1.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.github.oshi/oshi-core/6.4.5/943ba26de047eb6b28fff47f5ee939a34eb5fc8e/oshi-core-6.4.5.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.10.1/b3add478d4382b78ea20b1671390a858002feb6c/gson-2.10.1.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/32.1.2-jre/5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318/guava-32.1.2-jre.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j/73.2/61ad4ef7f9131fcf6d25c34b817f90d6da06c9e9/icu4j-73.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/6.0.52/65085e2eb921c4a3ebdde3d248637f1776e6d80d/authlib-6.0.52.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/blocklist/1.0.10/5c685c5ffa94c4cd39496c7184c1d122e515ecef/blocklist-1.0.10.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/brigadier/1.2.9/73e324f2ee541493a5179abf367237faa782ed21/brigadier-1.2.9.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/datafixerupper/6.0.8/3ba4a30557a9b057760af4011f909ba619fc5125/datafixerupper-6.0.8.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/logging/1.1.1/832b8e6674a9b325a5175a3a6267dfaf34c85139/logging-1.1.1.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/2.2.10/da05971b07cbb379d002cf7eaec6a2048211fefc/patchy-2.2.10.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.17.9/3cad216e3a7f0c19b4b394388bc9ffc446f13b14/text2speech-1.17.9.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.16.0/4e3eb3d79888d76b54e28b350915b5dc3919c9de/commons-codec-1.16.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.13.0/8bb2bc9b4df17e2411533a0708a69f983bf5e83b/commons-io-2.13.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-buffer/4.1.97.Final/f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f/netty-buffer-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-codec/4.1.97.Final/384ba4d75670befbedb45c4d3b497a93639c206d/netty-codec-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-common/4.1.97.Final/7cceacaf11df8dc63f23d0fb58e9d4640fc88404/netty-common-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-handler/4.1.97.Final/abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36/netty-handler-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-resolver/4.1.97.Final/cec8348108dc76c47cf87c669d514be52c922144/netty-resolver-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-classes-epoll/4.1.97.Final/795da37ded759e862457a82d9d92c4d39ce8ecee/netty-transport-classes-epoll-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-unix-common/4.1.97.Final/d469d84265ab70095b01b40886cabdd433b6e664/netty-transport-native-unix-common-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport/4.1.97.Final/f37380d23c9bb079bc702910833b2fd532c9abd0/netty-transport-4.1.97.Final.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/8.5.12/c24946d46824bd528054bface3231d2ecb7e95e8/fastutil-8.5.12.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna-platform/5.13.0/88e9a306715e9379f3122415ef4ae759a352640d/jna-platform-5.13.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/5.13.0/1200e7ebeedbe0d10062093f32925a912020e747/jna-5.13.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.4/4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c/jopt-simple-5.0.4.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.22/691a8b4e6cf4248c3bc72c8b719337d5cb7359fa/commons-compress-1.22.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.13.0/b7263237aa89c1f99b327197c41d0669707a462e/commons-lang3-3.13.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.5.13/e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada/httpclient-4.5.13.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.4.16/51cf043c87253c9f58b539c9f7e44c8894223850/httpcore-4.4.16.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.19.0/ea1b37f38c327596b216542bc636cfdc0b8036fa/log4j-api-2.19.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.19.0/3b6eeb4de4c49c0fe38a4ee27188ff5fee44d0bb/log4j-core-2.19.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j2-impl/2.19.0/5c04bfdd63ce9dceb2e284b81e96b6a70010ee10/log4j-slf4j2-impl-2.19.0.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.joml/joml/1.10.5/22566d58af70ad3d72308bab63b8339906deb649/joml-1.10.5.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-glfw/3.3.2/757920418805fb90bfebb3d46b1d9e7669fca2eb/lwjgl-glfw-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.3.2/877e17e39ebcd58a9c956dc3b5b777813de0873a/lwjgl-jemalloc-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-openal/3.3.2/ae5357ed6d934546d3533993ea84c0cfb75eed95/lwjgl-openal-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-opengl/3.3.2/ee8e95be0b438602038bc1f02dc5e3d011b1b216/lwjgl-opengl-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-stb/3.3.2/a2550795014d622b686e9caac50b14baa87d2c70/lwjgl-stb-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-tinyfd/3.3.2/9f65c248dd77934105274fcf8351abb75b34327c/lwjgl-tinyfd-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.3.2/4421d94af68e35dcaa31737a6fc59136a1e61b94/lwjgl-3.3.2.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.7/41eb7184ea9d556f23e18b5cb99cad1f8581fc00/slf4j-api-2.0.7.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/54188f271e388e7f313aea995e82f58ce2cdb809/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/5514744c588190ffda076b35a9b8c9f24946a960/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc/fabric-loader/0.15.6/2b6b8b0f6d842b6891f7c9b8b66f2aed12bc2619/fabric-loader-0.15.6.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-api/0.95.1+1.20.4/ffda830e5741660e14e1880e8d6b500acd6f58c5/fabric-api-0.95.1+1.20.4.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-transfer-api-v1/4.0.8+e84342304f/73e97f0c89a1a6968a9aca906771798f15fa9e8a/fabric-transfer-api-v1-4.0.8+e84342304f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-api-lookup-api-v1/1.6.47+82b1bb3e4f/c124f0741fc8382a6c0d8cb5d6841c03c4c2caa5/fabric-api-lookup-api-v1-1.6.47+82b1bb3e4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-blockrenderlayer-v1/1.1.46+78d798af4f/b793b3c0bb84d9d783bb87d34275378a1ddf8e83/fabric-blockrenderlayer-v1-1.1.46+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-client-tags-api-v1/1.1.7+78d798af4f/577e364af3973df0c98b751a3619e32de3bede4f/fabric-client-tags-api-v1-1.1.7+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-command-api-v1/1.2.41+f71b366f4f/d23bc7f105e9b5778e1adba2c2db5ea9f01a701e/fabric-command-api-v1-1.2.41+f71b366f4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-commands-v0/0.2.58+df3654b34f/a0d73370f292d982db5f2554d6d12a99b981c1de/fabric-commands-v0-0.2.58+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-command-api-v2/2.2.20+78d798af4f/677b82cee672380ee6b1c4ef55ce3de48c432f7c/fabric-command-api-v2-2.2.20+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-content-registries-v0/5.0.10+78d798af4f/8134e3618f94384a9693e433c3627dce8658b1d/fabric-content-registries-v0-5.0.10+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-convention-tags-v1/1.5.10+78d798af4f/b740645c14d8ad50a22f96b3fe31a5811268e2df/fabric-convention-tags-v1-1.5.10+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-data-attachment-api-v1/1.0.0+25e1b4764f/4cfb3e55ac61045dcf26cfd8a613de63d820eba8/fabric-data-attachment-api-v1-1.0.0+25e1b4764f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-data-generation-api-v1/13.1.22+78d798af4f/cf1baa373c62b1060c547b043031125505379f93/fabric-data-generation-api-v1-13.1.22+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-dimensions-v1/2.1.61+78d798af4f/5e72a7bba2b985e6cfbe2847ab532005738b18ea/fabric-dimensions-v1-2.1.61+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-entity-events-v1/1.6.0+44c0f8c64f/103717f26767c26f0bcb6021f2efd6af0b05f85f/fabric-entity-events-v1-1.6.0+44c0f8c64f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-events-interaction-v0/0.7.1+389931eb4f/d7ba4324650af01250318a749bb0d100b3e5558e/fabric-events-interaction-v0-0.7.1+389931eb4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-gametest-api-v1/1.3.1+85d85a934f/820fc17dcaef21f342d84f157f84e566ae8f99b6/fabric-gametest-api-v1-1.3.1+85d85a934f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-events-lifecycle-v0/0.2.72+df3654b34f/b678302547e1c1345a097a57558c959643827b97/fabric-events-lifecycle-v0-0.2.72+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-item-api-v1/2.2.0+d6f2b0844f/3e6f9f82988ab3a873387b85e7bf640de19a68d/fabric-item-api-v1-2.2.0+d6f2b0844f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-item-group-api-v1/4.0.21+78d798af4f/5aa795ee96a5da666b13b5925c4682f7c7aac84/fabric-item-group-api-v1-4.0.21+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-mining-level-api-v1/2.1.60+78d798af4f/5338eb20d03abb1a5d487db401700d5064128ad6/fabric-mining-level-api-v1-2.1.60+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-lifecycle-events-v1/2.2.30+78d798af4f/56a8edbc57bcea70fea8569a00dfd103db3e742c/fabric-lifecycle-events-v1-2.2.30+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-loot-api-v2/2.1.5+78d798af4f/7c5c3290a311bc4479cada5ce93882cb58d6eea7/fabric-loot-api-v2-2.1.5+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-message-api-v1/6.0.5+78d798af4f/9c489dc889462ad173bba67c73561cb6373d6235/fabric-message-api-v1-6.0.5+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-models-v0/0.4.7+9386d8a74f/712e73fd37309398ca1bf931fceaa553fbfe94b6/fabric-models-v0-0.4.7+9386d8a74f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-model-loading-api-v1/1.0.8+78d798af4f/4664304d932354285dde4adbcf2c592c4ca5575b/fabric-model-loading-api-v1-1.0.8+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-recipe-api-v1/2.0.20+78d798af4f/2d94159dc550fe2aa01b30c1052618e02c17382e/fabric-recipe-api-v1-2.0.20+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-registry-sync-v0/4.0.18+78d798af4f/4f7c4f1d259560e064f74c05680d8bf21b088480/fabric-registry-sync-v0-4.0.18+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-screen-handler-api-v1/1.3.55+78d798af4f/b87458b229e977410e0d4b4512f3cdbb1375ce89/fabric-screen-handler-api-v1-1.3.55+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-containers-v0/0.1.86+df3654b34f/be22f0b7d07f7fc53c261fec34e36f1b57bc3c51/fabric-containers-v0-0.1.86+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-networking-api-v1/3.1.7+2e5ac5484f/fef6bd9b1cb13ba7432cc160aec3ce90edbb33a0/fabric-networking-api-v1-3.1.7+2e5ac5484f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-object-builder-api-v1/13.0.9+06274a474f/2f1d0c8fbf4de188fb5d3ccdb5f3de29be786966/fabric-object-builder-api-v1-13.0.9+06274a474f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-particles-v1/1.1.7+78d798af4f/f41b647777e82d32904fe9bd14e09e8017c2459b/fabric-particles-v1-1.1.7+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-renderer-indigo/1.5.4+78d798af4f/3ca9d72187eb8bf1a21ccc4ff1236eec65f38ed0/fabric-renderer-indigo-1.5.4+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-renderer-api-v1/3.2.4+78d798af4f/b747e4c3881e5325bcb3b02d77cf7f885a3d8079/fabric-renderer-api-v1-3.2.4+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-rendering-fluids-v1/3.0.33+78d798af4f/336d5278c76e085838317de26624d248c8a7b41f/fabric-rendering-fluids-v1-3.0.33+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-renderer-registries-v1/3.2.52+df3654b34f/601cb74fc9d4df81061ee73715606f1011651cad/fabric-renderer-registries-v1-3.2.52+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-rendering-v0/1.1.55+df3654b34f/767d076262641d9feaf629576182152af5ec41f/fabric-rendering-v0-1.1.55+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-rendering-v1/3.1.0+0d29db764f/2d9802287d2874bfa0a60bccaa3c48835786f96f/fabric-rendering-v1-3.1.0+0d29db764f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-screen-api-v1/2.0.17+78d798af4f/44824b9579221cc7e000303895e2b7a890a20b9c/fabric-screen-api-v1-2.0.17+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-api-base/0.4.36+78d798af4f/6560555069c1211ae3e5b6e81c5b4a28e4cc3356/fabric-api-base-0.4.36+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-biome-api-v1/13.0.16+78d798af4f/ecfec4d609138c728f03d07849c6774de9588aa3/fabric-biome-api-v1-13.0.16+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-block-api-v1/1.0.15+78d798af4f/cddf7ee47ef1dfafda8f5c8c8a57db3883ca3621/fabric-block-api-v1-1.0.15+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-rendering-data-attachment-v1/0.3.42+73761d2e4f/c291e8c0acc137cdbf487cbc98990fc631070130/fabric-rendering-data-attachment-v1-0.3.42+73761d2e4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-block-view-api-v2/1.0.4+78d798af4f/f7d2ae01dc6a03583e9a9e8005a90fca8b175595/fabric-block-view-api-v2-1.0.4+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-crash-report-info-v1/0.2.23+78d798af4f/33a8119a4010c1921287f7770733f19f0822e290/fabric-crash-report-info-v1-0.2.23+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-game-rule-api-v1/1.0.46+78d798af4f/91f6da9bee582669da6b836d08fca2c3fa5e0899/fabric-game-rule-api-v1-1.0.46+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-keybindings-v0/0.2.39+df3654b34f/10e7b0842456da9953aeea93b93490daf56c938b/fabric-keybindings-v0-0.2.39+df3654b34f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-key-binding-api-v1/1.0.41+78d798af4f/b37cf3ccda42fd622185e69cb1ac958ba736c7fc/fabric-key-binding-api-v1-1.0.41+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-resource-conditions-api-v1/2.3.14+78d798af4f/bf4f6c40ef736da550fcbfdde3128f65c3aa28ef/fabric-resource-conditions-api-v1-2.3.14+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-resource-loader-v0/0.11.16+78d798af4f/27e6fe9c7af5e8d6b526e0e6ab705167f1f2e90f/fabric-resource-loader-v0-0.11.16+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-sound-api-v1/1.0.17+78d798af4f/9885ea384b81ebbbd83e9fe6f6e567079c17940b/fabric-sound-api-v1-1.0.17+78d798af4f.jar:/Users/lazuline/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-transitive-access-wideners-v1/5.0.14+78d798af4f/6a92038a05af161e81d40895ff0f7836317053ee/fabric-transitive-access-wideners-v1-5.0.14+78d798af4f.jar:/Users/lazuline/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-merged-intermediary/1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.3-v2/minecraft-merged-intermediary-1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.3-v2.jar \ No newline at end of file diff --git a/LICENSE b/LICENSE index 0cec8e0..1625c17 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,121 @@ -Copyright (c) 2022 AbyssDweller -All rights reserved. +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 586052e..0000000 --- a/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Enhanced Turtle Items (ETI) -#### CurseForge -![CurseForge](https://cf.way2muchnoise.eu/title/735426.svg) ![Downloads](https://cf.way2muchnoise.eu/full_735426_downloads.svg) ![Versions](https://cf.way2muchnoise.eu/versions/For%20MC_735426_all.svg) - -#### Modrinth -![Version](https://img.shields.io/modrinth/v/3xIzvzCc) ![Game Versions](https://img.shields.io/modrinth/game-versions/3xIzvzCc) ![Downloads](https://img.shields.io/modrinth/dt/3xIzvzCc) ![Followers](https://img.shields.io/modrinth/followers/3xIzvzCc) - -## Setup - -For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using. - -## License - -This mod is using the "All Rights Reserved" License diff --git a/build.gradle b/build.gradle index 68661f8..c00aee1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.5-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 - -archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group +base { + archivesName = project.archives_base_name +} + repositories { // Add repositories to retrieve artifacts from in here. // You should only use this when depending on other mods because @@ -26,6 +26,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" } processResources { @@ -37,7 +42,6 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. it.options.release = 17 } @@ -46,11 +50,14 @@ java { // if it is present. // If you remove this line, sources will not be generated. withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}"} + rename { "${it}_${project.base.archivesName.get()}"} } } @@ -69,4 +76,4 @@ publishing { // The repositories here will be used for publishing your artifact, not for // retrieving dependencies. } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a6e912c..d527f01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true # Fabric Properties - # check these on https://fabricmc.net/develop - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.28 - loader_version=0.14.12 +# check these on https://fabricmc.net/develop +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.6 # Mod Properties - mod_version = 0.1.3-1.19.2 - maven_group = net.drakon - archives_base_name = eti +mod_version=1.0.0 +maven_group=xyz.lazuline +archives_base_name=eti # Dependencies - fabric_version=0.72.0+1.19.2 +fabric_version=0.95.1+1.20.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index c53aefa..1aa94a4 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/remappedSrc/net/drakon/enhancedturtleitems/EtiClientMod.java b/remappedSrc/net/drakon/enhancedturtleitems/EtiClientMod.java deleted file mode 100644 index 5cf5f20..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/EtiClientMod.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.drakon.enhancedturtleitems; - -import net.fabricmc.api.ClientModInitializer; - - - - -public class EtiClientMod implements ClientModInitializer { - @Override - public void onInitializeClient() { - } -} diff --git a/remappedSrc/net/drakon/enhancedturtleitems/EtiMod.java b/remappedSrc/net/drakon/enhancedturtleitems/EtiMod.java deleted file mode 100644 index 4aa04cc..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/EtiMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.drakon.enhancedturtleitems; - -import net.drakon.enhancedturtleitems.item.ModItems; -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - - -public class EtiMod implements ModInitializer { - public static final String MOD_ID = "eti"; - public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - - @Override - public void onInitialize() { - ModItems.registerModItems(); - } -} - diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java b/remappedSrc/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java deleted file mode 100644 index b58e9fd..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java +++ /dev/null @@ -1,101 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.Items; -import net.minecraft.recipe.Ingredient; -import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Lazy; - -import java.util.function.Supplier; - -public enum ModArmorMaterials implements ArmorMaterial { - - TURTLE_LEATHER_HELMET("turtle_leather_helmet", 30, new int[]{1, 4, 5, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_CHAINMAIL_HELMET("turtle_chainmail_helmet", 40, new int[]{1, 4, 5, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_GOLD_HELMET("turtle_gold_helmet", 32, new int[]{1, 4, 5, 4}, 24, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_IRON_HELMET("turtle_iron_helmet", 40, new int[]{1, 4, 5, 4}, 13, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_DIAMOND_HELMET("turtle_diamond_helmet", 58, new int[]{1, 4, 5, 5}, 14, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_NETHERITE_HELMET("turtle_netherite_helmet", 62, new int[]{1, 4, 5, 5}, 15, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 1.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }); - - - private static final int[] BASE_DURABILITY; - private final String name; - private final int durabilityMultiplier; - private final int[] protectionAmounts; - private final int enchantability; - private final SoundEvent equipSound; - private final float toughness; - private final float knockbackResistance; - @SuppressWarnings("deprecation") - private final Lazy repairIngredientSupplier; - - private ModArmorMaterials(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Supplier repairIngredientSupplier) { - this.name = name; - this.durabilityMultiplier = durabilityMultiplier; - this.protectionAmounts = protectionAmounts; - this.enchantability = enchantability; - this.equipSound = equipSound; - this.toughness = toughness; - this.knockbackResistance = knockbackResistance; - this.repairIngredientSupplier = new Lazy(repairIngredientSupplier); - } - - private static final int[] PROTECTION_VALUES = new int[]{3, 6, 8, 3}; - - @Override - public int getDurability(EquipmentSlot slot) { - return BASE_DURABILITY[slot.getEntitySlotId()] * this.durabilityMultiplier; - } - - @Override - public int getProtectionAmount(EquipmentSlot slot) { - return this.protectionAmounts[slot.getEntitySlotId()]; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public SoundEvent getEquipSound() { - return this.equipSound; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredientSupplier.get(); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public float getToughness() { - return this.toughness; - } - - @Override - public float getKnockbackResistance() { - return this.knockbackResistance; - } - - static { - BASE_DURABILITY = new int[]{13, 15, 16, 11}; - - } -} - diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/ModItemGroup.java b/remappedSrc/net/drakon/enhancedturtleitems/item/ModItemGroup.java deleted file mode 100644 index ebdf6db..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/ModItemGroup.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -//import net.drakon.enhancedturtleitems.EtiClientMod; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; - -public class ModItemGroup { - public static final ItemGroup ETIGROUP = FabricItemGroupBuilder.build(new Identifier(EtiMod.MOD_ID, "eti"), - () -> new ItemStack(ModItems.TEST)); -} diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/ModItems.java b/remappedSrc/net/drakon/enhancedturtleitems/item/ModItems.java deleted file mode 100644 index 97404af..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/ModItems.java +++ /dev/null @@ -1,149 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.drakon.enhancedturtleitems.item.custom.ModArmorItem; -import net.drakon.enhancedturtleitems.item.custom.ModAxeItem; -import net.drakon.enhancedturtleitems.item.custom.ModHoeItem; -import net.drakon.enhancedturtleitems.item.custom.ModPickaxeItem; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.minecraft.entity.EquipmentSlot; - -//import net.minecraft.item.Item; -//import net.minecraft.item.ShovelItem; -//import net.minecraft.item.SwordItem; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ShovelItem; -import net.minecraft.item.SwordItem; -import net.minecraft.recipe.Ingredient; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class ModItems { - - -// helmets - - public static final Item TURTLE_LEATHER_HELMET = registerItem("turtle_leather_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_LEATHER_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_CHAINMAIL_HELMET = registerItem("turtle_chainmail_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_CHAINMAIL_HELMET, EquipmentSlot.HEAD, - - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_GOLD_HELMET = registerItem("turtle_gold_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_GOLD_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_HELMET = registerItem("turtle_iron_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_IRON_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_HELMET = registerItem("turtle_diamond_helmet", - new ModArmorItem(ModArmorMaterials.TURTLE_DIAMOND_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - - public static final Item TURTLE_NETHERITE_HELMET = registerItem("turtle_netherite_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_NETHERITE_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// misc - public static final Item TEST = registerItem("test", - new Item(new FabricItemSettings().group(ItemGroup.MISC))); - public static final Item TURTLE_INGOT = registerItem("turtle_ingot", - new Item(new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// swords - public static final Item TURTLE_GOLD_SWORD = registerItem("turtle_gold_sword", - new SwordItem(ModToolMaterials.TURTLE_GOLD, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_SWORD = registerItem("turtle_iron_sword", - new SwordItem(ModToolMaterials.TURTLE_IRON, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_SWORD = registerItem("turtle_diamond_sword", - new SwordItem(ModToolMaterials.TURTLE_DIAMOND, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_SWORD = registerItem("turtle_netherite_sword", - new SwordItem(ModToolMaterials.TURTLE_NETHERITE, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// pickaxes - public static final Item TURTLE_GOLD_PICKAXE = registerItem("turtle_gold_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_GOLD, -3, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_PICKAXE = registerItem("turtle_iron_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_IRON, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_PICKAXE = registerItem("turtle_diamond_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_DIAMOND, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_PICKAXE = registerItem("turtle_netherite_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_NETHERITE, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// shovels - public static final Item TURTLE_GOLD_SHOVEL = registerItem("turtle_gold_shovel", - new ShovelItem(ModToolMaterials.TURTLE_GOLD, -2,-3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_IRON_SHOVEL = registerItem("turtle_iron_shovel", - new ShovelItem(ModToolMaterials.TURTLE_IRON, -2, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_DIAMOND_SHOVEL = registerItem("turtle_diamond_shovel", - new ShovelItem(ModToolMaterials.TURTLE_DIAMOND, -2, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_NETHERITE_SHOVEL = registerItem("turtle_netherite_shovel", - new ShovelItem(ModToolMaterials.TURTLE_NETHERITE, -1, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - -// Axes - public static final Item TURTLE_GOLD_AXE = registerItem("turtle_gold_axe", - new ModAxeItem(ModToolMaterials.TURTLE_GOLD, 3, -2.85f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_AXE = registerItem("turtle_iron_axe", - new ModAxeItem(ModToolMaterials.TURTLE_IRON, 2, -2.9f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_AXE = registerItem("turtle_diamond_axe", - new ModAxeItem(ModToolMaterials.TURTLE_DIAMOND, 2, -2.75f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_AXE = registerItem("turtle_netherite_axe", - new ModAxeItem(ModToolMaterials.TURTLE_NETHERITE, 2, -2.75f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// Hoes - - public static final Item TURTLE_GOLD_HOE= registerItem("turtle_gold_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_GOLD, -3, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_HOE= registerItem("turtle_iron_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_IRON, -5, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_HOE= registerItem("turtle_diamond_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_DIAMOND, -6, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_HOE= registerItem("turtle_netherite_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_NETHERITE, -7,0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - - - - private static Item registerItem(String name, Item item) { - return Registry.register(Registry.ITEM, new Identifier(EtiMod.MOD_ID, name), item); - } - - public static void registerModItems() { - EtiMod.LOGGER.info("Registering Mod Items for " + EtiMod.MOD_ID); - } -} diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/ModToolMaterials.java b/remappedSrc/net/drakon/enhancedturtleitems/item/ModToolMaterials.java deleted file mode 100644 index 0c3cf81..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/ModToolMaterials.java +++ /dev/null @@ -1,83 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.fabricmc.yarn.constants.MiningLevels; -import net.minecraft.item.ToolMaterial; -import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Lazy; - -import java.util.function.Supplier; - -public enum ModToolMaterials implements ToolMaterial { - TURTLE_GOLD(MiningLevels.STONE, 132, 1.5f, 3.5f, 22, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_IRON(MiningLevels.IRON, 350, 2.0f, 5.5f, 14, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_DIAMOND(MiningLevels.DIAMOND, 1661, 8.0f, 6.5f, 10, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_NETHERITE(MiningLevels.NETHERITE, 2131, 9.0f, 7.5f, 15, () -> { - return Ingredient.ofItems(ModItems.TEST); -}); - -/* -storing values for future uses -3.5 -5.5 -6.5 -7.5 - */ - - /* Vanilla Settings - WOOD(0, 59, 2.0f, 0.0f, 15, () -> Ingredient.of(ItemTags.PLANKS)), - STONE(1, 131, 4.0f, 1.0f, 5, () -> Ingredient.of(ItemTags.STONE_TOOL_MATERIALS)), - IRON(2, 250, 6.0f, 2.0f, 14, () -> Ingredient.of(Items.IRON_INGOT)), - DIAMOND(3, 1561, 8.0f, 3.0f, 10, () -> Ingredient.of(Items.DIAMOND)), - GOLD(0, 32, 12.0f, 0.0f, 22, () -> Ingredient.of(Items.GOLD_INGOT)), - NETHERITE(4, 2031, 9.0f, 4.0f, 15, () -> Ingredient.of(Items.NETHERITE_INGOT)); - */ - private final int miningLevel; - private final int itemDurability; - private final float miningSpeed; - private final float attackDamage; - private final int enchantability; - private final Lazy repairIngredient; - - ModToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { - this.miningLevel = miningLevel; - this.itemDurability = itemDurability; - this.miningSpeed = miningSpeed; - this.attackDamage = attackDamage; - this.enchantability = enchantability; - this.repairIngredient = new Lazy(repairIngredient); - } - - - @Override - public int getDurability() { - return this.itemDurability; - } - - @Override - public float getMiningSpeedMultiplier() { - return this.miningSpeed; - } - - @Override - public float getAttackDamage() { - return this.attackDamage; - } - - @Override - public int getMiningLevel() { - return this.miningLevel; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } -} diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java b/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java deleted file mode 100644 index cdf2c72..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; -import com.google.common.collect.ImmutableMap; -import net.drakon.enhancedturtleitems.item.ModArmorMaterials; -import net.minecraft.entity.Entity; -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.ArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.Map; - -public class ModArmorItem extends ArmorItem { - private static final Map MATERIAL_TO_EFFECT_MAP = - (new ImmutableMap.Builder()) - .put(ModArmorMaterials.TURTLE_IRON_HELMET, - new StatusEffectInstance(StatusEffects.WATER_BREATHING, 1, 0)).build(); - public ModArmorItem(ArmorMaterial material, EquipmentSlot slot, Settings settings) { - super(material, slot, settings); - } - - @Override - public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { - if(!world.isClient()) { - if(entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity)entity; - - if(hasFullSuitOfArmorOn(player)) { - evaluateArmorEffects(player); - } - } - } - - super.inventoryTick(stack, world, entity, slot, selected); - } - - private void evaluateArmorEffects(PlayerEntity player) { - for (Map.Entry entry : MATERIAL_TO_EFFECT_MAP.entrySet()) { - ArmorMaterial mapArmorMaterial = entry.getKey(); - StatusEffectInstance mapStatusEffect = entry.getValue(); - - if(hasCorrectArmorOn(mapArmorMaterial, player)) { - addStatusEffectForMaterial(player, mapArmorMaterial, mapStatusEffect); - } - } - } - - private void addStatusEffectForMaterial(PlayerEntity player, ArmorMaterial mapArmorMaterial, StatusEffectInstance mapStatusEffect) { - boolean hasPlayerEffect = player.hasStatusEffect(mapStatusEffect.getEffectType()); - - if(hasCorrectArmorOn(mapArmorMaterial, player) && !hasPlayerEffect) { - player.addStatusEffect(new StatusEffectInstance(mapStatusEffect.getEffectType(), - mapStatusEffect.getDuration(), mapStatusEffect.getAmplifier())); - - // if(new Random().nextFloat() > 0.6f) { // 40% of damaging the armor! Possibly! - // player.getInventory().damageArmor(DamageSource.MAGIC, 1f, new int[]{0, 1, 2, 3}); - // } - } - } - - private boolean hasFullSuitOfArmorOn(PlayerEntity player) { - ItemStack helmet = player.getInventory().getArmorStack(3); - - return !helmet.isEmpty(); - - } - - private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) { - ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem()); - - return helmet.getMaterial() == material; - } -} \ No newline at end of file diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java b/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java deleted file mode 100644 index 93e19f3..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.AxeItem; -import net.minecraft.item.ToolMaterial; - -public class ModAxeItem extends AxeItem { - public ModAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java b/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java deleted file mode 100644 index 2f8537f..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.HoeItem; -import net.minecraft.item.ToolMaterial; - -public class ModHoeItem extends HoeItem { - public ModHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} \ No newline at end of file diff --git a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java b/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java deleted file mode 100644 index fa325ad..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ToolMaterial; - -public class ModPickaxeItem extends PickaxeItem { - public ModPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} \ No newline at end of file diff --git a/remappedSrc/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java b/remappedSrc/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java deleted file mode 100644 index 8e50b31..0000000 --- a/remappedSrc/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.drakon.enhancedturtleitems.mixin; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.minecraft.client.gui.screen.TitleScreen; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - EtiMod.LOGGER.info("This line is printed by an enhancedturtleitems mod mixin!"); - } -} diff --git a/settings.gradle b/settings.gradle index b02216b..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } -} + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/net/drakon/enhancedturtleitems/EtiClientMod.java b/src/main/java/net/drakon/enhancedturtleitems/EtiClientMod.java deleted file mode 100644 index 5cf5f20..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/EtiClientMod.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.drakon.enhancedturtleitems; - -import net.fabricmc.api.ClientModInitializer; - - - - -public class EtiClientMod implements ClientModInitializer { - @Override - public void onInitializeClient() { - } -} diff --git a/src/main/java/net/drakon/enhancedturtleitems/EtiMod.java b/src/main/java/net/drakon/enhancedturtleitems/EtiMod.java deleted file mode 100644 index 4aa04cc..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/EtiMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.drakon.enhancedturtleitems; - -import net.drakon.enhancedturtleitems.item.ModItems; -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - - -public class EtiMod implements ModInitializer { - public static final String MOD_ID = "eti"; - public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - - @Override - public void onInitialize() { - ModItems.registerModItems(); - } -} - diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java b/src/main/java/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java deleted file mode 100644 index b58e9fd..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/ModArmorMaterials.java +++ /dev/null @@ -1,101 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.Items; -import net.minecraft.recipe.Ingredient; -import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Lazy; - -import java.util.function.Supplier; - -public enum ModArmorMaterials implements ArmorMaterial { - - TURTLE_LEATHER_HELMET("turtle_leather_helmet", 30, new int[]{1, 4, 5, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_CHAINMAIL_HELMET("turtle_chainmail_helmet", 40, new int[]{1, 4, 5, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_GOLD_HELMET("turtle_gold_helmet", 32, new int[]{1, 4, 5, 4}, 24, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_IRON_HELMET("turtle_iron_helmet", 40, new int[]{1, 4, 5, 4}, 13, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_DIAMOND_HELMET("turtle_diamond_helmet", 58, new int[]{1, 4, 5, 5}, 14, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_NETHERITE_HELMET("turtle_netherite_helmet", 62, new int[]{1, 4, 5, 5}, 15, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 1.0F, () -> { - return Ingredient.ofItems(ModItems.TEST); - }); - - - private static final int[] BASE_DURABILITY; - private final String name; - private final int durabilityMultiplier; - private final int[] protectionAmounts; - private final int enchantability; - private final SoundEvent equipSound; - private final float toughness; - private final float knockbackResistance; - @SuppressWarnings("deprecation") - private final Lazy repairIngredientSupplier; - - private ModArmorMaterials(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Supplier repairIngredientSupplier) { - this.name = name; - this.durabilityMultiplier = durabilityMultiplier; - this.protectionAmounts = protectionAmounts; - this.enchantability = enchantability; - this.equipSound = equipSound; - this.toughness = toughness; - this.knockbackResistance = knockbackResistance; - this.repairIngredientSupplier = new Lazy(repairIngredientSupplier); - } - - private static final int[] PROTECTION_VALUES = new int[]{3, 6, 8, 3}; - - @Override - public int getDurability(EquipmentSlot slot) { - return BASE_DURABILITY[slot.getEntitySlotId()] * this.durabilityMultiplier; - } - - @Override - public int getProtectionAmount(EquipmentSlot slot) { - return this.protectionAmounts[slot.getEntitySlotId()]; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public SoundEvent getEquipSound() { - return this.equipSound; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredientSupplier.get(); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public float getToughness() { - return this.toughness; - } - - @Override - public float getKnockbackResistance() { - return this.knockbackResistance; - } - - static { - BASE_DURABILITY = new int[]{13, 15, 16, 11}; - - } -} - diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/ModItemGroup.java b/src/main/java/net/drakon/enhancedturtleitems/item/ModItemGroup.java deleted file mode 100644 index ebdf6db..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/ModItemGroup.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -//import net.drakon.enhancedturtleitems.EtiClientMod; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; - -public class ModItemGroup { - public static final ItemGroup ETIGROUP = FabricItemGroupBuilder.build(new Identifier(EtiMod.MOD_ID, "eti"), - () -> new ItemStack(ModItems.TEST)); -} diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/ModItems.java b/src/main/java/net/drakon/enhancedturtleitems/item/ModItems.java deleted file mode 100644 index 20b2f6b..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/ModItems.java +++ /dev/null @@ -1,153 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.drakon.enhancedturtleitems.item.custom.ModArmorItem; -import net.drakon.enhancedturtleitems.item.custom.ModAxeItem; -import net.drakon.enhancedturtleitems.item.custom.ModHoeItem; -import net.drakon.enhancedturtleitems.item.custom.ModPickaxeItem; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.minecraft.entity.EquipmentSlot; - -//import net.minecraft.item.Item; -//import net.minecraft.item.ShovelItem; -//import net.minecraft.item.SwordItem; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ShovelItem; -import net.minecraft.item.SwordItem; -import net.minecraft.recipe.Ingredient; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class ModItems { - -/* -planned -Add the bow,crossbow, and harpoon. -textures 100% -coding 0% -*/ - - -// helmets - - public static final Item TURTLE_LEATHER_HELMET = registerItem("turtle_leather_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_LEATHER_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_CHAINMAIL_HELMET = registerItem("turtle_chainmail_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_CHAINMAIL_HELMET, EquipmentSlot.HEAD, - - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_GOLD_HELMET = registerItem("turtle_gold_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_GOLD_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_HELMET = registerItem("turtle_iron_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_IRON_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_HELMET = registerItem("turtle_diamond_helmet", - new ModArmorItem(ModArmorMaterials.TURTLE_DIAMOND_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - - public static final Item TURTLE_NETHERITE_HELMET = registerItem("turtle_netherite_helmet", - new ArmorItem(ModArmorMaterials.TURTLE_NETHERITE_HELMET, EquipmentSlot.HEAD, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// misc - public static final Item TEST = registerItem("test", - new Item(new FabricItemSettings().group(ItemGroup.MISC))); - public static final Item TURTLE_INGOT = registerItem("turtle_ingot", - new Item(new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// swords - public static final Item TURTLE_GOLD_SWORD = registerItem("turtle_gold_sword", - new SwordItem(ModToolMaterials.TURTLE_GOLD, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_SWORD = registerItem("turtle_iron_sword", - new SwordItem(ModToolMaterials.TURTLE_IRON, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_SWORD = registerItem("turtle_diamond_sword", - new SwordItem(ModToolMaterials.TURTLE_DIAMOND, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_SWORD = registerItem("turtle_netherite_sword", - new SwordItem(ModToolMaterials.TURTLE_NETHERITE, 0, -2.25f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// pickaxes - public static final Item TURTLE_GOLD_PICKAXE = registerItem("turtle_gold_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_GOLD, -3, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_PICKAXE = registerItem("turtle_iron_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_IRON, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_PICKAXE = registerItem("turtle_diamond_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_DIAMOND, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_PICKAXE = registerItem("turtle_netherite_pickaxe", - new ModPickaxeItem(ModToolMaterials.TURTLE_NETHERITE, -2, -2.8f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// shovels - public static final Item TURTLE_GOLD_SHOVEL = registerItem("turtle_gold_shovel", - new ShovelItem(ModToolMaterials.TURTLE_GOLD, -2,-3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_IRON_SHOVEL = registerItem("turtle_iron_shovel", - new ShovelItem(ModToolMaterials.TURTLE_IRON, -2, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_DIAMOND_SHOVEL = registerItem("turtle_diamond_shovel", - new ShovelItem(ModToolMaterials.TURTLE_DIAMOND, -2, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - public static final Item TURTLE_NETHERITE_SHOVEL = registerItem("turtle_netherite_shovel", - new ShovelItem(ModToolMaterials.TURTLE_NETHERITE, -1, -3f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - -// Axes - public static final Item TURTLE_GOLD_AXE = registerItem("turtle_gold_axe", - new ModAxeItem(ModToolMaterials.TURTLE_GOLD, 3, -2.85f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_AXE = registerItem("turtle_iron_axe", - new ModAxeItem(ModToolMaterials.TURTLE_IRON, 2, -2.9f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_AXE = registerItem("turtle_diamond_axe", - new ModAxeItem(ModToolMaterials.TURTLE_DIAMOND, 2, -2.75f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_AXE = registerItem("turtle_netherite_axe", - new ModAxeItem(ModToolMaterials.TURTLE_NETHERITE, 2, -2.75f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); -// Hoes - - public static final Item TURTLE_GOLD_HOE= registerItem("turtle_gold_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_GOLD, -3, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_IRON_HOE= registerItem("turtle_iron_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_IRON, -5, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_DIAMOND_HOE= registerItem("turtle_diamond_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_DIAMOND, -6, 0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - public static final Item TURTLE_NETHERITE_HOE= registerItem("turtle_netherite_hoe", - new ModHoeItem(ModToolMaterials.TURTLE_NETHERITE, -7,0f, - new FabricItemSettings().group(ModItemGroup.ETIGROUP))); - - private static Item registerItem(String name, Item item) { - return Registry.register(Registry.ITEM, new Identifier(EtiMod.MOD_ID, name), item); - } - - public static void registerModItems() { - EtiMod.LOGGER.info("Registering Mod Items for " + EtiMod.MOD_ID); - } -} diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/ModToolMaterials.java b/src/main/java/net/drakon/enhancedturtleitems/item/ModToolMaterials.java deleted file mode 100644 index 0c3cf81..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/ModToolMaterials.java +++ /dev/null @@ -1,83 +0,0 @@ -package net.drakon.enhancedturtleitems.item; - -import net.fabricmc.yarn.constants.MiningLevels; -import net.minecraft.item.ToolMaterial; -import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Lazy; - -import java.util.function.Supplier; - -public enum ModToolMaterials implements ToolMaterial { - TURTLE_GOLD(MiningLevels.STONE, 132, 1.5f, 3.5f, 22, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_IRON(MiningLevels.IRON, 350, 2.0f, 5.5f, 14, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_DIAMOND(MiningLevels.DIAMOND, 1661, 8.0f, 6.5f, 10, () -> { - return Ingredient.ofItems(ModItems.TEST); - }), TURTLE_NETHERITE(MiningLevels.NETHERITE, 2131, 9.0f, 7.5f, 15, () -> { - return Ingredient.ofItems(ModItems.TEST); -}); - -/* -storing values for future uses -3.5 -5.5 -6.5 -7.5 - */ - - /* Vanilla Settings - WOOD(0, 59, 2.0f, 0.0f, 15, () -> Ingredient.of(ItemTags.PLANKS)), - STONE(1, 131, 4.0f, 1.0f, 5, () -> Ingredient.of(ItemTags.STONE_TOOL_MATERIALS)), - IRON(2, 250, 6.0f, 2.0f, 14, () -> Ingredient.of(Items.IRON_INGOT)), - DIAMOND(3, 1561, 8.0f, 3.0f, 10, () -> Ingredient.of(Items.DIAMOND)), - GOLD(0, 32, 12.0f, 0.0f, 22, () -> Ingredient.of(Items.GOLD_INGOT)), - NETHERITE(4, 2031, 9.0f, 4.0f, 15, () -> Ingredient.of(Items.NETHERITE_INGOT)); - */ - private final int miningLevel; - private final int itemDurability; - private final float miningSpeed; - private final float attackDamage; - private final int enchantability; - private final Lazy repairIngredient; - - ModToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { - this.miningLevel = miningLevel; - this.itemDurability = itemDurability; - this.miningSpeed = miningSpeed; - this.attackDamage = attackDamage; - this.enchantability = enchantability; - this.repairIngredient = new Lazy(repairIngredient); - } - - - @Override - public int getDurability() { - return this.itemDurability; - } - - @Override - public float getMiningSpeedMultiplier() { - return this.miningSpeed; - } - - @Override - public float getAttackDamage() { - return this.attackDamage; - } - - @Override - public int getMiningLevel() { - return this.miningLevel; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } -} diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java b/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java deleted file mode 100644 index cdf2c72..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModArmorItem.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; -import com.google.common.collect.ImmutableMap; -import net.drakon.enhancedturtleitems.item.ModArmorMaterials; -import net.minecraft.entity.Entity; -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.ArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.Map; - -public class ModArmorItem extends ArmorItem { - private static final Map MATERIAL_TO_EFFECT_MAP = - (new ImmutableMap.Builder()) - .put(ModArmorMaterials.TURTLE_IRON_HELMET, - new StatusEffectInstance(StatusEffects.WATER_BREATHING, 1, 0)).build(); - public ModArmorItem(ArmorMaterial material, EquipmentSlot slot, Settings settings) { - super(material, slot, settings); - } - - @Override - public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { - if(!world.isClient()) { - if(entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity)entity; - - if(hasFullSuitOfArmorOn(player)) { - evaluateArmorEffects(player); - } - } - } - - super.inventoryTick(stack, world, entity, slot, selected); - } - - private void evaluateArmorEffects(PlayerEntity player) { - for (Map.Entry entry : MATERIAL_TO_EFFECT_MAP.entrySet()) { - ArmorMaterial mapArmorMaterial = entry.getKey(); - StatusEffectInstance mapStatusEffect = entry.getValue(); - - if(hasCorrectArmorOn(mapArmorMaterial, player)) { - addStatusEffectForMaterial(player, mapArmorMaterial, mapStatusEffect); - } - } - } - - private void addStatusEffectForMaterial(PlayerEntity player, ArmorMaterial mapArmorMaterial, StatusEffectInstance mapStatusEffect) { - boolean hasPlayerEffect = player.hasStatusEffect(mapStatusEffect.getEffectType()); - - if(hasCorrectArmorOn(mapArmorMaterial, player) && !hasPlayerEffect) { - player.addStatusEffect(new StatusEffectInstance(mapStatusEffect.getEffectType(), - mapStatusEffect.getDuration(), mapStatusEffect.getAmplifier())); - - // if(new Random().nextFloat() > 0.6f) { // 40% of damaging the armor! Possibly! - // player.getInventory().damageArmor(DamageSource.MAGIC, 1f, new int[]{0, 1, 2, 3}); - // } - } - } - - private boolean hasFullSuitOfArmorOn(PlayerEntity player) { - ItemStack helmet = player.getInventory().getArmorStack(3); - - return !helmet.isEmpty(); - - } - - private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) { - ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem()); - - return helmet.getMaterial() == material; - } -} \ No newline at end of file diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java b/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java deleted file mode 100644 index 93e19f3..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModAxeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.AxeItem; -import net.minecraft.item.ToolMaterial; - -public class ModAxeItem extends AxeItem { - public ModAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java b/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java deleted file mode 100644 index 2f8537f..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModHoeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.HoeItem; -import net.minecraft.item.ToolMaterial; - -public class ModHoeItem extends HoeItem { - public ModHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} \ No newline at end of file diff --git a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java b/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java deleted file mode 100644 index fa325ad..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/item/custom/ModPickaxeItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.drakon.enhancedturtleitems.item.custom; - -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ToolMaterial; - -public class ModPickaxeItem extends PickaxeItem { - public ModPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} \ No newline at end of file diff --git a/src/main/java/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java b/src/main/java/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java deleted file mode 100644 index 8e50b31..0000000 --- a/src/main/java/net/drakon/enhancedturtleitems/mixin/ExampleMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.drakon.enhancedturtleitems.mixin; - -import net.drakon.enhancedturtleitems.EtiMod; -import net.minecraft.client.gui.screen.TitleScreen; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - EtiMod.LOGGER.info("This line is printed by an enhancedturtleitems mod mixin!"); - } -} diff --git a/src/main/java/xyz/lazuline/Enhancedturtleitems.java b/src/main/java/xyz/lazuline/Enhancedturtleitems.java new file mode 100644 index 0000000..6ad5958 --- /dev/null +++ b/src/main/java/xyz/lazuline/Enhancedturtleitems.java @@ -0,0 +1,22 @@ +package xyz.lazuline; + +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Enhancedturtleitems implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("eti"); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + LOGGER.info("Hello from ETI :3"); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/lazuline/mixin/ExampleMixin.java b/src/main/java/xyz/lazuline/mixin/ExampleMixin.java new file mode 100644 index 0000000..602b980 --- /dev/null +++ b/src/main/java/xyz/lazuline/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package xyz.lazuline.mixin; + +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadWorld") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadWorld()V + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/eti/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/eti/icon.png diff --git a/src/main/resources/assets/eti/lang/en_us.json b/src/main/resources/assets/eti/lang/en_us.json deleted file mode 100644 index 183efdb..0000000 --- a/src/main/resources/assets/eti/lang/en_us.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "item.eti.turtle_leather_helmet": "Leather Enhanced Turtle Helmet", - "item.eti.turtle_chainmail_helmet": "Chainmail Enhanced Turtle Helmet", - "item.eti.turtle_gold_helmet": "Gold Enhanced Turtle Helmet", - "item.eti.turtle_iron_helmet": "Iron Enhanced Turtle Helmet", - "item.eti.turtle_diamond_helmet": "Diamond Enhanced Turtle Helmet", - "item.eti.turtle_netherite_helmet": "Netherite Enhanced Turtle Helmet", - - "item.eti.test": "Test", - "item.eti.turtle_ingot": "Turtle Ingot", - - "item.eti.turtle_gold_sword": "Gold Enhanced Turtle Sword", - "item.eti.turtle_iron_sword": "Iron Enhanced Turtle Sword", - "item.eti.turtle_diamond_sword": "Diamond Enhanced Turtle Sword", - "item.eti.turtle_netherite_sword": "Netherite Enhanced Turtle Sword", - - "item.eti.turtle_gold_pickaxe": "Gold Enhanced Turtle Pickaxe", - "item.eti.turtle_iron_pickaxe": "Iron Enhanced Turtle Pickaxe", - "item.eti.turtle_diamond_pickaxe": "Diamond Enhanced Turtle Pickaxe", - "item.eti.turtle_netherite_pickaxe": "Netherite Enhanced Turtle Pickaxe", - - "item.eti.turtle_gold_shovel": "Gold Enhanced Turtle Shovel", - "item.eti.turtle_iron_shovel": "Iron Enhanced Turtle Shovel", - "item.eti.turtle_diamond_shovel": "Diamond Enhanced Turtle Shovel", - "item.eti.turtle_netherite_shovel": "Netherite Enhanced Turtle Shovel", - - "item.eti.turtle_gold_axe": "Gold Enhanced Turtle Axe", - "item.eti.turtle_iron_axe": "Iron Enhanced Turtle Axe", - "item.eti.turtle_diamond_axe": "Diamond Enhanced Turtle Axe", - "item.eti.turtle_netherite_axe": "Netherite Enhanced Turtle Axe", - - "item.eti.turtle_gold_hoe": "Gold Enhanced Turtle Hoe", - "item.eti.turtle_iron_hoe": "Iron Enhanced Turtle Hoe", - "item.eti.turtle_diamond_hoe": "Diamond Enhanced Turtle Hoe", - "item.eti.turtle_netherite_hoe": "Netherite Enhanced Turtle Hoe", - - - "itemGroup.eti.eti": "Enhanced Turtle Items" - -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/test.json b/src/main/resources/assets/eti/models/item/test.json deleted file mode 100644 index 0cb113d..0000000 --- a/src/main/resources/assets/eti/models/item/test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/test" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_chainmail_helmet.json b/src/main/resources/assets/eti/models/item/turtle_chainmail_helmet.json deleted file mode 100644 index c9f6bf3..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_chainmail_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_chainmail_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_axe.json b/src/main/resources/assets/eti/models/item/turtle_diamond_axe.json deleted file mode 100644 index 3ce9e11..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_diamond_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_helmet.json b/src/main/resources/assets/eti/models/item/turtle_diamond_helmet.json deleted file mode 100644 index 9ac7366..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_diamond_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_hoe.json b/src/main/resources/assets/eti/models/item/turtle_diamond_hoe.json deleted file mode 100644 index 1e23d9a..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_diamond_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_pickaxe.json b/src/main/resources/assets/eti/models/item/turtle_diamond_pickaxe.json deleted file mode 100644 index 047f39d..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_diamond_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_shovel.json b/src/main/resources/assets/eti/models/item/turtle_diamond_shovel.json deleted file mode 100644 index 3da121d..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_diamond_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_diamond_sword.json b/src/main/resources/assets/eti/models/item/turtle_diamond_sword.json deleted file mode 100644 index 269093a..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_diamond_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_diamond_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_axe.json b/src/main/resources/assets/eti/models/item/turtle_gold_axe.json deleted file mode 100644 index 912c6e6..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_gold_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_helmet.json b/src/main/resources/assets/eti/models/item/turtle_gold_helmet.json deleted file mode 100644 index 4ebfd4f..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_gold_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_hoe.json b/src/main/resources/assets/eti/models/item/turtle_gold_hoe.json deleted file mode 100644 index 5679e00..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_gold_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_pickaxe.json b/src/main/resources/assets/eti/models/item/turtle_gold_pickaxe.json deleted file mode 100644 index 728c662..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_gold_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_shovel.json b/src/main/resources/assets/eti/models/item/turtle_gold_shovel.json deleted file mode 100644 index d664efb..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_gold_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_gold_sword.json b/src/main/resources/assets/eti/models/item/turtle_gold_sword.json deleted file mode 100644 index 0241c2f..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_gold_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_gold_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_ingot.json b/src/main/resources/assets/eti/models/item/turtle_ingot.json deleted file mode 100644 index 57c9014..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_axe.json b/src/main/resources/assets/eti/models/item/turtle_iron_axe.json deleted file mode 100644 index 02dafb1..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_iron_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_helmet.json b/src/main/resources/assets/eti/models/item/turtle_iron_helmet.json deleted file mode 100644 index aa61b23..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_iron_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_hoe.json b/src/main/resources/assets/eti/models/item/turtle_iron_hoe.json deleted file mode 100644 index 865d75e..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_iron_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_pickaxe.json b/src/main/resources/assets/eti/models/item/turtle_iron_pickaxe.json deleted file mode 100644 index 2a14bb9..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_iron_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_shovel.json b/src/main/resources/assets/eti/models/item/turtle_iron_shovel.json deleted file mode 100644 index 79e3f58..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_iron_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_iron_sword.json b/src/main/resources/assets/eti/models/item/turtle_iron_sword.json deleted file mode 100644 index db385d8..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_iron_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_iron_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_leather_helmet.json b/src/main/resources/assets/eti/models/item/turtle_leather_helmet.json deleted file mode 100644 index 0b81eca..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_leather_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_leather_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_axe.json b/src/main/resources/assets/eti/models/item/turtle_netherite_axe.json deleted file mode 100644 index 8352254..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_netherite_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_helmet.json b/src/main/resources/assets/eti/models/item/turtle_netherite_helmet.json deleted file mode 100644 index 94ea691..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "eti:item/turtle_netherite_helmet" - } -} diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_hoe.json b/src/main/resources/assets/eti/models/item/turtle_netherite_hoe.json deleted file mode 100644 index d003e49..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_netherite_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_pickaxe.json b/src/main/resources/assets/eti/models/item/turtle_netherite_pickaxe.json deleted file mode 100644 index ee8dbdb..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_netherite_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_shovel.json b/src/main/resources/assets/eti/models/item/turtle_netherite_shovel.json deleted file mode 100644 index c0504f4..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_netherite_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/models/item/turtle_netherite_sword.json b/src/main/resources/assets/eti/models/item/turtle_netherite_sword.json deleted file mode 100644 index 53deb07..0000000 --- a/src/main/resources/assets/eti/models/item/turtle_netherite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "eti:item/turtle_netherite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/eti/textures/item/harpoon.png b/src/main/resources/assets/eti/textures/item/harpoon.png deleted file mode 100644 index 4228c04..0000000 Binary files a/src/main/resources/assets/eti/textures/item/harpoon.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/test.png b/src/main/resources/assets/eti/textures/item/test.png deleted file mode 100644 index 9ea13b8..0000000 Binary files a/src/main/resources/assets/eti/textures/item/test.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_bow.png b/src/main/resources/assets/eti/textures/item/turtle_bow.png deleted file mode 100644 index 37f9f39..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_bow.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_0.png b/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_0.png deleted file mode 100644 index 881b7c3..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_1.png b/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_1.png deleted file mode 100644 index a05f05c..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_2.png b/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_2.png deleted file mode 100644 index 243f8e5..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_bow_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_chainmail_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_chainmail_helmet.png deleted file mode 100644 index a9e3841..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_chainmail_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow.png deleted file mode 100644 index 729e479..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow_firework.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow_firework.png deleted file mode 100644 index a6ef906..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow_firework.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow_harpoon.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow_harpoon.png deleted file mode 100644 index e4da92d..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow_harpoon.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_0.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_0.png deleted file mode 100644 index de87b42..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_1.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_1.png deleted file mode 100644 index 6784361..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_2.png b/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_2.png deleted file mode 100644 index 52846e7..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_crossbow_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_axe.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_axe.png deleted file mode 100644 index e62d79e..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_axe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_helmet.png deleted file mode 100644 index fd7c2b3..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_hoe.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_hoe.png deleted file mode 100644 index 91d2a52..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_pickaxe.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_pickaxe.png deleted file mode 100644 index 0ca87fb..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_shovel.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_shovel.png deleted file mode 100644 index 308854f..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_diamond_sword.png b/src/main/resources/assets/eti/textures/item/turtle_diamond_sword.png deleted file mode 100644 index 686ce36..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_diamond_sword.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_axe.png b/src/main/resources/assets/eti/textures/item/turtle_gold_axe.png deleted file mode 100644 index d8a9c87..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_axe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_gold_helmet.png deleted file mode 100644 index d9c766a..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_hoe.png b/src/main/resources/assets/eti/textures/item/turtle_gold_hoe.png deleted file mode 100644 index b306c0b..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_pickaxe.png b/src/main/resources/assets/eti/textures/item/turtle_gold_pickaxe.png deleted file mode 100644 index 1399b6b..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_shovel.png b/src/main/resources/assets/eti/textures/item/turtle_gold_shovel.png deleted file mode 100644 index a3e10e2..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_gold_sword.png b/src/main/resources/assets/eti/textures/item/turtle_gold_sword.png deleted file mode 100644 index 0c5a093..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_gold_sword.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_ingot.png b/src/main/resources/assets/eti/textures/item/turtle_ingot.png deleted file mode 100644 index b3b3fe6..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_ingot.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_axe.png b/src/main/resources/assets/eti/textures/item/turtle_iron_axe.png deleted file mode 100644 index a4b2b9f..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_axe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_iron_helmet.png deleted file mode 100644 index 4deeb21..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_hoe.png b/src/main/resources/assets/eti/textures/item/turtle_iron_hoe.png deleted file mode 100644 index a82b187..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_pickaxe.png b/src/main/resources/assets/eti/textures/item/turtle_iron_pickaxe.png deleted file mode 100644 index 8afbe1e..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_shovel.png b/src/main/resources/assets/eti/textures/item/turtle_iron_shovel.png deleted file mode 100644 index ce7c450..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_iron_sword.png b/src/main/resources/assets/eti/textures/item/turtle_iron_sword.png deleted file mode 100644 index e6dead7..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_iron_sword.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_leather_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_leather_helmet.png deleted file mode 100644 index 13dc4b2..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_leather_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_leather_helmet_overlay.png b/src/main/resources/assets/eti/textures/item/turtle_leather_helmet_overlay.png deleted file mode 100644 index 974ea2e..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_leather_helmet_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_axe.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_axe.png deleted file mode 100644 index e895d00..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_axe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_helmet.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_helmet.png deleted file mode 100644 index ac929df..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_hoe.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_hoe.png deleted file mode 100644 index eebc592..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_pickaxe.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_pickaxe.png deleted file mode 100644 index a21d6ec..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_shovel.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_shovel.png deleted file mode 100644 index f376275..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/eti/textures/item/turtle_netherite_sword.png b/src/main/resources/assets/eti/textures/item/turtle_netherite_sword.png deleted file mode 100644 index c2a2b9b..0000000 Binary files a/src/main/resources/assets/eti/textures/item/turtle_netherite_sword.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_chainmail_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_chainmail_helmet_layer_1.png deleted file mode 100644 index f1dbd4d..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_chainmail_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_diamond_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_diamond_helmet_layer_1.png deleted file mode 100644 index fe5ebc0..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_diamond_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_gold_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_gold_helmet_layer_1.png deleted file mode 100644 index 4d183da..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_gold_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_iron_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_iron_helmet_layer_1.png deleted file mode 100644 index 50169e0..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_iron_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1.png deleted file mode 100644 index 3124897..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1_overlay.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1_overlay.png deleted file mode 100644 index 1884758..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_leather_helmet_layer_1_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/turtle_netherite_helmet_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/turtle_netherite_helmet_layer_1.png deleted file mode 100644 index 24766dd..0000000 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/turtle_netherite_helmet_layer_1.png and /dev/null differ diff --git a/src/main/resources/data/eti/recipes/diamondswordtonetherite.json b/src/main/resources/data/eti/recipes/diamondswordtonetherite.json deleted file mode 100644 index f534108..0000000 --- a/src/main/resources/data/eti/recipes/diamondswordtonetherite.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_sword" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/dpickaxetonpickaxe.json b/src/main/resources/data/eti/recipes/dpickaxetonpickaxe.json deleted file mode 100644 index 8290250..0000000 --- a/src/main/resources/data/eti/recipes/dpickaxetonpickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_pickaxe" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/netheriteaxe.json b/src/main/resources/data/eti/recipes/netheriteaxe.json deleted file mode 100644 index 28a8501..0000000 --- a/src/main/resources/data/eti/recipes/netheriteaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_axe" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/netheritehoe.json b/src/main/resources/data/eti/recipes/netheritehoe.json deleted file mode 100644 index 8a5d65a..0000000 --- a/src/main/resources/data/eti/recipes/netheritehoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_hoe" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/netheriteshovel.json b/src/main/resources/data/eti/recipes/netheriteshovel.json deleted file mode 100644 index 8e54041..0000000 --- a/src/main/resources/data/eti/recipes/netheriteshovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_shovel" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_chainmail_helmet.json b/src/main/resources/data/eti/recipes/turtle_chainmail_helmet.json deleted file mode 100644 index 4638347..0000000 --- a/src/main/resources/data/eti/recipes/turtle_chainmail_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:chainmail_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_chainmail_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_axe.json b/src/main/resources/data/eti/recipes/turtle_diamond_axe.json deleted file mode 100644 index 2b5d1b3..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_axe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_helmet.json b/src/main/resources/data/eti/recipes/turtle_diamond_helmet.json deleted file mode 100644 index e6a14b7..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_hoe.json b/src/main/resources/data/eti/recipes/turtle_diamond_hoe.json deleted file mode 100644 index ccf734d..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_hoe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_pickaxe.json b/src/main/resources/data/eti/recipes/turtle_diamond_pickaxe.json deleted file mode 100644 index add0b48..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_pickaxe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_shovel.json b/src/main/resources/data/eti/recipes/turtle_diamond_shovel.json deleted file mode 100644 index 1ac4f6f..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_shovel" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_diamond_sword.json b/src/main/resources/data/eti/recipes/turtle_diamond_sword.json deleted file mode 100644 index 0a6b6ad..0000000 --- a/src/main/resources/data/eti/recipes/turtle_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:diamond_sword" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_diamond_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_axe.json b/src/main/resources/data/eti/recipes/turtle_gold_axe.json deleted file mode 100644 index edf64f7..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_axe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_helmet.json b/src/main/resources/data/eti/recipes/turtle_gold_helmet.json deleted file mode 100644 index 6454cc3..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_hoe.json b/src/main/resources/data/eti/recipes/turtle_gold_hoe.json deleted file mode 100644 index f8fabf6..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_hoe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_pickaxe.json b/src/main/resources/data/eti/recipes/turtle_gold_pickaxe.json deleted file mode 100644 index e1b0d23..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_pickaxe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_shovel.json b/src/main/resources/data/eti/recipes/turtle_gold_shovel.json deleted file mode 100644 index f1d7cb5..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_shovel" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_gold_sword.json b/src/main/resources/data/eti/recipes/turtle_gold_sword.json deleted file mode 100644 index 80b7f1d..0000000 --- a/src/main/resources/data/eti/recipes/turtle_gold_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:golden_sword" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_gold_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_ingot.json b/src/main/resources/data/eti/recipes/turtle_ingot.json deleted file mode 100644 index c53f02f..0000000 --- a/src/main/resources/data/eti/recipes/turtle_ingot.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:scute" - }, - { - "item": "minecraft:scute" - }, - { - "item": "minecraft:scute" - }, - { - "item": "minecraft:scute" - }, - { - "item": "minecraft:turtle_egg" - }, - { - "item": "minecraft:turtle_egg" - }, - { - "item": "minecraft:turtle_egg" - }, - { - "item": "minecraft:turtle_egg" - } - ], - "result": { - "item": "eti:turtle_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_axe.json b/src/main/resources/data/eti/recipes/turtle_iron_axe.json deleted file mode 100644 index 7f5ce40..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_axe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_helmet.json b/src/main/resources/data/eti/recipes/turtle_iron_helmet.json deleted file mode 100644 index 8e75836..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_hoe.json b/src/main/resources/data/eti/recipes/turtle_iron_hoe.json deleted file mode 100644 index 9db42a5..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_hoe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_pickaxe.json b/src/main/resources/data/eti/recipes/turtle_iron_pickaxe.json deleted file mode 100644 index 78da427..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_pickaxe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_shovel.json b/src/main/resources/data/eti/recipes/turtle_iron_shovel.json deleted file mode 100644 index 639797b..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_shovel" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_iron_sword.json b/src/main/resources/data/eti/recipes/turtle_iron_sword.json deleted file mode 100644 index 1be276b..0000000 --- a/src/main/resources/data/eti/recipes/turtle_iron_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:iron_sword" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_iron_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_leather_helmet.json b/src/main/resources/data/eti/recipes/turtle_leather_helmet.json deleted file mode 100644 index 60a6fcd..0000000 --- a/src/main/resources/data/eti/recipes/turtle_leather_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:leather_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_leather_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_axe.json b/src/main/resources/data/eti/recipes/turtle_netherite_axe.json deleted file mode 100644 index b98ccb2..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_axe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_helmet.json b/src/main/resources/data/eti/recipes/turtle_netherite_helmet.json deleted file mode 100644 index 55cc905..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_helmet" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_hoe.json b/src/main/resources/data/eti/recipes/turtle_netherite_hoe.json deleted file mode 100644 index 1e4a3e3..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_hoe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_pickaxe.json b/src/main/resources/data/eti/recipes/turtle_netherite_pickaxe.json deleted file mode 100644 index d2a0b57..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_pickaxe" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_shovel.json b/src/main/resources/data/eti/recipes/turtle_netherite_shovel.json deleted file mode 100644 index 62b9fdf..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_shovel" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_shovel" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtle_netherite_sword.json b/src/main/resources/data/eti/recipes/turtle_netherite_sword.json deleted file mode 100644 index 3b1cd6a..0000000 --- a/src/main/resources/data/eti/recipes/turtle_netherite_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "minecraft:netherite_sword" - }, - "addition": { - "item": "eti:turtle_ingot" - }, - "result": { - "item": "eti:turtle_netherite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/data/eti/recipes/turtlediamondtonetherite.json b/src/main/resources/data/eti/recipes/turtlediamondtonetherite.json deleted file mode 100644 index 3400f6f..0000000 --- a/src/main/resources/data/eti/recipes/turtlediamondtonetherite.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "base": { - "item": "eti:turtle_diamond_helmet" - }, - "addition": { - "item": "minecraft:netherite_ingot" - }, - "result": { - "item": "eti:turtle_netherite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/eti.mixins.json b/src/main/resources/eti.mixins.json index 7ca9383..3f40e75 100644 --- a/src/main/resources/eti.mixins.json +++ b/src/main/resources/eti.mixins.json @@ -1,14 +1,11 @@ { - "required": true, - "minVersion": "0.8", - "package": "net.drakon.enhancedturtleitems.mixin", - "compatibilityLevel": "JAVA_17", - "mixins": [ - ], - "client": [ - "ExampleMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} + "required": true, + "package": "xyz.lazuline.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "ExampleMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8d4ca75..8e30caf 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,40 +1,33 @@ { - "schemaVersion": 1, - "id": "eti", - "version": "${version}", - - "name": "Enhanced Turtle Items", - "description": "A Minecraft mod that adds enhanced turtle items in the style of netherite tool making", - "authors": [ - "AbyssDweller/Lazuline#6694" - ], - "contact": { - "homepage": "https://www.curseforge.com/minecraft/mc-mods/eti", - "sources": "https://github.com/AbyssDweller/enhanced-turtle-items" - }, - - "license": "All Rights Reserved", - "icon": "assets/modid/icon.png", - - "environment": "*", - "entrypoints": { - "main": [ - "net.drakon.enhancedturtleitems.EtiMod" - ], - "client": [ - "net.drakon.enhancedturtleitems.EtiClientMod" - ] - }, - "mixins": [ - "eti.mixins.json" - ], - - "depends": { - "fabricloader": ">=0.14.6", - "fabric": "*", - "minecraft": "~1.19.2", - "java": ">=17" - }, - "suggests": { - } -} + "schemaVersion": 1, + "id": "eti", + "version": "${version}", + "name": "enhancedturtleitems", + "description": "A Minecraft mod that adds enhanced turtle items in the style of netherite tool making", + "authors": [ + "Lazul1ne" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/eti", + "sources": "https://github.com/lazuline/enhanced-turtle-items" + }, + "license": "All Rights Reserved", + "icon": "assets/eti/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "xyz.lazuline.Enhancedturtleitems" + ] + }, + "mixins": [ + "eti.mixins.json" + ], + "depends": { + "fabricloader": ">=0.15.6", + "minecraft": ">=1.20", + "java": ">=17", + "fabric-api": "*" + }, + "suggests": { + } +} \ No newline at end of file