Skillet stuff

.gitignore

@@ -25,3 +25,4 @@ docsOut
 
 # Files from Forge MDK
 forge*changelog.txt
+/src/generated/resources/.cache/

build.gradle

@@ -33,7 +33,7 @@ archivesBaseName = 'FarmersDelight'
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'parchment', version: '2022.11.27-1.19.2'
+    mappings channel: 'parchment', version: "2022.11.27-${mc_version}"
 //    mappings channel: 'official', version: "${mc_version}"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 

changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.3.0-beta1
+
+**This is a BETA build!** The goal is to playtest experimental changes, and gather feedback on them. Please let me know what you think of the changes below!
+
+### Experimental changes:
+- The Cutting Board has been redesigned!
+  - It can now hold a full stack of items, instead of one at a time. This allows players to process their stacks in half the time it took before;
+  - If the board's stack isn't full yet, players can top it up with more items;
+  - When cutting, the status bar will show how many items are left on the board;
+  - Comparator signal will now be based on the fill percentage for the item's max stack size;
+  - All off-hand interaction has been removed. Placing, removing and processing items is done entirely with the main hand;
+  - The `offhand_equipment` tag has been removed.
+
+### Notes
+I am considering letting players use the processing tool from the off-hand, but doing so requires more code rewrites. I may release a second build with this change added in, if I can get it to work.
+
 ## 1.2.4
 
 ### Updates

gradle.properties

@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod Info
-mod_version=1.2.4
+mod_version=1.3.0-beta-2
 mc_version=1.19.2
-forge_version=43.1.0
+forge_version=43.2.21
 
 # Dependency Info
 jei_version=11.4.0.285

src/generated/resources/.cache/4394a922362a46e7168ebf92a9b34ed348d0c5bc

