diff --git a/build.gradle b/build.gradle index 1a740a4..2e33ff0 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.simibubi.create:create-fabric-1.18.2:${project.create_version}+${project.minecraft_version}" + modImplementation "com.simibubi.create:create-fabric-1.19.2:${project.create_version}+${project.minecraft_version}" } processResources { @@ -74,6 +74,16 @@ jar { } } +sourceSets { + main { + resources { + srcDirs += [ + 'src/generated/resources' + ] + } + } +} + // configure the maven publication publishing { publications { @@ -89,4 +99,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 3019514..0f6919f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,18 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx3G +org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.14.9 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.28 + loader_version=0.14.10 # Mod Properties - mod_version = 1.0 + mod_version = 1.0+1.19.2 maven_group = com.cyvack.create_crystal_clear archives_base_name = create_crystal_clear # Dependencies - fabric_version=0.67.0 - create_version=0.5.0g-792 + fabric_version=0.67.0+1.19.2 + create_version=0.5.0g-791 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f88321a..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/generated/resources/.cache/3f8fa40677dc4df030449611a8b735091e46d6db b/src/generated/resources/.cache/3f8fa40677dc4df030449611a8b735091e46d6db new file mode 100755 index 0000000..a99cea1 --- /dev/null +++ b/src/generated/resources/.cache/3f8fa40677dc4df030449611a8b735091e46d6db @@ -0,0 +1,139 @@ +// 1.19.2 2022-09-25T17:18:58.3828924 Registrate Provider for create_crystal_clear [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +e2b486d06ba360f12e9200af6356933f7dd7fa7f assets/create_crystal_clear/blockstates/andesite_clear_glass_casing.json +4e890e3c2cdba5f442f150d03af0626208e710ec assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json +7e0262635bd97fe3df6ad8bdd505007e467bf760 assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json +b8d138f0331b243cf476e6e0b27e8f7a35184916 assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json +1b92597498accc6256373fbed04b94bd3830c424 assets/create_crystal_clear/blockstates/andesite_glass_casing.json +e6864af96adde474366e54b50650edfa94fec84e assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json +eee5fc4830a6bb4da87da5234acc69cdfe715e76 assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json +81abd294523985eeb90b9f94b38163d470f0fb41 assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json +35c6797f71cef2afe1e50822f7ad074323c38e29 assets/create_crystal_clear/blockstates/brass_clear_glass_casing.json +bf00607df91b7f684625096c93c0a0b4beac7a78 assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json +9b97585e791aa023970f47c5256aec715ce11e2d assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json +e7a7fc9855fca0b5b80ae67aa9d78c4bebb2f104 assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json +3395bca9e2cab30f110549c595c30fc0f568cc1e assets/create_crystal_clear/blockstates/brass_glass_casing.json +9a0bf731f8cadee1104c5701ae9580b7acaeb5e0 assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json +200af23cda1877f654b6d2904380e7bceb37bea8 assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json +75a8abe88e9f3414e12c6f816c501e16299b501b assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json +bfe1776b817deca5da30a8ae49af1cea0c26f164 assets/create_crystal_clear/blockstates/copper_clear_glass_casing.json +e676cac745d4389d7b27521add5d233a0938659f assets/create_crystal_clear/blockstates/copper_glass_casing.json +db4595a1e21b31b4f25a5b33fda7451bd03d33df assets/create_crystal_clear/blockstates/train_clear_glass_casing.json +d8bcbf2e11887ce9db0811ade8e941adbb0ce09a assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json +61ecaae8c448166f28a153b0f7e63463ba4020ad assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json +9873845c350dd2b1c3f0a3834fc1ce504cea7887 assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json +e767de877a5c6880fdf0cbd5f521b8ed5c0c8a7e assets/create_crystal_clear/blockstates/train_glass_casing.json +e09a09743f2da1647d2c1234b6a8ee3ecb20d1bb assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json +03a6499102cbb50916475ee377b99985cb987373 assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json +d045304a9e1ebcbde7e797b6390b140a048c1dd6 assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json +e20663e1b469a2ad9881040683037361efdf3820 assets/create_crystal_clear/lang/en_ud.json +4968297476cb7be035564c106d1020b55cab52af assets/create_crystal_clear/lang/en_us.json +608cd215fc9904ae3b5b81577a3a9a4859a6eaed assets/create_crystal_clear/models/block/andesite_clear_glass_casing.json +747f63c1c04997a005949d3b838d911ada5e14c2 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json +27a75053186c718fe468f4a03e2a75497a3bad52 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json +55fd27b95ec175a218f783fc58ebdb425691a0b8 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json +520bbd8c93a823f79d9f78fd2d90cb0ed08f368d assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json +b0404d4b4eb84a4e7b912b9f96803af8b880f6bd assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json +0949a9d9d3e105fb917e9ec6794956aa793ab0a6 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json +3b2be4dc3cd3f7cf36f2211692233b906535c820 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json +3ffebff241325166ffb531d544f06051e9e7b304 assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json +3001658c541365ff6e01a51262415c02aaedc0b4 assets/create_crystal_clear/models/block/andesite_glass_casing.json +755d5e9934f8ebdc944bbaa01fee4c426d7a323d assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json +57b2db2718e5a6b8b48ca571e76b45a86863466d assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json +07c96bcd06b9cda31b3f2cba5817aab97231b01c assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json +e445dab9cd91d38a2213a15d85566830360736ab assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json +72104b505d6647b1f623d2a448a66b5395a8eb15 assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json +c60bca6245b61f170c36900cbe1f37c4ba3419f8 assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json +330b96c33e57455c8e7008aab495ddaa5aa46693 assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json +a9b12c7f6d00483b1a3e2207833cdf5dd9d5ab2e assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json +84d5ae33aa558487756570d985632ed9ea95df90 assets/create_crystal_clear/models/block/brass_clear_glass_casing.json +126d3f1df8caaea2bafdc1bf5d8b8e1ec9964d2d assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json +f35f50975d3fbb7835ad3b7dd2b6faf1b2289b71 assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json +23dbb5026fc4ddcb2e14a7211c4b789880182e2a assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json +f6d5a90216e678e58c58c884309ec44d06235605 assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json +3dbbd21b0ee634c88b5b276d263128cc9e9e3d4e assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json +4713a91280d3028a1d24193f4b4247f1f8667bd1 assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json +8a103b42c89d42dabfa913f6bf1914d768654400 assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json +d2a4825f1e3bcfdc69215b7d470f34643dd08f92 assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json +ea0c6c87b67ebce97695e3f95a5eb87988f8e7bd assets/create_crystal_clear/models/block/brass_glass_casing.json +5889f7873dfe777f151994f316adc6c1da377a21 assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json +da1918df6217471beaa7b3c51cad20da5834bd56 assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json +a632b9b73cd61936b7c6453f106999ce6ae514ab assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json +fa55f95a1ee18bfde67e36c196b070c42371ff1c assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json +cbc814f88a88b7bfaae17ab04d70925fa7255c1b assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json +221ea05b12a257a4bac030f0bf43292b92a3cd66 assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json +1548bde58b7fb52a37b5e7b7a6e606db5a571115 assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json +daac6828f51021806e0615d47fa56dc799f26896 assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json +45af160d02f7e707a200451009f66ccf44dd7a03 assets/create_crystal_clear/models/block/copper_clear_glass_casing.json +689a7fc812ba5cb7a120d80642c299a29fc42658 assets/create_crystal_clear/models/block/copper_glass_casing.json +12fbce75a87e250cddbf8c53e798d18413378090 assets/create_crystal_clear/models/block/train_clear_glass_casing.json +8a50ce1ad825683a1ffc7fda27460e6a31f6d448 assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json +468badb419c940cccf40153cf3ce65ca6e4ac223 assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json +9516470c993e4b81e0bfa6129cef0d43f2a7a512 assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json +8173d440d3280bea0fec4bff24ec51282bfae7de assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json +c51a323a0d1042675075366e9b1299db0c5a875f assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json +16955c85ac70fc42497e1da676d3666590bf05da assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json +c879122b341e2db611f6f2651611bfbf2e3dd74c assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json +369b971cf50f2b5db40782a69432fd79bfae042c assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json +4e42b7c54b574b865d9c549272783596cfa2e619 assets/create_crystal_clear/models/block/train_glass_casing.json +fd89da8948df848498c7ad13704125b460e29d1e assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json +e1ebe2879a5be573a687cd9303cc916cff1a1cab assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json +b81e348852d4ccfbaf4123f3b4f4ba1eb25bbcb3 assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json +3c8878e6504d56c0811f143c051fcd20857984cb assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json +889a43e940f8fc3c2ad3f5ccf3c5f16f80e54a9e assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json +e389cb19c92b093e1c04cefa792e0626a44dc6f7 assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json +a4c82b987e21007a1a985f1d3c35f000bb3a12a7 assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json +ce8080cce7b3ef6c002f33979e7c3eb35cd82c94 assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json +84c69202759ce1642dd4909d8d58e3590cc38b01 assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json +0ade9d16b8c6a9d08b05a72620546da57f59331a assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json +96f5dc6f81ebac30b844b27f01d7991f96273222 assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json +ea0ff78077f4e32b44d6b08a9b681c08972cefb6 assets/create_crystal_clear/models/item/andesite_clear_glass_encased_shaft.json +47505900568274d81be3daee92128d137fd50232 assets/create_crystal_clear/models/item/andesite_glass_casing.json +d20355eed8f8370f2f893d72939b287ec6687e77 assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json +7be30dde2bc272d095fcbd86a26f0541712615b1 assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json +3cee730e8c184c935e6980b8199a1629dae7909e assets/create_crystal_clear/models/item/andesite_glass_encased_shaft.json +28fb958da9574a2b16ac69c57ae1a06d07a6e459 assets/create_crystal_clear/models/item/brass_clear_glass_casing.json +a3374871648ff499c252db9b9553679150dd53ce assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json +6747735100971d7fb86bef9752aa864e6044db18 assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json +0fb673dddb1ca5011b1e9c70eb75e3da104876a0 assets/create_crystal_clear/models/item/brass_clear_glass_encased_shaft.json +fad4112b7fee1b2697bf68b3487eb545d4533028 assets/create_crystal_clear/models/item/brass_glass_casing.json +6da46e7565dadfa00e951246c80d761a027de6c6 assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json +5e5d7eafbde103d073672b39debc80afe204fc38 assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json +9c470088d3bdbcf1d6eed1bb7341bf2725abd85e assets/create_crystal_clear/models/item/brass_glass_encased_shaft.json +0fe27e1fbb3f0fc8195e3ab53d79f39edee3d1fc assets/create_crystal_clear/models/item/copper_clear_glass_casing.json +a29cdf68182f7d9cdea6cb144efa88d0e3c01d50 assets/create_crystal_clear/models/item/copper_glass_casing.json +dd8ce1d2f3bb04bfd7e03967df8a4a5fb2c9ca30 assets/create_crystal_clear/models/item/train_clear_glass_casing.json +663bce1aa18398b8614511edc38910bc730251e7 assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json +c44164c1e1fc595c5ab1bdccee25edc8b5705978 assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json +950765942aec3830e5e270394f91fa1dd7aa77ba assets/create_crystal_clear/models/item/train_clear_glass_encased_shaft.json +528e4c6f2ad70353c12169d95d2a6df3f8e05e30 assets/create_crystal_clear/models/item/train_glass_casing.json +0fc73e320c45dc8d038d7c76b4a644bf896fb844 assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json +ffbdfa116dead9cc2b30c111086646b2dc294a68 assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json +4562592f442ebe204a6ed4d0a0b0acefe4ff9a67 assets/create_crystal_clear/models/item/train_glass_encased_shaft.json +064d4b47dd5a2e6439888dd1258e9b8a770ee811 data/create/tags/blocks/casing.json +064d4b47dd5a2e6439888dd1258e9b8a770ee811 data/create/tags/items/casing.json +07d5504fd31956003cc0539dc604198f51a297e3 data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json +4bfea10e057b4cf90bd24fb728cd4e9144e62427 data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json +08ab3431ae9ca7e52f94920fabc7449cc25ee46e data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json +7ee0bb449f0d2a5e8a0f88d618a76468813eb657 data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json +84ea64cfe9314ee203d35b3b0c5e21dac15bd27c data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json +c500a9c39398192d4b01c6d73fda559d79a0fcef data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json +464c66d638e5762e521e58c219ed11575bfec063 data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json +95e525a00c31536a1dbb9a2d33a89986724dc4ca data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json +13267c1251e76ae6271f7de72db60bde86aa0bfa data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json +658d76088e3926c72da86a75b4b14946bd809239 data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json index c42ce9a..8c12f95 --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json index 8730521..ab1558e --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/andesite_clear_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 85% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json index 4ed45f8..b16c4ac --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_clear_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_clear_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json index 84179f8..1e890aa --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json index ae8346a..a9c09e8 --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/andesite_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 84% rename from src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json index 068a32a..c7103bf --- a/src/main/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/andesite_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_andesite_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json index f95af58..c043e52 --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json index 671c30a..df8e918 --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/brass_clear_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 84% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json index 18bcd26..0937dc2 --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_clear_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_clear_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_clear_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_clear_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json index fb1705d..939bcfc --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json index c2c72f1..2181f06 --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/brass_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 84% rename from src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json index 962cceb..03830e9 --- a/src/main/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/brass_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_brass_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/copper_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/copper_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/copper_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/copper_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/copper_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/copper_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/copper_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/copper_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json index 4f1edef..55e3355 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json index c699c30..74b85c7 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/train_clear_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 84% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json index 0821a80..ea2a155 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_clear_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_clear_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_clear_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_clear_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json index 0faac99..57c3e71 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/train_glass_encased_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json index 4835a9b..3b885f6 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_large_cogwheel.json @@ -5,47 +5,47 @@ "x": 90, "y": 90 }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel", + "axis=x,bottom_shaft=false,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top", "x": 90, - "y": 180 + "y": 90 }, "axis=x,bottom_shaft=true,top_shaft=false": { "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_bottom", "x": 90, "y": 90 }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_bottom" - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top", + "axis=x,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top_bottom", "x": 90, "y": 90 }, + "axis=y,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel" + }, "axis=y,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top" }, + "axis=y,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_bottom" + }, + "axis=y,bottom_shaft=true,top_shaft=true": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top_bottom" + }, + "axis=z,bottom_shaft=false,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel", + "x": 90, + "y": 180 + }, "axis=z,bottom_shaft=false,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top", "x": 90, "y": 180 }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top_bottom", + "axis=z,bottom_shaft=true,top_shaft=false": { + "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_bottom", "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top_bottom" + "y": 180 }, "axis=z,bottom_shaft=true,top_shaft=true": { "model": "create_crystal_clear:block/train_glass_encased_large_cogwheel_top_bottom", diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 84% rename from src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json index eb5793c..d3bb456 --- a/src/main/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json +++ b/src/generated/resources/assets/create_crystal_clear/blockstates/train_glass_encased_shaft.json @@ -2,9 +2,9 @@ "variants": { "axis=x": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_glass", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 90 }, "axis=y": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_glass", @@ -12,9 +12,9 @@ }, "axis=z": { "model": "create_crystal_clear:block/glass_encased_shaft/block_train_glass", + "uvlock": true, "x": 90, - "y": 180, - "uvlock": true + "y": 180 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/create_crystal_clear/lang/en_ud.json b/src/generated/resources/assets/create_crystal_clear/lang/en_ud.json old mode 100644 new mode 100755 index 271927e..c612aaf --- a/src/generated/resources/assets/create_crystal_clear/lang/en_ud.json +++ b/src/generated/resources/assets/create_crystal_clear/lang/en_ud.json @@ -1,32 +1,29 @@ { - "block.create_crystal_clear.andesite_clear_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_clear_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_clear_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_clear_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.andesite_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u01DD\u0287\u0131s\u01DDpu\u2C6F", - "block.create_crystal_clear.brass_clear_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_clear_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_clear_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_clear_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.brass_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 ss\u0250\u0279\u15FA", - "block.create_crystal_clear.copper_clear_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 \u0279\u01DDddo\u0186", - "block.create_crystal_clear.copper_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u0279\u01DDddo\u0186", - "block.create_crystal_clear.steel_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u05DF\u01DD\u01DD\u0287S", - "block.create_crystal_clear.steel_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u05DF\u01DD\u01DD\u0287S", - "block.create_crystal_clear.steel_tinted_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 p\u01DD\u0287u\u0131\u27D8 \u05DF\u01DD\u01DD\u0287S", - "block.create_crystal_clear.train_clear_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_clear_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_clear_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_clear_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 \u0279\u0250\u01DD\u05DF\u0186 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_glass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u05DF\u2141 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_glass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_glass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 u\u0131\u0250\u0279\u27D8", - "block.create_crystal_clear.train_glass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u05DF\u2141 u\u0131\u0250\u0279\u27D8", - "itemGroup.create_crystal_clear": "\u0279\u0250\u01DD\u05DF\u0186 \u05DF\u0250\u0287s\u028E\u0279\u0186 :\u01DD\u0287\u0250\u01DD\u0279\u0186" + "block.create_crystal_clear.andesite_clear_glass_casing": "buısɐƆ ssɐן⅁ ɹɐǝןƆ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_clear_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_clear_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_clear_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_glass_casing": "buısɐƆ ssɐן⅁ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ ǝʇısǝpuⱯ", + "block.create_crystal_clear.andesite_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ ǝʇısǝpuⱯ", + "block.create_crystal_clear.brass_clear_glass_casing": "buısɐƆ ssɐן⅁ ɹɐǝןƆ ssɐɹᗺ", + "block.create_crystal_clear.brass_clear_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ssɐɹᗺ", + "block.create_crystal_clear.brass_clear_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ssɐɹᗺ", + "block.create_crystal_clear.brass_clear_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ ssɐɹᗺ", + "block.create_crystal_clear.brass_glass_casing": "buısɐƆ ssɐן⅁ ssɐɹᗺ", + "block.create_crystal_clear.brass_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ ssɐɹᗺ", + "block.create_crystal_clear.brass_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ ssɐɹᗺ", + "block.create_crystal_clear.brass_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ ssɐɹᗺ", + "block.create_crystal_clear.copper_clear_glass_casing": "buısɐƆ ssɐן⅁ ɹɐǝןƆ ɹǝddoƆ", + "block.create_crystal_clear.copper_glass_casing": "buısɐƆ ssɐן⅁ ɹǝddoƆ", + "block.create_crystal_clear.train_clear_glass_casing": "buısɐƆ ssɐן⅁ ɹɐǝןƆ uıɐɹ⟘", + "block.create_crystal_clear.train_clear_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ uıɐɹ⟘", + "block.create_crystal_clear.train_clear_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ uıɐɹ⟘", + "block.create_crystal_clear.train_clear_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ ɹɐǝןƆ uıɐɹ⟘", + "block.create_crystal_clear.train_glass_casing": "buısɐƆ ssɐן⅁ uıɐɹ⟘", + "block.create_crystal_clear.train_glass_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ssɐן⅁ uıɐɹ⟘", + "block.create_crystal_clear.train_glass_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ssɐן⅁ uıɐɹ⟘", + "block.create_crystal_clear.train_glass_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ssɐן⅁ uıɐɹ⟘", + "itemGroup.create_crystal_clear.create_crystal_clear": "ɹɐǝןƆ ןɐʇsʎɹƆ :ǝʇɐǝɹƆ" } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/lang/en_us.json b/src/generated/resources/assets/create_crystal_clear/lang/en_us.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/assets/create_crystal_clear/lang/en_us.json rename to src/generated/resources/assets/create_crystal_clear/lang/en_us.json index 43f4116..23af98c --- a/src/main/resources/assets/create_crystal_clear/lang/en_us.json +++ b/src/generated/resources/assets/create_crystal_clear/lang/en_us.json @@ -17,9 +17,6 @@ "block.create_crystal_clear.brass_glass_encased_shaft": "Brass Glass Encased Shaft", "block.create_crystal_clear.copper_clear_glass_casing": "Copper Clear Glass Casing", "block.create_crystal_clear.copper_glass_casing": "Copper Glass Casing", - "block.create_crystal_clear.steel_glass_casing": "Steel Glass Casing", - "block.create_crystal_clear.steel_glass_encased_shaft": "Steel Glass Encased Shaft", - "block.create_crystal_clear.steel_tinted_glass_casing": "Steel Tinted Glass Casing", "block.create_crystal_clear.train_clear_glass_casing": "Train Clear Glass Casing", "block.create_crystal_clear.train_clear_glass_encased_cogwheel": "Train Clear Glass Encased Cogwheel", "block.create_crystal_clear.train_clear_glass_encased_large_cogwheel": "Train Clear Glass Encased Large Cogwheel", diff --git a/src/generated/resources/assets/create_crystal_clear/lang/zh_cn.json b/src/generated/resources/assets/create_crystal_clear/lang/zh_cn.json deleted file mode 100644 index c1332d9..0000000 --- a/src/generated/resources/assets/create_crystal_clear/lang/zh_cn.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "block.create_crystal_clear.andesite_clear_glass_casing": "安山通透玻璃机壳", - "block.create_crystal_clear.andesite_clear_glass_encased_cogwheel": "安山通透玻璃齿轮箱", - "block.create_crystal_clear.andesite_clear_glass_encased_large_cogwheel": "安山通透玻璃大齿轮箱", - "block.create_crystal_clear.andesite_clear_glass_encased_shaft": "安山通透玻璃传动杆箱", - "block.create_crystal_clear.andesite_glass_casing": "安山玻璃机壳", - "block.create_crystal_clear.andesite_glass_encased_cogwheel": "安山玻璃齿轮箱", - "block.create_crystal_clear.andesite_glass_encased_large_cogwheel": "安山玻璃大齿轮箱", - "block.create_crystal_clear.andesite_glass_encased_shaft": "安山玻璃传动杆箱", - "block.create_crystal_clear.brass_clear_glass_casing": "黄铜通透玻璃机壳", - "block.create_crystal_clear.brass_clear_glass_encased_cogwheel": "黄铜通透玻璃齿轮箱", - "block.create_crystal_clear.brass_clear_glass_encased_large_cogwheel": "黄铜通透玻璃大齿轮箱", - "block.create_crystal_clear.brass_clear_glass_encased_shaft": "黄铜通透玻璃传动杆箱", - "block.create_crystal_clear.brass_glass_casing": "黄铜玻璃机壳", - "block.create_crystal_clear.brass_glass_encased_cogwheel": "黄铜玻璃齿轮箱", - "block.create_crystal_clear.brass_glass_encased_large_cogwheel": "黄铜玻璃大齿轮箱", - "block.create_crystal_clear.brass_glass_encased_shaft": "黄铜玻璃传动杆箱", - "block.create_crystal_clear.copper_clear_glass_casing": "铜制通透玻璃机壳", - "block.create_crystal_clear.copper_glass_casing": "铜制玻璃机壳", - "block.create_crystal_clear.steel_glass_casing": "钢制玻璃机壳", - "block.create_crystal_clear.steel_glass_encased_shaft": "钢制玻璃传动杆箱", - "block.create_crystal_clear.steel_tinted_glass_casing": "钢制遮光玻璃机壳", - "block.create_crystal_clear.train_clear_glass_casing": "列车通透玻璃机壳", - "block.create_crystal_clear.train_clear_glass_encased_cogwheel": "列车通透玻璃齿轮箱", - "block.create_crystal_clear.train_clear_glass_encased_large_cogwheel": "列车通透玻璃大齿轮箱", - "block.create_crystal_clear.train_clear_glass_encased_shaft": "列车通透玻璃传动杆箱", - "block.create_crystal_clear.train_glass_casing": "列车玻璃机壳", - "block.create_crystal_clear.train_glass_encased_cogwheel": "列车玻璃齿轮箱", - "block.create_crystal_clear.train_glass_encased_large_cogwheel": "列车玻璃大齿轮箱", - "block.create_crystal_clear.train_glass_encased_shaft": "列车玻璃传动杆箱", - "itemGroup.create_crystal_clear": "机械动力：晶莹剔透" -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json index 8aed5b7..476677e --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json index b0bcd57..4503887 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json index e6fe9ef..258e109 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json index b02707f..3220655 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json index 61ca1ec..78947b0 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json index 59a48da..fce1847 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json index cf98634..11799bd --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json index 4d354df..0c2991f --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_clear_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json index 34c73af..d4aac17 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json index 89a78e7..95d3e5f --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json index 49198c1..09d822b --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json index 5929198..6ae11d2 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json index d18466c..bd0768a --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json index 6bdd36e..188f302 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json index 14cf50f..f460cb1 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json index f1ed2eb..bd86d12 --- a/src/main/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/andesite_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json index 434e063..4244630 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json index 7cddc7c..c45150f --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json index d29051e..5533d8d --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json index 801f71c..9cb23a6 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json index a811234..b34de2a --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json index 92d8986..fc9d935 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json index 5ee90a6..b47b8ba --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json index 381f0dc..316b7b3 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_clear_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json index b2b82fa..e83fdc2 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json index 78fb23b..e488a9f --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json index 1d03450..00d94e4 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json index 1939c97..313390f --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json index 6a2c6a7..bce873d --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json index e50fad7..572a480 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json index f04c043..4d6fff4 --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json index 7176fcd..0bac80a --- a/src/main/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/brass_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/copper_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/copper_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/copper_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/copper_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/copper_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/copper_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/copper_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/copper_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json index 3864d76..beb07e5 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json index 1481a71..83ec5a7 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json index f0c2535..9b15101 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json index 3b3e65b..05f9241 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json index 8a46c3a..7818cb6 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json index f2f615d..5212a0a --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json index 7da2874..b311a49 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json index 77f0b0f..da12025 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_clear_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_casing.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_casing.json diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json index 68a5937..ea7088e --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json index 97dc8fc..427be6d --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json index 0fcfbf7..26c95c4 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json index 29a5bee..e9f3d41 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json index b69fe63..f0a83dc --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json index 03a782f..7f5d25d --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_bottom", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json index 5c8e06e..c2d6124 --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json rename to src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json index e585d67..b9584ee --- a/src/main/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json +++ b/src/generated/resources/assets/create_crystal_clear/models/block/train_glass_encased_large_cogwheel_top_bottom.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/block_top_bottom", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json index 1404591..e618668 --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_casing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "create_crystal_clear:block/andesite_clear_glass_casing", - "end": "create_crystal_clear:block/andesite_clear_glass_casing" + "end": "create_crystal_clear:block/andesite_clear_glass_casing", + "side": "create_crystal_clear:block/andesite_clear_glass_casing" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json index 098419a..befd101 --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json index e8e69be..fa7166c --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_clear_glass_encased_shaft.json diff --git a/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json new file mode 100755 index 0000000..3424cb2 --- /dev/null +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "create_crystal_clear:block/andesite_glass_casing", + "side": "create_crystal_clear:block/andesite_glass_casing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json index bf8f963..d239d1e --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "4": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json index 3879463..d2d643b --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/andesite_glass_casing", "1": "minecraft:block/stripped_spruce_log_top", "3": "create:block/gearbox", + "casing": "create_crystal_clear:block/andesite_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/andesite_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/andesite_glass_encased_shaft.json diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 97% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json index e6b24b2..cf724ec --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_casing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "create_crystal_clear:block/brass_clear_glass_casing", - "end": "create_crystal_clear:block/brass_clear_glass_casing" + "end": "create_crystal_clear:block/brass_clear_glass_casing", + "side": "create_crystal_clear:block/brass_clear_glass_casing" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json index d1d3748..8870753 --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json index 9032b29..1c3f9b2 --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/brass_clear_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_clear_glass_encased_shaft.json diff --git a/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json new file mode 100755 index 0000000..2de0527 --- /dev/null +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "create_crystal_clear:block/brass_glass_casing", + "side": "create_crystal_clear:block/brass_glass_casing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json index 2bb5731..d5873c1 --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "4": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json index 2c1e793..745c3aa --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/brass_glass_casing", "1": "minecraft:block/stripped_dark_oak_log_top", "3": "create:block/brass_gearbox", + "casing": "create_crystal_clear:block/brass_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/brass_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/brass_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/brass_glass_encased_shaft.json diff --git a/src/main/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 97% rename from src/main/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json index 34aabbb..89d1d43 --- a/src/main/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/copper_clear_glass_casing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "create_crystal_clear:block/copper_clear_glass_casing", - "end": "create_crystal_clear:block/copper_clear_glass_casing" + "end": "create_crystal_clear:block/copper_clear_glass_casing", + "side": "create_crystal_clear:block/copper_clear_glass_casing" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json new file mode 100755 index 0000000..c7a8f55 --- /dev/null +++ b/src/generated/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "create_crystal_clear:block/copper_glass_casing", + "side": "create_crystal_clear:block/copper_glass_casing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 97% rename from src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json index e016af1..c357016 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_casing.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "create_crystal_clear:block/train_clear_glass_casing", - "end": "create_crystal_clear:block/train_clear_glass_casing" + "end": "create_crystal_clear:block/train_clear_glass_casing", + "side": "create_crystal_clear:block/train_clear_glass_casing" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json index 6218f2c..7164f55 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json index 396aa86..4184781 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/train_clear_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_clear_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_clear_glass_encased_shaft.json diff --git a/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_casing.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_casing.json new file mode 100755 index 0000000..5950203 --- /dev/null +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_casing.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "create_crystal_clear:block/train_glass_casing", + "side": "create_crystal_clear:block/train_glass_casing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json index 495253d..c70c523 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "4": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json index 8de8f63..745c946 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json +++ b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_large_cogwheel.json @@ -1,9 +1,9 @@ { "parent": "create_crystal_clear:block/encased_large_cogwheel/item", "textures": { - "casing": "create_crystal_clear:block/train_glass_casing", "1": "create_crystal_clear:block/train_backing", "3": "create_crystal_clear:block/train_gearbox", + "casing": "create_crystal_clear:block/train_glass_casing", "side": "create_crystal_clear:block/encased_cogwheels/train_encased_cogwheel_side_connected" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_shaft.json b/src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 100% rename from src/main/resources/assets/create_crystal_clear/models/item/train_glass_encased_shaft.json rename to src/generated/resources/assets/create_crystal_clear/models/item/train_glass_encased_shaft.json diff --git a/src/main/resources/data/create/tags/blocks/casing.json b/src/generated/resources/data/create/tags/blocks/casing.json old mode 100644 new mode 100755 similarity index 68% rename from src/main/resources/data/create/tags/blocks/casing.json rename to src/generated/resources/data/create/tags/blocks/casing.json index a9e19b2..8685439 --- a/src/main/resources/data/create/tags/blocks/casing.json +++ b/src/generated/resources/data/create/tags/blocks/casing.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "create_crystal_clear:andesite_glass_casing", "create_crystal_clear:brass_glass_casing", @@ -8,8 +7,6 @@ "create_crystal_clear:andesite_clear_glass_casing", "create_crystal_clear:brass_clear_glass_casing", "create_crystal_clear:copper_clear_glass_casing", - "create_crystal_clear:train_clear_glass_casing", - "create_crystal_clear:steel_glass_casing", - "create_crystal_clear:steel_tinted_glass_casing" + "create_crystal_clear:train_clear_glass_casing" ] } \ No newline at end of file diff --git a/src/main/resources/data/create/tags/items/casing.json b/src/generated/resources/data/create/tags/items/casing.json old mode 100644 new mode 100755 similarity index 68% rename from src/main/resources/data/create/tags/items/casing.json rename to src/generated/resources/data/create/tags/items/casing.json index a9e19b2..8685439 --- a/src/main/resources/data/create/tags/items/casing.json +++ b/src/generated/resources/data/create/tags/items/casing.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "create_crystal_clear:andesite_glass_casing", "create_crystal_clear:brass_glass_casing", @@ -8,8 +7,6 @@ "create_crystal_clear:andesite_clear_glass_casing", "create_crystal_clear:brass_clear_glass_casing", "create_crystal_clear:copper_clear_glass_casing", - "create_crystal_clear:train_clear_glass_casing", - "create_crystal_clear:steel_glass_casing", - "create_crystal_clear:steel_tinted_glass_casing" + "create_crystal_clear:train_clear_glass_casing" ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json index a7004b3..13e5dda --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:andesite_clear_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:andesite_clear_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_clear_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json index 13e9e15..9d70eff --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:andesite_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:andesite_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/andesite_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json index 72710a5..1edd309 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:brass_clear_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:brass_clear_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_clear_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json index 8d473e5..6f5359a --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:brass_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:brass_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/brass_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json index 8ca13b4..40fb45f --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_clear_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:copper_clear_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:copper_clear_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json index 493b04e..cb9df01 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/copper_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:copper_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:copper_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json index 7f8eace..8f21c49 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:train_clear_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:train_clear_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_clear_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json old mode 100644 new mode 100755 similarity index 95% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json index 397d717..b4d7795 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_casing.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:train_glass_casing" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "create_crystal_clear:train_glass_casing" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json index e5d0bfc..da83195 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_large_cogwheel.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:cogwheel" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json old mode 100644 new mode 100755 similarity index 91% rename from src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json rename to src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json index 647a8e0..30564f2 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json +++ b/src/generated/resources/data/create_crystal_clear/loot_tables/blocks/train_glass_encased_shaft.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "create:shaft" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/java/com/cyvack/create_crystal_clear/Create_Crystal_Clear.java b/src/main/java/com/cyvack/create_crystal_clear/Create_Crystal_Clear.java old mode 100644 new mode 100755 index 2c909e8..3c570b6 --- a/src/main/java/com/cyvack/create_crystal_clear/Create_Crystal_Clear.java +++ b/src/main/java/com/cyvack/create_crystal_clear/Create_Crystal_Clear.java @@ -1,32 +1,42 @@ package com.cyvack.create_crystal_clear; import com.cyvack.create_crystal_clear.blocks.ModBlocks; +import com.cyvack.create_crystal_clear.blocks.compat.AlloyedCompatBlocks; import com.cyvack.create_crystal_clear.tile_entities.ModtileEntities; import com.simibubi.create.foundation.data.CreateRegistrate; import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.resources.ResourceLocation; public class Create_Crystal_Clear implements ModInitializer { - public static final String MOD_ID = "create_crystal_clear"; - public static boolean isAlloyedLoaded = true; - private static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID).creativeModeTab(() -> CrystalClearTab.GLASS_TAB); - - public static ResourceLocation asResource(String path) { - return new ResourceLocation(MOD_ID, path); - } - public static CreateRegistrate registrate() { - return REGISTRATE; - } + public static final String MOD_ID = "create_crystal_clear"; + public static boolean isAlloyedLoaded = false; + private static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID); @Override public void onInitialize() { + + if (FabricLoader.getInstance().isModLoaded("alloyed")) + isAlloyedLoaded = true; + ModBlocks.register(); ModtileEntities.register(); - CrystalClearTab.register(); + // compat + if (isAlloyedLoaded) { + AlloyedCompatBlocks.register(); + } REGISTRATE.register(); } + + public static ResourceLocation asResource(String path) { + return new ResourceLocation(MOD_ID, path); + } + + public static CreateRegistrate registrate() { + return REGISTRATE; + } } diff --git a/src/main/java/com/cyvack/create_crystal_clear/CrystalClearTab.java b/src/main/java/com/cyvack/create_crystal_clear/CrystalClearTab.java deleted file mode 100644 index 212d242..0000000 --- a/src/main/java/com/cyvack/create_crystal_clear/CrystalClearTab.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cyvack.create_crystal_clear; - -import com.cyvack.create_crystal_clear.blocks.ModBlocks; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.minecraft.world.item.CreativeModeTab; - -public class CrystalClearTab { - public static final CreativeModeTab GLASS_TAB = FabricItemGroupBuilder.create(Create_Crystal_Clear.asResource("create_crystal_clear")).icon(ModBlocks.COPPER_GLASS_CASING::asStack).build(); - - public static CreativeModeTab register() { - return GLASS_TAB; - } -} diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/CrystalClearTab.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/CrystalClearTab.java new file mode 100755 index 0000000..619e1b3 --- /dev/null +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/CrystalClearTab.java @@ -0,0 +1,12 @@ +package com.cyvack.create_crystal_clear.blocks; + +import com.cyvack.create_crystal_clear.Create_Crystal_Clear; +import com.simibubi.create.foundation.data.CreateRegistrate; + +import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; +import net.minecraft.world.item.CreativeModeTab; + +public class CrystalClearTab { + public static final CreativeModeTab GLASS_TAB = FabricItemGroupBuilder.create(Create_Crystal_Clear.asResource("create_crystal_clear")).icon(ModBlocks.COPPER_GLASS_CASING::asStack).build(); + private static final CreateRegistrate REGISTRATE = Create_Crystal_Clear.registrate().creativeModeTab(() -> GLASS_TAB, "Create: Crystal Clear"); +} diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenGlassCasing.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenGlassCasing.java deleted file mode 100644 index 9680e57..0000000 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenGlassCasing.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cyvack.create_crystal_clear.blocks.EmptyBlocks; - -import com.cyvack.create_crystal_clear.blocks.glass_casings.GlassCasing; -import net.minecraft.core.NonNullList; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import org.lwjgl.system.NonnullDefault; - - -public class HiddenGlassCasing extends GlassCasing{ - - public HiddenGlassCasing(Properties p) { - super(p); - } - - @Override - @NonnullDefault - public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) { - // Don't add the item to any item category - therefore making it hidden. - } -} diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenTintedGlassCasing.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenTintedGlassCasing.java deleted file mode 100644 index c19f4ed..0000000 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/EmptyBlocks/HiddenTintedGlassCasing.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cyvack.create_crystal_clear.blocks.EmptyBlocks; - -import com.cyvack.create_crystal_clear.blocks.glass_casings.TintedGlassCasing; -import net.minecraft.core.NonNullList; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import org.lwjgl.system.NonnullDefault; - -public class HiddenTintedGlassCasing extends TintedGlassCasing { - public HiddenTintedGlassCasing(Properties p) { - super(p); - } - - @Override - @NonnullDefault - public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) { - // Don't add the item to any item category - therefore making it hidden. - } -} diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/ModBlocks.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/ModBlocks.java old mode 100644 new mode 100755 index 66a7fee..589e4be --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/ModBlocks.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/ModBlocks.java @@ -3,72 +3,83 @@ import static com.cyvack.create_crystal_clear.data_gen.BlockBuilders.glassEncasedCogwheel; import static com.cyvack.create_crystal_clear.data_gen.BlockBuilders.glassEncasedShaft; import static com.cyvack.create_crystal_clear.data_gen.BlockBuilders.glasscasing; -import static com.cyvack.create_crystal_clear.data_gen.BlockBuilders.tintedglasscasing; +import com.cyvack.create_crystal_clear.Create_Crystal_Clear; import com.cyvack.create_crystal_clear.blocks.glass_casings.GlassCasing; -import com.cyvack.create_crystal_clear.blocks.glass_casings.TintedGlassCasing; import com.cyvack.create_crystal_clear.blocks.glass_encased_cogwheel.GlassEncasedCogwheel; import com.cyvack.create_crystal_clear.blocks.glass_encased_shaft.GlassEncasedShaftBlock; import com.simibubi.create.foundation.block.connected.SimpleCTBehaviour; +import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.BlockEntry; public class ModBlocks { - //Casings - public static final BlockEntry - ANDESITE_GLASS_CASING = glasscasing("andesite_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.ANDESITE_GLASS_CASING)), - BRASS_GLASS_CASING = glasscasing("brass_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.BRASS_GLASS_CASING)), - COPPER_GLASS_CASING = glasscasing("copper_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.COPPER_GLASS_CASING)), - TRAIN_GLASS_CASING = glasscasing("train_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.TRAIN_GLASS_CASING)); + private static final CreateRegistrate REGISTRATE = Create_Crystal_Clear.registrate() + .creativeModeTab(() -> CrystalClearTab.GLASS_TAB); - //Clear Casings - public static final BlockEntry - ANDESITE_CLEAR_GLASS_CASING = glasscasing("andesite_clear_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.ANDESITE_CLEAR_GLASS_CASING)), - BRASS_CLEAR_GLASS_CASING = glasscasing("brass_clear_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.BRASS_CLEAR_GLASS_CASING)), + // Casings + public static final BlockEntry ANDESITE_GLASS_CASING = glasscasing("andesite_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.ANDESITE_GLASS_CASING)), + BRASS_GLASS_CASING = glasscasing("brass_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.BRASS_GLASS_CASING)), + COPPER_GLASS_CASING = glasscasing("copper_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.COPPER_GLASS_CASING)), + TRAIN_GLASS_CASING = glasscasing("train_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.TRAIN_GLASS_CASING)); - COPPER_CLEAR_GLASS_CASING = glasscasing("copper_clear_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.COPPER_CLEAR_GLASS_CASING)), - TRAIN_CLEAR_GLASS_CASING = glasscasing("train_clear_glass_casing", () -> new SimpleCTBehaviour(ModSpriteShifts.TRAIN_CLEAR_GLASS_CASING)); + // Clear Casings + public static final BlockEntry ANDESITE_CLEAR_GLASS_CASING = glasscasing("andesite_clear_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.ANDESITE_CLEAR_GLASS_CASING)), + BRASS_CLEAR_GLASS_CASING = glasscasing("brass_clear_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.BRASS_CLEAR_GLASS_CASING)), - //Glass Encased Shafts - public static final BlockEntry - ANDESITE_GLASS_ENCASED_SHAFT = glassEncasedShaft("andesite", false, GlassEncasedShaftBlock::andesiteglass), - ANDESITE_CLEAR_GLASS_ENCASED_SHAFT = glassEncasedShaft("andesite", true, GlassEncasedShaftBlock::andesiteclearglass), - BRASS_GLASS_ENCASED_SHAFT = glassEncasedShaft("brass", false, GlassEncasedShaftBlock::brassglass), - BRASS_CLEAR_GLASS_ENCASED_SHAFT = glassEncasedShaft("brass", true, GlassEncasedShaftBlock::brassclearglass), + COPPER_CLEAR_GLASS_CASING = glasscasing("copper_clear_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.COPPER_CLEAR_GLASS_CASING)), + TRAIN_CLEAR_GLASS_CASING = glasscasing("train_clear_glass_casing", + () -> new SimpleCTBehaviour(ModSpriteShifts.TRAIN_CLEAR_GLASS_CASING)); + + // Glass Encased Shafts + public static final BlockEntry ANDESITE_GLASS_ENCASED_SHAFT = glassEncasedShaft("andesite", + false, GlassEncasedShaftBlock::andesiteglass), + ANDESITE_CLEAR_GLASS_ENCASED_SHAFT = glassEncasedShaft("andesite", true, + GlassEncasedShaftBlock::andesiteclearglass), + BRASS_GLASS_ENCASED_SHAFT = glassEncasedShaft("brass", false, GlassEncasedShaftBlock::brassglass), + BRASS_CLEAR_GLASS_ENCASED_SHAFT = glassEncasedShaft("brass", true, GlassEncasedShaftBlock::brassclearglass), TRAIN_GLASS_ENCASED_SHAFT = glassEncasedShaft("train", false, GlassEncasedShaftBlock::trainglass), TRAIN_CLEAR_GLASS_ENCASED_SHAFT = glassEncasedShaft("train", true, GlassEncasedShaftBlock::trainclearglass); - //Glass Encased Cogwheels + // Glass Encased Cogwheels public static final BlockEntry - //SMALL COGS - ANDESITE_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("andesite", false, false, p -> GlassEncasedCogwheel.andesite_glass(false, p)), - BRASS_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("brass", false, false, p -> GlassEncasedCogwheel.brass_glass(false, p)), - TRAIN_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("train", false, false, p -> GlassEncasedCogwheel.train_glass(false, p)), - - ANDESITE_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("andesite", false, true, p -> GlassEncasedCogwheel.andesite_clear_glass(false, p)), - BRASS_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("brass", false, true, p -> GlassEncasedCogwheel.brass_clear_glass(false, p)), - TRAIN_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("train", false, true, p -> GlassEncasedCogwheel.train_clear_glass(false, p)), - - //LARGE COGS - ANDESITE_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("andesite", true, false, p -> GlassEncasedCogwheel.andesite_glass(true, p)), - BRASS_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("brass", true, false, p -> GlassEncasedCogwheel.brass_glass(true, p)), - TRAIN_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("train", true, false, p -> GlassEncasedCogwheel.train_glass(true, p)), - - ANDESITE_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("andesite", true, true, p -> GlassEncasedCogwheel.andesite_clear_glass(true, p)), - BRASS_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("brass", true, true, p -> GlassEncasedCogwheel.brass_clear_glass(true, p)), - TRAIN_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("train", true, true, p -> GlassEncasedCogwheel.train_clear_glass(true, p)); + // SMALL COGS + ANDESITE_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("andesite", false, false, + p -> GlassEncasedCogwheel.andesite_glass(false, p)), + BRASS_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("brass", false, false, + p -> GlassEncasedCogwheel.brass_glass(false, p)), + TRAIN_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("train", false, false, + p -> GlassEncasedCogwheel.train_glass(false, p)), - public static final BlockEntry - STEEL_GLASS_CASING = - glasscasing("steel_glass_casing", ()-> new SimpleCTBehaviour((ModSpriteShifts.STEEL_GLASS_CASING))); + ANDESITE_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("andesite", false, true, + p -> GlassEncasedCogwheel.andesite_clear_glass(false, p)), + BRASS_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("brass", false, true, + p -> GlassEncasedCogwheel.brass_clear_glass(false, p)), + TRAIN_CLEAR_GLASS_ENCASED_COGWHEEL = glassEncasedCogwheel("train", false, true, + p -> GlassEncasedCogwheel.train_clear_glass(false, p)), - public static final BlockEntry - STEEL_TINTED_GLASS_CASING = - tintedglasscasing("steel_tinted_glass_casing", () -> new SimpleCTBehaviour((ModSpriteShifts.STEEL_TINTED_GLASS_CASING))); + // LARGE COGS + ANDESITE_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("andesite", true, false, + p -> GlassEncasedCogwheel.andesite_glass(true, p)), + BRASS_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("brass", true, false, + p -> GlassEncasedCogwheel.brass_glass(true, p)), + TRAIN_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("train", true, false, + p -> GlassEncasedCogwheel.train_glass(true, p)), - public static final BlockEntry - STEEL_GLASS_ENCASED_SHAFT = glassEncasedShaft("steel", false, GlassEncasedShaftBlock::steelglass); + ANDESITE_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("andesite", true, true, + p -> GlassEncasedCogwheel.andesite_clear_glass(true, p)), + BRASS_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("brass", true, true, + p -> GlassEncasedCogwheel.brass_clear_glass(true, p)), + TRAIN_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL = glassEncasedCogwheel("train", true, true, + p -> GlassEncasedCogwheel.train_clear_glass(true, p)); - public static void register() { - } + public static void register() { + } } diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/ModSpriteShifts.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/ModSpriteShifts.java old mode 100644 new mode 100755 index ab07f60..0d7ba91 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/ModSpriteShifts.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/ModSpriteShifts.java @@ -6,29 +6,22 @@ import com.simibubi.create.foundation.block.connected.CTSpriteShifter; import com.simibubi.create.foundation.block.connected.CTType; - public class ModSpriteShifts { - //Casings - public static final CTSpriteShiftEntry - ANDESITE_GLASS_CASING = omni("andesite_glass_casing"), + // Casings + public static final CTSpriteShiftEntry ANDESITE_GLASS_CASING = omni("andesite_glass_casing"), BRASS_GLASS_CASING = omni("brass_glass_casing"), COPPER_GLASS_CASING = omni("copper_glass_casing"), TRAIN_GLASS_CASING = omni("train_glass_casing"), STEEL_GLASS_CASING = omni("steel_glass_casing"); - //Clear Glass Casings - public static final CTSpriteShiftEntry - ANDESITE_CLEAR_GLASS_CASING = omni("andesite_clear_glass_casing"), + // Clear Glass Casings + public static final CTSpriteShiftEntry ANDESITE_CLEAR_GLASS_CASING = omni("andesite_clear_glass_casing"), BRASS_CLEAR_GLASS_CASING = omni("brass_clear_glass_casing"), TRAIN_CLEAR_GLASS_CASING = omni("train_clear_glass_casing"), COPPER_CLEAR_GLASS_CASING = omni("copper_clear_glass_casing"); - //Tinted Glass Casings - public static final CTSpriteShiftEntry - STEEL_TINTED_GLASS_CASING = omni("steel_tinted_glass_casing"); - - - + // Tinted Glass Casings + public static final CTSpriteShiftEntry STEEL_TINTED_GLASS_CASING = omni("steel_tinted_glass_casing"); ////////////////////// public static CTSpriteShiftEntry omni(String name) { @@ -46,11 +39,11 @@ public static CTSpriteShiftEntry vertical(String name) { ///// private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName, String connectedTextureName) { - return CTSpriteShifter.getCT(type, Create_Crystal_Clear.asResource("block/" + blockTextureName), Create_Crystal_Clear.asResource("block/" + connectedTextureName + "_connected")); + return CTSpriteShifter.getCT(type, Create_Crystal_Clear.asResource("block/" + blockTextureName), + Create_Crystal_Clear.asResource("block/" + connectedTextureName + "_connected")); } private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName) { return getCT(type, blockTextureName, blockTextureName); } } - diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/compat/AlloyedCompatBlocks.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/compat/AlloyedCompatBlocks.java new file mode 100755 index 0000000..4639dbb --- /dev/null +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/compat/AlloyedCompatBlocks.java @@ -0,0 +1,32 @@ +package com.cyvack.create_crystal_clear.blocks.compat; + +import com.cyvack.create_crystal_clear.Create_Crystal_Clear; +import com.cyvack.create_crystal_clear.blocks.CrystalClearTab; +import com.cyvack.create_crystal_clear.blocks.glass_encased_shaft.GlassEncasedShaftBlock; +import com.cyvack.create_crystal_clear.blocks.glass_casings.GlassCasing; +import com.cyvack.create_crystal_clear.blocks.ModSpriteShifts; +import com.cyvack.create_crystal_clear.blocks.glass_casings.TintedGlassCasing; +import com.simibubi.create.foundation.block.connected.SimpleCTBehaviour; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.tterrag.registrate.util.entry.BlockEntry; + +import static com.cyvack.create_crystal_clear.data_gen.BlockBuilders.*; + +public class AlloyedCompatBlocks { + private static final + CreateRegistrate REGISTRATE = Create_Crystal_Clear.registrate().creativeModeTab(()-> CrystalClearTab.GLASS_TAB); + + public static final BlockEntry + + STEEL_GLASS_CASING = + glasscasing("steel_glass_casing", ()-> new SimpleCTBehaviour((ModSpriteShifts.STEEL_GLASS_CASING))); + + public static final BlockEntry + STEEL_TINTED_GLASS_CASING = + tintedglasscasing("steel_tinted_glass_casing", () -> new SimpleCTBehaviour((ModSpriteShifts.STEEL_TINTED_GLASS_CASING))); + + public static final BlockEntry + STEEL_GLASS_ENCASED_SHAFT = glassEncasedShaft("steel", false, GlassEncasedShaftBlock::steelglass); + + public static void register() {} +} diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/GlassCasing.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/GlassCasing.java old mode 100644 new mode 100755 index 5ebe545..e4f3652 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/GlassCasing.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/GlassCasing.java @@ -2,18 +2,27 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.GlassBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.FluidState; public class GlassCasing extends GlassBlock { - public GlassCasing(Properties p_53640_) { - super(p_53640_); - } + public GlassCasing(Properties p_53640_) { + super(p_53640_); + } + @Override @Environment(EnvType.CLIENT) public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction side) { return ((pState.getBlock() instanceof GlassCasing) && (pAdjacentBlockState.getBlock() instanceof GlassCasing)); } + + // @Override + public boolean shouldDisplayFluidOverlay(BlockState state, BlockAndTintGetter world, BlockPos pos, FluidState fluidState) { + return true; + } } diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/TintedGlassCasing.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/TintedGlassCasing.java old mode 100644 new mode 100755 index 2b6f557..2e35cae --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/TintedGlassCasing.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_casings/TintedGlassCasing.java @@ -4,28 +4,35 @@ import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.GlassBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.FluidState; public class TintedGlassCasing extends GlassBlock { - public TintedGlassCasing(Properties p_53640_) { - super(p_53640_); - } + public TintedGlassCasing(Properties p_53640_) { + super(p_53640_); + } + @Override @Environment(EnvType.CLIENT) public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Direction side) { return ((state.getBlock() instanceof TintedGlassCasing) && (adjacentBlockState.getBlock() instanceof TintedGlassCasing)); } - @Override - public boolean propagatesSkylightDown(BlockState p_154824_, BlockGetter p_154825_, BlockPos p_154826_) { - return false; - } + @Override + public boolean propagatesSkylightDown(BlockState p_154824_, BlockGetter p_154825_, BlockPos p_154826_) { + return false; + } - @Override - public int getLightBlock(BlockState p_154828_, BlockGetter p_154829_, BlockPos p_154830_) { - return p_154829_.getMaxLightLevel(); - } + @Override + public int getLightBlock(BlockState p_154828_, BlockGetter p_154829_, BlockPos p_154830_) { + return p_154829_.getMaxLightLevel(); + } + // @Override + public boolean shouldDisplayFluidOverlay(BlockState state, BlockAndTintGetter world, BlockPos pos, FluidState fluidState) { + return true; + } } diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_cogwheel/GlassEncasedCogwheel.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_cogwheel/GlassEncasedCogwheel.java old mode 100644 new mode 100755 index 1ed5ae0..353af63 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_cogwheel/GlassEncasedCogwheel.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_cogwheel/GlassEncasedCogwheel.java @@ -25,10 +25,12 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; @@ -39,6 +41,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; public class GlassEncasedCogwheel extends RotatedPillarKineticBlock implements ICogWheel, ITE, ISpecialBlockItemRequirement, ITransformableBlock { public static final BooleanProperty TOP_SHAFT = BooleanProperty.create("top_shaft"); @@ -87,6 +91,16 @@ protected void createBlockStateDefinition(StateDefinition.Builder pItems) {} + // @Override + public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player) { + if (target instanceof BlockHitResult) + return ((BlockHitResult) target).getDirection() + .getAxis() != getRotationAxis(state) + ? isLarge ? AllBlocks.LARGE_COGWHEEL.asStack() : AllBlocks.COGWHEEL.asStack() + : getCasing().asStack(); + return this.asItem().getDefaultInstance(); + } + @Override public BlockState getStateForPlacement(BlockPlaceContext context) { BlockState placedOn = context.getLevel() @@ -272,6 +286,7 @@ public BlockEntityType getTileEntityType() { return isLarge ? ModtileEntities.GLASS_ENCASED_LARGE_COG.get() : ModtileEntities.GLASS_ENCASED_COG.get(); } + @SuppressWarnings("deprecation") @Override @Environment(EnvType.CLIENT) public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction side) { diff --git a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_shaft/GlassEncasedShaftBlock.java b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_shaft/GlassEncasedShaftBlock.java old mode 100644 new mode 100755 index a26743d..10d5e78 --- a/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_shaft/GlassEncasedShaftBlock.java +++ b/src/main/java/com/cyvack/create_crystal_clear/blocks/glass_encased_shaft/GlassEncasedShaftBlock.java @@ -1,6 +1,7 @@ package com.cyvack.create_crystal_clear.blocks.glass_encased_shaft; import com.cyvack.create_crystal_clear.blocks.ModBlocks; +import com.cyvack.create_crystal_clear.blocks.compat.AlloyedCompatBlocks; import com.cyvack.create_crystal_clear.blocks.glass_casings.GlassCasing; import com.cyvack.create_crystal_clear.tile_entities.ModtileEntities; import com.simibubi.create.AllBlocks; @@ -17,48 +18,54 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +public class GlassEncasedShaftBlock extends AbstractEncasedShaftBlock + implements ITE, ISpecialBlockItemRequirement { -public class GlassEncasedShaftBlock extends AbstractEncasedShaftBlock implements ITE, ISpecialBlockItemRequirement { - - private BlockEntry GlassCasing; + private BlockEntry GlassCasing; public static GlassEncasedShaftBlock andesiteglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.ANDESITE_GLASS_CASING); } + public static GlassEncasedShaftBlock andesiteclearglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.ANDESITE_CLEAR_GLASS_CASING); } + public static GlassEncasedShaftBlock brassglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.BRASS_GLASS_CASING); } + public static GlassEncasedShaftBlock brassclearglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.BRASS_CLEAR_GLASS_CASING); } - public static GlassEncasedShaftBlock trainglass(Properties properties){ + public static GlassEncasedShaftBlock trainglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.TRAIN_GLASS_CASING); } - public static GlassEncasedShaftBlock trainclearglass(Properties properties){ + public static GlassEncasedShaftBlock trainclearglass(Properties properties) { return new GlassEncasedShaftBlock(properties, ModBlocks.TRAIN_CLEAR_GLASS_CASING); } public static GlassEncasedShaftBlock steelglass(Properties properties) { - return new GlassEncasedShaftBlock(properties, ModBlocks.STEEL_GLASS_CASING); + return new GlassEncasedShaftBlock(properties, AlloyedCompatBlocks.STEEL_GLASS_CASING); } - - - public GlassEncasedShaftBlock(Properties properties, BlockEntry GlassCasing) { + public GlassEncasedShaftBlock(Properties properties, BlockEntry GlassCasing) { super(properties); this.GlassCasing = GlassCasing; } @@ -68,7 +75,8 @@ public BlockEntry getCasing() { } @Override - public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) {} + public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) { + } @Override public InteractionResult onSneakWrenched(BlockState state, UseOnContext context) { @@ -82,6 +90,15 @@ public InteractionResult onSneakWrenched(BlockState state, UseOnContext context) return InteractionResult.SUCCESS; } + // @Override + public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter world, BlockPos pos, + Player player) { + if (target instanceof BlockHitResult) + return ((BlockHitResult) target).getDirection() + .getAxis() == getRotationAxis(state) ? AllBlocks.SHAFT.asStack() : getCasing().asStack(); + return this.asItem().getDefaultInstance(); + } + @Override public ItemRequirement getRequiredItems(BlockState state, BlockEntity te) { return ItemRequirement.of(AllBlocks.SHAFT.getDefaultState(), te); @@ -97,15 +114,18 @@ public BlockEntityType getTileEntityType() { return ModtileEntities.GLASS_ENCASED_SHAFT.get(); } - @Override - @Environment(EnvType.CLIENT) - public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction side) { - return ((pState.getBlock() instanceof GlassEncasedShaftBlock) && (pAdjacentBlockState.getBlock() instanceof GlassEncasedShaftBlock)); + // @Override + public boolean shouldDisplayFluidOverlay(BlockState state, BlockAndTintGetter world, BlockPos pos, + FluidState fluidState) { + return true; } + @SuppressWarnings("deprecation") @Override - public float getShadeBrightness(BlockState pState, BlockGetter pLevel, BlockPos pPos) { - return 1.0F; + @Environment(EnvType.CLIENT) + public boolean skipRendering(BlockState pState, BlockState pAdjacentBlockState, Direction side) { + return ((pState.getBlock() instanceof GlassEncasedShaftBlock) + && (pAdjacentBlockState.getBlock() instanceof GlassEncasedShaftBlock)); } @Override diff --git a/src/main/java/com/cyvack/create_crystal_clear/data/BlockBuilders.java b/src/main/java/com/cyvack/create_crystal_clear/data/BlockBuilders.java deleted file mode 100644 index 5636fd2..0000000 --- a/src/main/java/com/cyvack/create_crystal_clear/data/BlockBuilders.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.cyvack.create_crystal_clear.data; - -import com.cyvack.create_crystal_clear.Create_Crystal_Clear; -import com.cyvack.create_crystal_clear.blocks.glass_casings.GlassCasing; -import com.cyvack.create_crystal_clear.blocks.glass_casings.TintedGlassCasing; -import com.simibubi.create.AllTags; -import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; -import com.simibubi.create.foundation.data.*; -import com.tterrag.registrate.util.entry.BlockEntry; -import net.minecraft.core.BlockPos; -import net.minecraft.data.loot.BlockLoot; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; - -import java.util.function.Supplier; - -import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; - -public class BlockBuilders { - private static Properties glassProperties(Properties p) { - return p.isValidSpawn(BlockBuilders::never) - .isRedstoneConductor(BlockBuilders::never) - .isSuffocating(BlockBuilders::never) - .isViewBlocking(BlockBuilders::never); - } - - private static boolean never(BlockState p_235436_0_, BlockGetter p_235436_1_, BlockPos p_235436_2_) { - return false; - } - - private static Boolean never(BlockState p_235427_0_, BlockGetter p_235427_1_, BlockPos p_235427_2_, - EntityType p_235427_3_) { - return false; - } - - - public static BlockEntry glassCasing(String name, Supplier behaviour) { - return Create_Crystal_Clear.registrate().block(name, GlassCasing::new) - .onRegister(connectedTextures(behaviour)) - .addLayer(() -> RenderType::cutout) - .initialProperties(() -> Blocks.GLASS) - .properties(BlockBuilders::glassProperties) - .loot(BlockLoot::dropWhenSilkTouch) - .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "", c.getName())) - .tag(AllTags.AllBlockTags.CASING.tag) - .item() - .tag(AllTags.AllItemTags.CASING.tag) - .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), p.modLoc("block/" + c.getName()))) - .build() - .register(); - } - - public static BlockEntry tintedGlassCasing(String name, Supplier behaviour) { - return Create_Crystal_Clear.registrate().block(name, TintedGlassCasing::new) - .onRegister(connectedTextures(behaviour)) - .addLayer(() -> RenderType::translucent) - .initialProperties(() -> Blocks.TINTED_GLASS) - .properties(BlockBuilders::glassProperties) - .loot(BlockLoot::dropWhenSilkTouch) - .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "", c.getName())) - .tag(AllTags.AllBlockTags.CASING.tag) - - .item() - .tag(AllTags.AllItemTags.CASING.tag) - .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), p.modLoc("block/" + c.getName()))) - - .build() - .register(); - } -} diff --git a/src/main/java/com/cyvack/create_crystal_clear/data_gen/BlockBuilders.java b/src/main/java/com/cyvack/create_crystal_clear/data_gen/BlockBuilders.java old mode 100644 new mode 100755 index cc999e3..8c45c38 --- a/src/main/java/com/cyvack/create_crystal_clear/data_gen/BlockBuilders.java +++ b/src/main/java/com/cyvack/create_crystal_clear/data_gen/BlockBuilders.java @@ -46,6 +46,8 @@ import net.minecraft.world.level.block.state.BlockState; public class BlockBuilders { + private static final CreateRegistrate REGISTRATE = Create_Crystal_Clear.registrate(); + private static @NotNull Properties glassProperties(Properties p) { return p.isValidSpawn(BlockBuilders::never) .isRedstoneConductor(BlockBuilders::never) @@ -58,33 +60,35 @@ private static boolean never(BlockState p_235436_0_, BlockGetter p_235436_1_, Bl } private static Boolean never(BlockState p_235427_0_, BlockGetter p_235427_1_, BlockPos p_235427_2_, - EntityType p_235427_3_) { + EntityType p_235427_3_) { return false; } - //Glass Casings - //Entry - public static BlockEntry glasscasing(String name, Supplier behaviour) { - return Create_Crystal_Clear.registrate().block(name, GlassCasing::new) - .onRegister(connectedTextures(behaviour)) - .addLayer(() -> RenderType::cutout) - .initialProperties(() -> Blocks.GLASS) - .loot(BlockLoot::dropWhenSilkTouch) - .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "", c.getName())) - .tag(AllTags.AllBlockTags.CASING.tag) - - .item() - .tag(AllTags.AllItemTags.CASING.tag) - .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), p.modLoc("block/" + c.getName()))) - - .build() - .register(); - } - - //Tinted Glass Casings - //Entry - public static BlockEntry tintedglasscasing(String name, Supplier behaviour){ - return Create_Crystal_Clear.registrate().block(name, TintedGlassCasing::new) + // Glass Casings + // Entry + public static BlockEntry glasscasing(String name, Supplier behaviour) { + return REGISTRATE.block(name, GlassCasing::new) + .onRegister(connectedTextures(behaviour)) + .addLayer(() -> RenderType::cutout) + .initialProperties(() -> Blocks.GLASS) + .loot(BlockLoot::dropWhenSilkTouch) + .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "", c.getName())) + .tag(AllTags.AllBlockTags.CASING.tag) + + .item() + .tag(AllTags.AllItemTags.CASING.tag) + .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), + p.modLoc("block/" + c.getName()))) + + .build() + .register(); + } + + // Tinted Glass Casings + // Entry + public static BlockEntry tintedglasscasing(String name, + Supplier behaviour) { + return REGISTRATE.block(name, TintedGlassCasing::new) .onRegister(connectedTextures(behaviour)) .addLayer(() -> RenderType::translucent) .initialProperties(() -> Blocks.TINTED_GLASS) @@ -94,80 +98,90 @@ public static BlockEntry tintedglasscasing(String name, Supp .item() .tag(AllTags.AllItemTags.CASING.tag) - .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), p.modLoc("block/" + c.getName()))) + .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/" + c.getName()), + p.modLoc("block/" + c.getName()))) .build() .register(); - } - - //Glass Encased Shafts - - //Entry - public static BlockEntry glassEncasedShaft(String casingType, Boolean clear, NonNullFunction factory){ - String name = clear? casingType + "_clear":casingType; - return Create_Crystal_Clear.registrate() - .block(name + "_glass_encased_shaft", factory) - .transform(glassEncasedShaftBuilder(name + "_glass", () -> ModSpriteShifts.omni(name+"_glass_casing"))) - .register(); - } - - //Builder - public static NonNullUnaryOperator> glassEncasedShaftBuilder(String casing, Supplier casingShift) { - return builder -> glassencasedBase(builder, AllBlocks.SHAFT::get) - .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(casingShift.get()))) - .onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, casingShift.get(), - (s, f) -> f.getAxis() != s.getValue(EncasedShaftBlock.AXIS)))) - .addLayer(() -> RenderType::cutout) - .initialProperties(() -> Blocks.GLASS) - .blockstate((c, p) -> axisBlock(c, p, blockState -> p.models() - .getExistingFile(p.modLoc("block/glass_encased_shaft/block_" + casing)), true)) - .item() - .model(AssetLookup.customBlockItemModel("glass_encased_shaft", "item_" + casing)) - .build(); - } - - - //Glass Encased Cogwheels - //Entry - public static BlockEntry glassEncasedCogwheel(String casingType, Boolean large, Boolean clear, NonNullFunction factory){ - String name = clear? casingType+"_clear" : casingType; - return !large? - //small cog - Create_Crystal_Clear.registrate() - .block(name+"_glass_encased_cogwheel", factory) - .transform(BlockBuilders.glassencasedCogwheel(casingType, clear, - ()-> ModSpriteShifts.omni(name+"_glass_casing"))) - .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(ModSpriteShifts.omni(name+"_glass_casing"), - Couple.create(ModSpriteShifts.vertical("encased_cogwheels/" + casingType +"_encased_cogwheel_side"), - ModSpriteShifts.horizontal("encased_cogwheels/" + casingType +"_encased_cogwheel_side"))))) - .register() : - //Large Cog - Create_Crystal_Clear.registrate() - .block(name+ "_glass_encased_large_cogwheel", factory) - .transform(BlockBuilders.glassencasedLargeCogwheel(casingType, clear, - () -> ModSpriteShifts.omni(name+"_glass_casing"))) + } + + // Glass Encased Shafts + + // Entry + public static BlockEntry glassEncasedShaft(String casingType, Boolean clear, + NonNullFunction factory) { + String name = clear ? casingType + "_clear" : casingType; + return REGISTRATE + .block(name + "_glass_encased_shaft", factory) + .transform( + glassEncasedShaftBuilder(name + "_glass", () -> ModSpriteShifts.omni(name + "_glass_casing"))) .register(); - } + } - //Builders - public static NonNullUnaryOperator> glassencasedCogwheel( - String casing, Boolean clear, Supplier casingShift) { - return b -> glassEncasedCogwheelBase(b, casing, clear, casingShift, AllBlocks.COGWHEEL::get, false); - } + // Builder + public static NonNullUnaryOperator> glassEncasedShaftBuilder( + String casing, Supplier casingShift) { + return builder -> glassencasedBase(builder, AllBlocks.SHAFT::get) + .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(casingShift.get()))) + .onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, casingShift.get(), + (s, f) -> f.getAxis() != s.getValue(EncasedShaftBlock.AXIS)))) + .addLayer(() -> RenderType::cutout) + .initialProperties(() -> Blocks.GLASS) + .blockstate((c, p) -> axisBlock(c, p, blockState -> p.models() + .getExistingFile(p.modLoc("block/glass_encased_shaft/block_" + casing)), true)) + .item() + .model(AssetLookup.customBlockItemModel("glass_encased_shaft", "item_" + casing)) + .build(); + } + + // Glass Encased Cogwheels + // Entry + public static BlockEntry glassEncasedCogwheel(String casingType, Boolean large, Boolean clear, + NonNullFunction factory) { + String name = clear ? casingType + "_clear" : casingType; + return !large ? + // small cog + REGISTRATE + .block(name + "_glass_encased_cogwheel", factory) + .transform(BlockBuilders.glassencasedCogwheel(casingType, clear, + () -> ModSpriteShifts.omni(name + "_glass_casing"))) + .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour( + ModSpriteShifts.omni(name + "_glass_casing"), + Couple.create( + ModSpriteShifts + .vertical("encased_cogwheels/" + casingType + "_encased_cogwheel_side"), + ModSpriteShifts.horizontal( + "encased_cogwheels/" + casingType + "_encased_cogwheel_side"))))) + .register() + : + // Large Cog + REGISTRATE + .block(name + "_glass_encased_large_cogwheel", factory) + .transform(BlockBuilders.glassencasedLargeCogwheel(casingType, clear, + () -> ModSpriteShifts.omni(name + "_glass_casing"))) + .register(); + } - public static NonNullUnaryOperator> glassencasedLargeCogwheel( - String casing, Boolean clear, Supplier casingShift) { - return b -> glassEncasedCogwheelBase(b, casing, clear, casingShift, AllBlocks.COGWHEEL::get, true) + // Builders + public static NonNullUnaryOperator> glassencasedCogwheel( + String casing, Boolean clear, Supplier casingShift) { + return b -> glassEncasedCogwheelBase(b, casing, clear, casingShift, AllBlocks.COGWHEEL::get, false); + } + + public static NonNullUnaryOperator> glassencasedLargeCogwheel( + String casing, Boolean clear, Supplier casingShift) { + return b -> glassEncasedCogwheelBase(b, casing, clear, casingShift, AllBlocks.COGWHEEL::get, true) .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(casingShift.get()))); - } + } - //----------------------------// + // ----------------------------// - //Glass Encased Cogwheel Base + // Glass Encased Cogwheel Base private static BlockBuilder glassEncasedCogwheelBase(BlockBuilder b, - String casingType, Boolean clear, Supplier casingShift, Supplier drop, boolean large) { + String casingType, Boolean clear, Supplier casingShift, Supplier drop, + boolean large) { - String casing = clear? casingType+"_clear_glass" : casingType+"_glass"; + String casing = clear ? casingType + "_clear_glass" : casingType + "_glass"; String encasedSuffix = "_encased_cogwheel_side" + (large ? "_connected" : ""); String blockFolder = large ? "encased_large_cogwheel" : "encased_cogwheel"; @@ -177,52 +191,57 @@ private static BlockBuilder glassEncas .initialProperties(() -> Blocks.GLASS) .onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, casingShift.get(), (s, f) -> f.getAxis() == s.getValue(GlassEncasedCogwheel.AXIS) - && !s.getValue(f.getAxisDirection() == Direction.AxisDirection.POSITIVE ? GlassEncasedCogwheel.TOP_SHAFT - : GlassEncasedCogwheel.BOTTOM_SHAFT)))) + && !s.getValue(f.getAxisDirection() == Direction.AxisDirection.POSITIVE + ? GlassEncasedCogwheel.TOP_SHAFT + : GlassEncasedCogwheel.BOTTOM_SHAFT)))) .blockstate((c, p) -> axisBlock(c, p, blockState -> { String suffix = (blockState.getValue(GlassEncasedCogwheel.TOP_SHAFT) ? "_top" : "") + (blockState.getValue(GlassEncasedCogwheel.BOTTOM_SHAFT) ? "_bottom" : ""); String modelName = c.getName() + suffix; - return p.models() - .withExistingParent(modelName, p.modLoc("block/" + blockFolder + "/block" + suffix)) - //Normal Casing - .texture("casing", Create_Crystal_Clear.asResource("block/" + casing + "_casing")) - //Backing - .texture("1", getBacking(casingType)) - //Gearbox - .texture(large?"3":"4", casingType.equals("andesite")? Create.asResource("block/gearbox"):getGearbox(casingType+"_")) - //Side Casing - .texture("side", getSiding(casingType, encasedSuffix)); + return p.models() + .withExistingParent(modelName, p.modLoc("block/" + blockFolder + "/block" + suffix)) + // Normal Casing + .texture("casing", Create_Crystal_Clear.asResource("block/" + casing + "_casing")) + // Backing + .texture("1", getBacking(casingType)) + // Gearbox + .texture(large ? "3" : "4", + casingType.equals("andesite") ? Create.asResource("block/gearbox") + : getGearbox(casingType + "_")) + // Side Casing + .texture("side", getSiding(casingType, encasedSuffix)); }, false)) .item() .model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/" + blockFolder + "/item")) - .texture("casing", Create_Crystal_Clear.asResource("block/" + casing + "_casing")) - //Backing - .texture("1", getBacking(casingType)) - //Gearbox - .texture(large?"3":"4", casingType.equals("andesite")? Create.asResource("block/gearbox"):getGearbox(casingType+"_")) - //Side Casing - .texture("side", getSiding(casingType, encasedSuffix))) + .texture("casing", Create_Crystal_Clear.asResource("block/" + casing + "_casing")) + // Backing + .texture("1", getBacking(casingType)) + // Gearbox + .texture(large ? "3" : "4", + casingType.equals("andesite") ? Create.asResource("block/gearbox") + : getGearbox(casingType + "_")) + // Side Casing + .texture("side", getSiding(casingType, encasedSuffix))) .build(); } - private static ResourceLocation getBacking(String backing){ - return backing.equals("andesite")? new ResourceLocation("block/stripped_spruce_log_top") : - backing.equals("brass") ? new ResourceLocation("block/stripped_dark_oak_log_top") : - Create_Crystal_Clear.asResource("block/" + backing + "_backing"); + private static ResourceLocation getBacking(String backing) { + return backing.equals("andesite") ? new ResourceLocation("block/stripped_spruce_log_top") + : backing.equals("brass") ? new ResourceLocation("block/stripped_dark_oak_log_top") + : Create_Crystal_Clear.asResource("block/" + backing + "_backing"); } - private static ResourceLocation getGearbox(String opening){ - return opening.equals("brass_") ? - Create.asResource("block/" + opening + "gearbox") : - Create_Crystal_Clear.asResource("block/" + opening + "gearbox"); + private static ResourceLocation getGearbox(String opening) { + return opening.equals("brass_") ? Create.asResource("block/" + opening + "gearbox") + : Create_Crystal_Clear.asResource("block/" + opening + "gearbox"); } - private static ResourceLocation getSiding(String siding, String encasedSuffix){ + private static ResourceLocation getSiding(String siding, String encasedSuffix) { return Create_Crystal_Clear.asResource("block/encased_cogwheels/" + siding + encasedSuffix); } - private static BlockBuilder glassencasedBase(BlockBuilder b, Supplier drop) { + private static BlockBuilder glassencasedBase(BlockBuilder b, + Supplier drop) { return b.properties(BlockBehaviour.Properties::noOcclusion) .transform(BlockStressDefaults.setNoImpact()) .loot((p, lb) -> p.dropOther(lb, drop.get())); diff --git a/src/main/java/com/cyvack/create_crystal_clear/mixins/CogwheelMixin.java b/src/main/java/com/cyvack/create_crystal_clear/mixins/CogwheelMixin.java old mode 100644 new mode 100755 index 2953eb6..f76613d --- a/src/main/java/com/cyvack/create_crystal_clear/mixins/CogwheelMixin.java +++ b/src/main/java/com/cyvack/create_crystal_clear/mixins/CogwheelMixin.java @@ -1,6 +1,5 @@ package com.cyvack.create_crystal_clear.mixins; - import static com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock.AXIS; import org.spongepowered.asm.mixin.Mixin; @@ -26,32 +25,29 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; - @Mixin(CogWheelBlock.class) public class CogwheelMixin { - @Inject(method = "use", at = @At("HEAD"), cancellable = true) - - private void Inject(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult ray, CallbackInfoReturnable cir) { - if (player.isShiftKeyDown() || !player.mayBuild()) - cir.setReturnValue(InteractionResult.PASS); + @Inject(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"), cancellable = true) + private void Inject(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult ray, CallbackInfoReturnable cir) { ItemStack heldItem = player.getItemInHand(hand); - GlassEncasedCogwheel[] glassEncasedBlocks = isLarge - ? new GlassEncasedCogwheel[]{ - ModBlocks.ANDESITE_GLASS_ENCASED_LARGE_COGWHEEL.get(), - ModBlocks.BRASS_GLASS_ENCASED_LARGE_COGWHEEL.get(), - ModBlocks.TRAIN_GLASS_ENCASED_LARGE_COGWHEEL.get(), - ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get(), - ModBlocks.BRASS_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get(), - ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get()} //Add more large cogs - - : new GlassEncasedCogwheel[]{ - ModBlocks.ANDESITE_GLASS_ENCASED_COGWHEEL.get(), - ModBlocks.BRASS_GLASS_ENCASED_COGWHEEL.get(), - ModBlocks.TRAIN_GLASS_ENCASED_COGWHEEL.get(), - ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_COGWHEEL.get(), - ModBlocks.BRASS_CLEAR_GLASS_ENCASED_COGWHEEL.get(), - ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_COGWHEEL.get()}; //Add more small cogs + GlassEncasedCogwheel[] glassEncasedBlocks = this.isLarge + ? new GlassEncasedCogwheel[] { + ModBlocks.ANDESITE_GLASS_ENCASED_LARGE_COGWHEEL.get(), + ModBlocks.BRASS_GLASS_ENCASED_LARGE_COGWHEEL.get(), + ModBlocks.TRAIN_GLASS_ENCASED_LARGE_COGWHEEL.get(), + ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get(), + ModBlocks.BRASS_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get(), + ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_LARGE_COGWHEEL.get() } // Add more large cogs + + : new GlassEncasedCogwheel[] { + ModBlocks.ANDESITE_GLASS_ENCASED_COGWHEEL.get(), + ModBlocks.BRASS_GLASS_ENCASED_COGWHEEL.get(), + ModBlocks.TRAIN_GLASS_ENCASED_COGWHEEL.get(), + ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_COGWHEEL.get(), + ModBlocks.BRASS_CLEAR_GLASS_ENCASED_COGWHEEL.get(), + ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_COGWHEEL.get() }; // Add more small cogs for (GlassEncasedCogwheel glassEncasedCogwheel : glassEncasedBlocks) { if (!glassEncasedCogwheel.getCasing() @@ -66,12 +62,13 @@ private void Inject(BlockState state, Level world, BlockPos pos, Player player, for (Direction d : Iterate.directionsInAxis(state.getValue(AXIS))) { BlockState adjacentState = world.getBlockState(pos.relative(d)); - if (!(adjacentState.getBlock() instanceof IRotate def)) + if (!(adjacentState.getBlock() instanceof IRotate)) continue; + IRotate def = (IRotate) adjacentState.getBlock(); if (!def.hasShaftTowards(world, pos.relative(d), adjacentState, d.getOpposite())) continue; - encasedState = - encasedState.cycle(d.getAxisDirection() == Direction.AxisDirection.POSITIVE ? GlassEncasedCogwheel.TOP_SHAFT + encasedState = encasedState + .cycle(d.getAxisDirection() == Direction.AxisDirection.POSITIVE ? GlassEncasedCogwheel.TOP_SHAFT : GlassEncasedCogwheel.BOTTOM_SHAFT); } diff --git a/src/main/java/com/cyvack/create_crystal_clear/mixins/ShaftMixin.java b/src/main/java/com/cyvack/create_crystal_clear/mixins/ShaftMixin.java old mode 100644 new mode 100755 index 85e6d13..75a7480 --- a/src/main/java/com/cyvack/create_crystal_clear/mixins/ShaftMixin.java +++ b/src/main/java/com/cyvack/create_crystal_clear/mixins/ShaftMixin.java @@ -1,11 +1,21 @@ package com.cyvack.create_crystal_clear.mixins; +import static com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock.AXIS; + +import java.util.ArrayList; + +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.CallbackInfoReturnable; -import com.cyvack.create_crystal_clear.blocks.glass_encased_shaft.GlassEncasedShaftBlock; import com.cyvack.create_crystal_clear.Create_Crystal_Clear; import com.cyvack.create_crystal_clear.blocks.ModBlocks; +import com.cyvack.create_crystal_clear.blocks.compat.AlloyedCompatBlocks; +import com.cyvack.create_crystal_clear.blocks.glass_encased_shaft.GlassEncasedShaftBlock; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; + import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -14,45 +24,41 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -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.CallbackInfoReturnable; - -import java.util.ArrayList; - -import static com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock.AXIS; @Mixin(ShaftBlock.class) public class ShaftMixin { - @Inject(method = "use", at = @At(value ="INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"), cancellable = true) - private void Inject(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult ray, CallbackInfoReturnable cir){ - ItemStack heldItem = player.getItemInHand(hand); - ArrayList encasedShaft = new ArrayList<>() { - { - add(ModBlocks.ANDESITE_GLASS_ENCASED_SHAFT.get()); - add(ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_SHAFT.get()); - add(ModBlocks.BRASS_GLASS_ENCASED_SHAFT.get()); - add(ModBlocks.BRASS_CLEAR_GLASS_ENCASED_SHAFT.get()); - add(ModBlocks.TRAIN_GLASS_ENCASED_SHAFT.get()); - add(ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_SHAFT.get()); - if (Create_Crystal_Clear.isAlloyedLoaded) {add(ModBlocks.STEEL_GLASS_ENCASED_SHAFT.get());} + @Inject(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"), cancellable = true) + private void Inject(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult ray, CallbackInfoReturnable cir) { + ItemStack heldItem = player.getItemInHand(hand); + ArrayList encasedShaft3 = new ArrayList<>() { + { + add(ModBlocks.ANDESITE_GLASS_ENCASED_SHAFT.get()); + add(ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_SHAFT.get()); + add(ModBlocks.BRASS_GLASS_ENCASED_SHAFT.get()); + add(ModBlocks.BRASS_CLEAR_GLASS_ENCASED_SHAFT.get()); + add(ModBlocks.TRAIN_GLASS_ENCASED_SHAFT.get()); + add(ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_SHAFT.get()); + if (Create_Crystal_Clear.isAlloyedLoaded) { + add(AlloyedCompatBlocks.STEEL_GLASS_ENCASED_SHAFT.get()); } - }; - - for (GlassEncasedShaftBlock glassEncasedShaftBlock : encasedShaft) { + } + }; - if (!glassEncasedShaftBlock.getCasing() - .isIn(heldItem)) - continue; + for (GlassEncasedShaftBlock glassEncasedShaftBlock : encasedShaft3) { - if (world.isClientSide) - cir.setReturnValue(InteractionResult.SUCCESS); + if (!glassEncasedShaftBlock.getCasing() + .isIn(heldItem)) + continue; - KineticTileEntity.switchToBlockState(world, pos, glassEncasedShaftBlock.defaultBlockState() - .setValue(AXIS, state.getValue(AXIS))); + if (world.isClientSide) cir.setReturnValue(InteractionResult.SUCCESS); - } + + KineticTileEntity.switchToBlockState(world, pos, glassEncasedShaftBlock.defaultBlockState() + .setValue(AXIS, state.getValue(AXIS))); + cir.setReturnValue(InteractionResult.SUCCESS); } + } + } diff --git a/src/main/java/com/cyvack/create_crystal_clear/tile_entities/ModtileEntities.java b/src/main/java/com/cyvack/create_crystal_clear/tile_entities/ModtileEntities.java old mode 100644 new mode 100755 index 27d01dc..3d77115 --- a/src/main/java/com/cyvack/create_crystal_clear/tile_entities/ModtileEntities.java +++ b/src/main/java/com/cyvack/create_crystal_clear/tile_entities/ModtileEntities.java @@ -8,22 +8,27 @@ import com.simibubi.create.content.contraptions.relays.encased.EncasedCogRenderer; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; import com.simibubi.create.content.contraptions.relays.encased.ShaftRenderer; +import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.BlockEntityEntry; public class ModtileEntities { + private static final CreateRegistrate REGISTRATE = Create_Crystal_Clear.registrate(); + + ///////// + //Glass Encased Shafts - public static final BlockEntityEntry GLASS_ENCASED_SHAFT = Create_Crystal_Clear.registrate() + public static final BlockEntityEntry GLASS_ENCASED_SHAFT = REGISTRATE .tileEntity("glass_encased_shaft", KineticTileEntity::new) .instance(()-> ShaftInstance::new, false) .validBlocks(ModBlocks.ANDESITE_GLASS_ENCASED_SHAFT, ModBlocks.ANDESITE_CLEAR_GLASS_ENCASED_SHAFT, ModBlocks.BRASS_GLASS_ENCASED_SHAFT, ModBlocks.BRASS_CLEAR_GLASS_ENCASED_SHAFT, - ModBlocks.TRAIN_GLASS_ENCASED_SHAFT, ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_SHAFT, - ModBlocks.STEEL_GLASS_ENCASED_SHAFT) + ModBlocks.TRAIN_GLASS_ENCASED_SHAFT, ModBlocks.TRAIN_CLEAR_GLASS_ENCASED_SHAFT + ) .renderer(()-> ShaftRenderer::new) .register(); //Glass Encased Small Cogs - public static final BlockEntityEntry GLASS_ENCASED_COG = Create_Crystal_Clear.registrate() + public static final BlockEntityEntry GLASS_ENCASED_COG = REGISTRATE .tileEntity("glass_encased_cog", SimpleKineticTileEntity::new) .instance(()-> EncasedCogInstance::small, false) .validBlocks(ModBlocks.ANDESITE_GLASS_ENCASED_COGWHEEL, @@ -36,7 +41,7 @@ public class ModtileEntities { .register(); //Glass Encased Large Cogs - public static final BlockEntityEntry GLASS_ENCASED_LARGE_COG = Create_Crystal_Clear.registrate() + public static final BlockEntityEntry GLASS_ENCASED_LARGE_COG = REGISTRATE .tileEntity("glass_encased_large_cog", SimpleKineticTileEntity::new) .instance(()-> EncasedCogInstance::large, false) .validBlocks(ModBlocks.ANDESITE_GLASS_ENCASED_LARGE_COGWHEEL, @@ -48,6 +53,5 @@ public class ModtileEntities { .renderer(()-> EncasedCogRenderer::large) .register(); - public static void register() { - } + public static void register() {} } diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_casing.json b/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_casing.json deleted file mode 100644 index 9f7f0c0..0000000 --- a/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "create_crystal_clear:block/steel_glass_casing" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_encased_shaft.json b/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_encased_shaft.json deleted file mode 100644 index ab64147..0000000 --- a/src/main/resources/assets/create_crystal_clear/blockstates/steel_glass_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "create_crystal_clear:block/glass_encased_shaft/block_steel_glass", - "x": 90, - "y": 90, - "uvlock": true - }, - "axis=y": { - "model": "create_crystal_clear:block/glass_encased_shaft/block_steel_glass", - "uvlock": true - }, - "axis=z": { - "model": "create_crystal_clear:block/glass_encased_shaft/block_steel_glass", - "x": 90, - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/blockstates/steel_tinted_glass_casing.json b/src/main/resources/assets/create_crystal_clear/blockstates/steel_tinted_glass_casing.json deleted file mode 100644 index e9b0e07..0000000 --- a/src/main/resources/assets/create_crystal_clear/blockstates/steel_tinted_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "create_crystal_clear:block/steel_tinted_glass_casing" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/lang/zh_cn.json b/src/main/resources/assets/create_crystal_clear/lang/zh_cn.json deleted file mode 100644 index 6661db8..0000000 --- a/src/main/resources/assets/create_crystal_clear/lang/zh_cn.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "block.create_crystal_clear.andesite_clear_glass_casing": "安山通透玻璃机壳", - "block.create_crystal_clear.andesite_glass_casing": "安山玻璃机壳", - "block.create_crystal_clear.brass_clear_glass_casing": "黄铜通透玻璃机壳", - "block.create_crystal_clear.brass_glass_casing": "黄铜玻璃机壳", - "block.create_crystal_clear.copper_clear_glass_casing": "铜通透玻璃机壳", - "block.create_crystal_clear.copper_glass_casing": "铜玻璃机壳", - "block.create_crystal_clear.steel_glass_casing": "钢玻璃机壳", - "block.create_crystal_clear.steel_tinted_glass_casing": "钢遮光玻璃机壳", - "itemGroup.create_crystal_clear.create_crystal_clear": "Create: Crystal Clear" -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/logo.png b/src/main/resources/assets/create_crystal_clear/logo.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_bottom.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_top.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_top_bottom.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/block_top_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/item.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_cogwheel/item.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_bottom.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_top.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_top.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_top_bottom.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/block_top_bottom.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/item.json b/src/main/resources/assets/create_crystal_clear/models/block/encased_large_cogwheel/item.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/Originalblock.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/Originalblock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block.bbmodel b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block.bbmodel old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_andesite_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_andesite_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_andesite_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_andesite_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_brass_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_brass_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_brass_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_brass_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_steel_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_steel_glass.json old mode 100644 new mode 100755 index bbcd436..ca59e11 --- a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_steel_glass.json +++ b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_steel_glass.json @@ -2,6 +2,6 @@ "parent": "create_crystal_clear:block/glass_encased_shaft/block", "textures": { "casing": "create_crystal_clear:block/steel_glass_casing", - "opening": "create_crystal_clear:block/steel_gearbox" + "opening": "create:block/gearbox" } } \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_train_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_train_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_train_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/block_train_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_andesite_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_andesite_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_andesite_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_andesite_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_brass_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_brass_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_brass_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_brass_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_steel_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_steel_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_train_clear_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_train_clear_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_train_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/glass_encased_shaft/item_train_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/item_andesite_glass.json b/src/main/resources/assets/create_crystal_clear/models/block/item_andesite_glass.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/models/block/steel_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/block/steel_glass_casing.json deleted file mode 100644 index 3ba4c98..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/block/steel_glass_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create_crystal_clear:block/steel_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/block/steel_tinted_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/block/steel_tinted_glass_casing.json deleted file mode 100644 index 334dfae..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/block/steel_tinted_glass_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create_crystal_clear:block/steel_tinted_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json deleted file mode 100644 index 973ee24..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/andesite_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/andesite_glass_casing", - "end": "create_crystal_clear:block/andesite_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json deleted file mode 100644 index 417ed37..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/brass_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/brass_glass_casing", - "end": "create_crystal_clear:block/brass_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json deleted file mode 100644 index 63f2fac..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/copper_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/copper_glass_casing", - "end": "create_crystal_clear:block/copper_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_casing.json deleted file mode 100644 index 06cd1ac..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/steel_glass_casing", - "end": "create_crystal_clear:block/steel_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_encased_shaft.json b/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_encased_shaft.json deleted file mode 100644 index 17a4b8d..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/steel_glass_encased_shaft.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create_crystal_clear:block/glass_encased_shaft/item_steel_glass" -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/steel_tinted_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/steel_tinted_glass_casing.json deleted file mode 100644 index 6ee0de0..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/steel_tinted_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/steel_tinted_glass_casing", - "end": "create_crystal_clear:block/steel_tinted_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_casing.json b/src/main/resources/assets/create_crystal_clear/models/item/train_glass_casing.json deleted file mode 100644 index 6de80da..0000000 --- a/src/main/resources/assets/create_crystal_clear/models/item/train_glass_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "create_crystal_clear:block/train_glass_casing", - "end": "create_crystal_clear:block/train_glass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/andesite_clear_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/andesite_clear_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/andesite_clear_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/andesite_clear_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/andesite_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/andesite_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/andesite_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/andesite_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing_connected.png old mode 100644 new mode 100755 index 9f119e7..1de590d Binary files a/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing_connected.png and b/src/main/resources/assets/create_crystal_clear/textures/block/brass_clear_glass_casing_connected.png differ diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/brass_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/brass_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/brass_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/brass_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/copper_clear_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/copper_clear_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/copper_clear_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/copper_clear_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/copper_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/copper_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/copper_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/copper_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/andesite_encased_cogwheel_side.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/andesite_encased_cogwheel_side.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/andesite_encased_cogwheel_side_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/andesite_encased_cogwheel_side_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/brass_encased_cogwheel_side.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/brass_encased_cogwheel_side.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/brass_encased_cogwheel_side_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/brass_encased_cogwheel_side_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side_connected.png old mode 100644 new mode 100755 index 7c8b09c..94dac37 Binary files a/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side_connected.png and b/src/main/resources/assets/create_crystal_clear/textures/block/encased_cogwheels/train_encased_cogwheel_side_connected.png differ diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/steel_gearbox.png b/src/main/resources/assets/create_crystal_clear/textures/block/steel_gearbox.png deleted file mode 100644 index 51fdb1b..0000000 Binary files a/src/main/resources/assets/create_crystal_clear/textures/block/steel_gearbox.png and /dev/null differ diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/steel_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/steel_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/steel_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/steel_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/steel_tinted_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/steel_tinted_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/steel_tinted_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/steel_tinted_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_backing.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_backing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_clear_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_clear_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_clear_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_clear_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_gearbox.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_gearbox.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_glass_casing.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_glass_casing.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/create_crystal_clear/textures/block/train_glass_casing_connected.png b/src/main/resources/assets/create_crystal_clear/textures/block/train_glass_casing_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/create_crystal_clear.mixins.json b/src/main/resources/create_crystal_clear.mixins.json old mode 100644 new mode 100755 index 8e9879f..fab8d0c --- a/src/main/resources/create_crystal_clear.mixins.json +++ b/src/main/resources/create_crystal_clear.mixins.json @@ -1,16 +1,11 @@ { "required": true, - "priority": 1100, "package": "com.cyvack.create_crystal_clear.mixins", "compatibilityLevel": "JAVA_17", - "mixins": [ - "CogwheelMixin", - "ShaftMixin" - ], - "client":[ - ], + "mixins": ["CogwheelMixin", "ShaftMixin"], + "client": [], "minVersion": "0.8", "injectors": { "defaultRequire": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_casing.json b/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_casing.json deleted file mode 100644 index 630be70..0000000 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_casing.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:steel_glass_casing" - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_encased_shaft.json b/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_encased_shaft.json deleted file mode 100644 index 647a8e0..0000000 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_glass_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create:shaft" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_tinted_glass_casing.json b/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_tinted_glass_casing.json deleted file mode 100644 index 934608e..0000000 --- a/src/main/resources/data/create_crystal_clear/loot_tables/blocks/steel_tinted_glass_casing.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create_crystal_clear:steel_tinted_glass_casing" - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/recipes/andesite_clear_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/andesite_clear_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/andesite_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/andesite_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/brass_clear_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/brass_clear_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/brass_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/brass_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/copper_clear_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/copper_clear_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/copper_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/copper_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/steel_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/steel_glass_casing.json old mode 100644 new mode 100755 index 1c1a56d..e5ea66e --- a/src/main/resources/data/create_crystal_clear/recipes/steel_glass_casing.json +++ b/src/main/resources/data/create_crystal_clear/recipes/steel_glass_casing.json @@ -1,10 +1,8 @@ { "fabric:load_conditions": [ { - "condition": "fabric:item_tags_populated", - "values": [ - "c:steel_ingots" - ] + "condition": "fabric:all_mods_loaded", + "values": ["alloyed"] } ], "type": "create:item_application", @@ -13,7 +11,7 @@ "item": "create:framed_glass" }, { - "tag": "c:steel_ingots" + "item": "alloyed:steel_ingot" } ], "results": [ @@ -21,4 +19,4 @@ "item": "create_crystal_clear:steel_glass_casing" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/create_crystal_clear/recipes/steel_tinted_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/steel_tinted_glass_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/create_crystal_clear/recipes/train_clear_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/train_clear_glass_casing.json new file mode 100755 index 0000000..3d9f006 --- /dev/null +++ b/src/main/resources/data/create_crystal_clear/recipes/train_clear_glass_casing.json @@ -0,0 +1,16 @@ +{ + "type": "create:item_application", + "ingredients": [ + { + "item": "create_crystal_clear:train_glass_casing" + }, + { + "item": "create:framed_glass" + } + ], + "results": [ + { + "item": "create_crystal_clear:train_clear_glass_casing" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create_crystal_clear/recipes/train_glass_casing.json b/src/main/resources/data/create_crystal_clear/recipes/train_glass_casing.json new file mode 100755 index 0000000..fd967b3 --- /dev/null +++ b/src/main/resources/data/create_crystal_clear/recipes/train_glass_casing.json @@ -0,0 +1,16 @@ +{ + "type": "create:item_application", + "ingredients": [ + { + "item": "create:railway_casing" + }, + { + "item": "create:framed_glass" + } + ], + "results": [ + { + "item": "create_crystal_clear:train_glass_casing" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4ede7c0..4ff94a3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,34 +2,20 @@ "schemaVersion": 1, "id": "create_crystal_clear", "version": "${version}", - "name": "Create: Crystal Clear", "description": "The ultimate Glass Casing Experience", - "authors": [ - "NovaStarter", - "DM Fabric Ports" - ], - "contact": { - "homepage": "https://github.com/DM-Fabric-Ports/Create-Crystal-Clear" - }, - - "license": "MIT", + "authors": ["NovaStarter"], "icon": "assets/create_crystal_clear/logo.png", - + "license": "MIT", "environment": "*", "entrypoints": { - "main": [ - "com.cyvack.create_crystal_clear.Create_Crystal_Clear" - ] + "main": ["com.cyvack.create_crystal_clear.Create_Crystal_Clear"] }, - "mixins": [ - "create_crystal_clear.mixins.json" - ], - + "mixins": ["create_crystal_clear.mixins.json"], "depends": { "fabricloader": ">=0.14.6", "fabric": "*", - "minecraft": "~1.18.2", + "minecraft": "~1.19.2", "java": ">=17", "create": "*" },