@@ -1,158 +0,0 @@
-// 1.19.2	2023-07-09T23:07:33.4512339	Item Models: farmersdelight
-01e23a47f469a0c2107b2a1b6fc7f7c8f0c23d55 assets/farmersdelight/models/item/acacia_cabinet.json
-a58cc863fafd0f13d1235a2f7344b446f853ae55 assets/farmersdelight/models/item/apple_cider.json
-8348e66b9efe6a92614cca78c3463d3efaea57fa assets/farmersdelight/models/item/apple_pie.json
-28f30b5c9272045e5fc6f5a418b723982d564aae assets/farmersdelight/models/item/apple_pie_slice.json
-ad2a8f7967c3246637ca59cc318dd622da19e59c assets/farmersdelight/models/item/bacon.json
-52d5d47595857a38040a68d360b49037fd0f0e07 assets/farmersdelight/models/item/bacon_and_eggs.json
-fdf3aec6a0587d7433fc34838c06bc4629b42b6f assets/farmersdelight/models/item/bacon_sandwich.json
-bc153118bad1dff35ed07c8f14b40c7676c834b7 assets/farmersdelight/models/item/baked_cod_stew.json
-3f305623cf41b67d5a413a67291a1c0a5c50e8fc assets/farmersdelight/models/item/barbecue_stick.json
-fde8de45de2287b31a35f8c563fcb445ab8c9906 assets/farmersdelight/models/item/basket.json
-204aea5fb950c545194b505b420083f03d274fe5 assets/farmersdelight/models/item/beef_patty.json
-849ebf719f4e3dfe046dad1f95a294a05ad92669 assets/farmersdelight/models/item/beef_stew.json
-4dcb43ecd354f9df032c031d8d37f3c0a514c668 assets/farmersdelight/models/item/beetroot_crate.json
-791daff700210270a8580f1669db836632636f26 assets/farmersdelight/models/item/birch_cabinet.json
-4809e3369a27fc4e1b5d6c559d858c0daeeca10b assets/farmersdelight/models/item/black_canvas_sign.json
-9a1a8922c14b117316b3f55eb3192c7e4a32e9c4 assets/farmersdelight/models/item/blue_canvas_sign.json
-96a3f2a00ab931a19daacf8b3904837985907bc9 assets/farmersdelight/models/item/bone_broth.json
-3471c18a8d1a7b9a09d02b2286664f5c4b2df6b6 assets/farmersdelight/models/item/brown_canvas_sign.json
-62871cff7c5bd2746a3e4156baa3460eb1b903fb assets/farmersdelight/models/item/brown_mushroom_colony.json
-2cb118cee1b5aa89228ff3c7935c2b9712cab82f assets/farmersdelight/models/item/cabbage.json
-3edba649dde27a8eb958ebe460eab9024369e386 assets/farmersdelight/models/item/cabbage_crate.json
-fbc9aeced286d441e6d2f9fa2d3634431a85746b assets/farmersdelight/models/item/cabbage_leaf.json
-8c297a334371c8f2dcded0f3c78d92240c67be3e assets/farmersdelight/models/item/cabbage_rolls.json
-37092a3f661532502834aa4ea3543d0d5b195677 assets/farmersdelight/models/item/cabbage_seeds.json
-2e8ef78768ddc080fc592d88347e66df6326adac assets/farmersdelight/models/item/cake_slice.json
-f6fba3fac94e89d80192f0e74995b49067804593 assets/farmersdelight/models/item/canvas.json
-730f4bcbd88aaed74b67ecda0313d8f45f2c7160 assets/farmersdelight/models/item/canvas_rug.json
-e84a0b6f51f2b3fa65a7dc11f1be128d1af7f87d assets/farmersdelight/models/item/canvas_sign.json
-db33220ac9b3d4777d316560c25a0647a7c55e61 assets/farmersdelight/models/item/carrot_crate.json
-dffb28c59c7451fdd763ab7157d59f7722b1a36f assets/farmersdelight/models/item/chicken_cuts.json
-7be865ac00c8572b1fab06ef4d474549b38c9651 assets/farmersdelight/models/item/chicken_sandwich.json
-394628d5ee734c0c2c69c9ec31174198ce5a50de assets/farmersdelight/models/item/chicken_soup.json
-2c717c3b78eff927bac96dbc2e2c2d768cd168e0 assets/farmersdelight/models/item/chocolate_pie.json
-c0389c28d9a719192947390f82f8e21835c14542 assets/farmersdelight/models/item/chocolate_pie_slice.json
-c84474984c0eac247302331dc999c9a79aa7b787 assets/farmersdelight/models/item/cod_roll.json
-3e37ac289dcd54a1f0f4eec904be66530c0e6fbe assets/farmersdelight/models/item/cod_slice.json
-f097ef00daddcaeb4714fa0cf42df9482b98e047 assets/farmersdelight/models/item/cooked_bacon.json
-4d0143a2aabcfa016cb3a9527e58837108ba5cb7 assets/farmersdelight/models/item/cooked_chicken_cuts.json
-3564bd42d781955191f4fd19d0c548d59957b7a8 assets/farmersdelight/models/item/cooked_cod_slice.json
-0a5899ea62a3bc142a969d00eb94b605491f5117 assets/farmersdelight/models/item/cooked_mutton_chops.json
-4da5710d0936158de50578f95ab0d85098c305f8 assets/farmersdelight/models/item/cooked_rice.json
-217248d43c15ff6f3212a6e9d40326d358a6bc39 assets/farmersdelight/models/item/cooked_salmon_slice.json
-c31f20fa9fa0742e64a448a1c49a5c9e484ae31c assets/farmersdelight/models/item/cooking_pot.json
-679c209be0391227a3b2be54fd0b52917dcb3bed assets/farmersdelight/models/item/crimson_cabinet.json
-8aeae632a08ec1501c0c5fea12e7041907eee959 assets/farmersdelight/models/item/cutting_board.json
-a691864348915a571a4a9928eba459db5a0187f3 assets/farmersdelight/models/item/cyan_canvas_sign.json
-cdf2a07752514b7aaffb8cc63b8c1a53efcd4901 assets/farmersdelight/models/item/dark_oak_cabinet.json
-62c4845186802120d39f2e52610dc51cc5186c9f assets/farmersdelight/models/item/diamond_knife.json
-3871c48190a671fa457aa0a2b9b8791e410845c8 assets/farmersdelight/models/item/dog_food.json
-9f8fc38ac6e5e8f49dc27599fd50d75d98c2665a assets/farmersdelight/models/item/dumplings.json
-1f6706dedd64bd7f48ef13f667335a9b300cbefe assets/farmersdelight/models/item/egg_sandwich.json
-50acb51ac1675973fc8bf17c0bfe39a7f3265a00 assets/farmersdelight/models/item/fish_stew.json
-ff5649c08334d4c2c8b6fef66989d12b040252bc assets/farmersdelight/models/item/flint_knife.json
-4b14387aa929058b4937d9bf965b858ddef6fc71 assets/farmersdelight/models/item/fried_egg.json
-12b3bd5c682412a932242927fa97d206fafac05f assets/farmersdelight/models/item/fried_rice.json
-6e6936311a0d6ff359613f6d84947140ea860266 assets/farmersdelight/models/item/fruit_salad.json
-7781caaeef1e03dbcaad9fdc822dcd83e84affde assets/farmersdelight/models/item/full_tatami_mat.json
-7478b2c8395db2ad15eb4d32fc15fe0cd376ce8a assets/farmersdelight/models/item/glow_berry_custard.json
-a4314660221dcffd6c4276a1ae8dc8e0914a3309 assets/farmersdelight/models/item/golden_knife.json
-4ba6f6ca71923cf71e4f7c1285b0901309023e97 assets/farmersdelight/models/item/gray_canvas_sign.json
-0707392a7b2cf8c889d724a644a728f27d8db21e assets/farmersdelight/models/item/green_canvas_sign.json
-67c739e3fc5caa80a076ea52f5dae0c2e30255b8 assets/farmersdelight/models/item/grilled_salmon.json
-e4a898e51b9e7e412756e886c09eacb449f0dd70 assets/farmersdelight/models/item/half_tatami_mat.json
-d4d4a5e824ae415efc16aedbaf04be3dd381ccef assets/farmersdelight/models/item/ham.json
-2409a4cff59afc6932b205ed287337765f412f8c assets/farmersdelight/models/item/hamburger.json
-6863801e307626d269f520abcf247ef7cb6818f4 assets/farmersdelight/models/item/honey_cookie.json
-2c43c586cc0553726a6904a4b1aa3f7aa5e12fd4 assets/farmersdelight/models/item/honey_glazed_ham.json
-db8cd73cb30ef5633964155e90c29897aa58810a assets/farmersdelight/models/item/honey_glazed_ham_block.json
-cf2a22b63d8daf6cd9b1cdb2a2bd2da6932f7d6f assets/farmersdelight/models/item/horse_feed.json
-8dea6006499057f7b97173602c6ffa7b9f7e36b4 assets/farmersdelight/models/item/hot_cocoa.json
-133febcd14bbe80692c99d0f67542686780490de assets/farmersdelight/models/item/iron_knife.json
-3d4038cde35f6c1006addcf1e9f790fc78ca2c59 assets/farmersdelight/models/item/jungle_cabinet.json
-a0836f799b4c9b924f0def317912ec9182ab0b54 assets/farmersdelight/models/item/kelp_roll.json
-1e848c3f12993557d462f6ddfe41093988ef57ce assets/farmersdelight/models/item/kelp_roll_slice.json
-1a43b8a7161fb30d9310370018247e1ce96446ed assets/farmersdelight/models/item/light_blue_canvas_sign.json
-e1c7ade4a3eef3131c8edd4de7484f15888bc6d4 assets/farmersdelight/models/item/light_gray_canvas_sign.json
-68b37c34e22afb1ddd484ab700936d7b0f60002e assets/farmersdelight/models/item/lime_canvas_sign.json
-6c0e75ae202186a85e8b8a5914022b766079b2f8 assets/farmersdelight/models/item/magenta_canvas_sign.json
-8af79d6418e9a0d651c40fda774b7655380d7a03 assets/farmersdelight/models/item/mangrove_cabinet.json
-92496d1709e022d50fd4bd0c57d5839eacff70fe assets/farmersdelight/models/item/melon_juice.json
-c3a381356341fa39957aca63a5f787fa9e7008ef assets/farmersdelight/models/item/melon_popsicle.json
-6ab158c9d3318baaf2ea2fac85ac74a1c15aaff4 assets/farmersdelight/models/item/milk_bottle.json
-3675d619cde5b97996a94432bf551f7664d129a8 assets/farmersdelight/models/item/minced_beef.json
-0eeab3877e770caaec83789ab8c9d76ef2db8975 assets/farmersdelight/models/item/mixed_salad.json
-492dbf3486f0b2558a31d49022caa9a11d836346 assets/farmersdelight/models/item/mushroom_rice.json
-1a39d8da91d4b4df29ec6a998eeb4de99f345c07 assets/farmersdelight/models/item/mutton_chops.json
-9b2fa3d0a64e63a92eee674992bf2cb832e0cb03 assets/farmersdelight/models/item/mutton_wrap.json
-cec3a2e5a114d876a21f4be6a65c9e87a3259441 assets/farmersdelight/models/item/netherite_knife.json
-b0ef7784e4c3dc2ea1d66b3e81cbf592bb4a4722 assets/farmersdelight/models/item/nether_salad.json
-7a025a63ece7dcb7e26c482c172d55bc5f837e9d assets/farmersdelight/models/item/noodle_soup.json
-c618156e552a2b76ffc9c0407cb2ae5bb3170e1a assets/farmersdelight/models/item/oak_cabinet.json
-8238d120d6fb4abb3e3fc1c6a3a1e4e7ae6b54d9 assets/farmersdelight/models/item/onion.json
-5d84cfa5c552be830a7714fe23a43d857416c931 assets/farmersdelight/models/item/onion_crate.json
-396cd864adc7fbdb4c80ad81cc883ce2d975ae1c assets/farmersdelight/models/item/orange_canvas_sign.json
-c0b29eebb55c1f8de26693df4de719e52b5c0c89 assets/farmersdelight/models/item/organic_compost.json
-921e90b74177f0ac79cf38b45f6d7b63edcb1ca3 assets/farmersdelight/models/item/pasta_with_meatballs.json
-5c3f7c116c79005dfe7e0849035113605da69e0d assets/farmersdelight/models/item/pasta_with_mutton_chop.json
-69d6ecf35c18fa4dc95a310dbc8ef1884b17313a assets/farmersdelight/models/item/pie_crust.json
-810e3872fd42a96f9b3b0f63ff3706e57a6d9cdf assets/farmersdelight/models/item/pink_canvas_sign.json
-ffc94c7a973136fda794828ab5f015d6f0d06553 assets/farmersdelight/models/item/potato_crate.json
-74fafba2f812b545a7a9d040eb1f81555a1945c7 assets/farmersdelight/models/item/pumpkin_slice.json
-b69b0a3497b81b2046748f1339af526a8920a1f1 assets/farmersdelight/models/item/pumpkin_soup.json
-56dbbbdcb21b258b8a94c6b9c8c7efb31eb689a4 assets/farmersdelight/models/item/purple_canvas_sign.json
-942f2ab7e0eb2906c300dfe71b6bf00e3a6befda assets/farmersdelight/models/item/ratatouille.json
-1443b93d0569eb4fbc81a5bedaf867061a415524 assets/farmersdelight/models/item/raw_pasta.json
-29b78b7f448aa2066937a817113308ce4d4b3d47 assets/farmersdelight/models/item/red_canvas_sign.json
-dcce1bd48fadd0842ec30d3f97f6fd054ca1ee15 assets/farmersdelight/models/item/red_mushroom_colony.json
-bb975bb4dafb2afc9fe854434e94557faf841b2d assets/farmersdelight/models/item/rice.json
-6a9ad96b42ce534f2f0871f97cf6e0f44f35b031 assets/farmersdelight/models/item/rice_bag.json
-ab6f26a770692b1ba0d55d989858e850518a40e7 assets/farmersdelight/models/item/rice_bale.json
-e757f56f1f494b15e0fb40ebfc9cc8a12af3256f assets/farmersdelight/models/item/rice_panicle.json
-63e2894acae33e9912e85c0e9c941a7c7a3cc6f3 assets/farmersdelight/models/item/rice_roll_medley_block.json
-9937f5b62a6bc6b5caec58b45d16e751cec8a9eb assets/farmersdelight/models/item/rich_soil.json
-67c90c8abf35154aa852d0216fd1a30513225b93 assets/farmersdelight/models/item/rich_soil_farmland.json
-2d14bba24f1b4ebc7e22b71164934a653a1ae11e assets/farmersdelight/models/item/roasted_mutton_chops.json
-61977acbfe4a439f360e42bff6f2d27620734f9d assets/farmersdelight/models/item/roast_chicken.json
-98dd366831303816384882e4aa1a202ad544afc3 assets/farmersdelight/models/item/roast_chicken_block.json
-b15a223c8c507c4e37589d6d8d04ab406e58c660 assets/farmersdelight/models/item/rope.json
-fc557dc149fd5dad772bb096cffe465d6352ffb7 assets/farmersdelight/models/item/rotten_tomato.json
-805a255189bc6723f392a197ce88c78804365e8f assets/farmersdelight/models/item/safety_net.json
-df9fcba774634b5fd6df69ed914ad983a954fcd5 assets/farmersdelight/models/item/salmon_roll.json
-5a4804df4b08628ad1a7c5848d34046210406230 assets/farmersdelight/models/item/salmon_slice.json
-ce514f125e3b8c84e0e03397b686ef11adaa4901 assets/farmersdelight/models/item/sandy_shrub.json
-fae467eaced9bfe275f42a92235a49d3cea40d2f assets/farmersdelight/models/item/shepherds_pie.json
-d9673de312d6419827b6822485821cdf39f2481e assets/farmersdelight/models/item/shepherds_pie_block.json
-c7b9c428da59e499e63fc63a6dffd18954540b2d assets/farmersdelight/models/item/smoked_ham.json
-62c3da00f12f9616dc51974b6a21ab9fc543036c assets/farmersdelight/models/item/spruce_cabinet.json
-90043b128322c6889a624d2711c73cdca78b3091 assets/farmersdelight/models/item/squid_ink_pasta.json
-3495a87a87f0ef87068aa5083b1f224e5721baab assets/farmersdelight/models/item/steak_and_potatoes.json
-11f55a11b172daf0f8daa2a55d6b1ebd5aedfcf4 assets/farmersdelight/models/item/stove.json
-b35701a977b869c74a825c10c9d352e9550af711 assets/farmersdelight/models/item/straw.json
-8d8221d6ea6cfc7fc9eaf01cac4c695da0122a05 assets/farmersdelight/models/item/straw_bale.json
-bb7a680a396b98c468a2bb81e1822f7a6c8d6a47 assets/farmersdelight/models/item/stuffed_potato.json
-870ea003d41702209ef68372c54b35b23f7678a2 assets/farmersdelight/models/item/stuffed_pumpkin.json
-47c5bf597dd60bee20b7c202414903e80deaffb9 assets/farmersdelight/models/item/stuffed_pumpkin_block.json
-852ff7ab1dfb6f27e4ad9b883b080bc8961c2d9e assets/farmersdelight/models/item/sweet_berry_cheesecake.json
-74eb84ea702c4f6cef3870f128a12c2a9b41a227 assets/farmersdelight/models/item/sweet_berry_cheesecake_slice.json
-07c3ba71e6b0815a62ff5ef98fd3f96d7a239351 assets/farmersdelight/models/item/sweet_berry_cookie.json
-37b0151fca7e60c9bb241864e262ecc4fb2c02b3 assets/farmersdelight/models/item/tatami.json
-3db16d1b3f4f637b69edaa13ff022640351b88b2 assets/farmersdelight/models/item/tomato.json
-47515fc69dd7e5d38675619479e6e8e2360e2c8e assets/farmersdelight/models/item/tomato_crate.json
-866d0fa2336c2e085cce9707e9e2e0a153be791b assets/farmersdelight/models/item/tomato_sauce.json
-12a5748e427e3e6f6472784f73b0635e0ca3662a assets/farmersdelight/models/item/tomato_seeds.json
-4b8ac882b0d2da18a50dce84a3733d1d8b6c3dbc assets/farmersdelight/models/item/tree_bark.json
-4a52d396e47fea251781cb81682b1165c08ee4bf assets/farmersdelight/models/item/vegetable_noodles.json
-9ff3ce1e41f509694a0283523c223fcd162f0327 assets/farmersdelight/models/item/vegetable_soup.json
-aa9129a8faa42a698778f58de26e2eb4fab07365 assets/farmersdelight/models/item/warped_cabinet.json
-a634b899a40afb954687cb05b4d92420e1584fff assets/farmersdelight/models/item/wheat_dough.json
-8f5b480ffffcee4b8bb2999dff640e692f323e2f assets/farmersdelight/models/item/white_canvas_sign.json
-cfd08c1aabe6c928432873b4e65f4cae588295e0 assets/farmersdelight/models/item/wild_beetroots.json
-e69be57b3c82877a1b206cc3939611e51fdb1f58 assets/farmersdelight/models/item/wild_cabbages.json
-1af9a8b0161bcf4c736811a1992169cbe24e97c5 assets/farmersdelight/models/item/wild_carrots.json
-fdb1712097f483c988f1772c4e2d5acb7ab5df5c assets/farmersdelight/models/item/wild_onions.json
-a6714943bd149e3f8d5ceec7360c97c2d73f58e0 assets/farmersdelight/models/item/wild_potatoes.json
-bbb0d8ddc79bea8017820879d8de85615bdb335a assets/farmersdelight/models/item/wild_rice.json
-a411b17beb9b8789122f746d47803b36e8282618 assets/farmersdelight/models/item/wild_tomatoes.json
-667a990f59dcf205ffb4fecc0f7667dc4383e8bf assets/farmersdelight/models/item/yellow_canvas_sign.json

src/generated/resources/.cache/5a0a6788f4a1a24610c1c0c10b075dc92982eeef

@@ -1 +0,0 @@
-// 1.19.2	2024-01-20T23:46:08.9513737	Update structure files in structures/village/houses