From 529d36068427f924cbbda021849ee71b803f991f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 01:02:37 +0000 Subject: [PATCH 1/6] [Update]: Bump org.projectlombok:lombok from 1.18.26 to 1.18.28 Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.26 to 1.18.28. - [Release notes](https://github.com/projectlombok/lombok/releases) - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.26...v1.18.28) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 25a34bd6..fbbd613e 100644 --- a/build.gradle +++ b/build.gradle @@ -149,8 +149,8 @@ repositories { minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}" //Lombok - compileOnly 'org.projectlombok:lombok:1.18.26' - annotationProcessor 'org.projectlombok:lombok:1.18.26' + compileOnly 'org.projectlombok:lombok:1.18.28' + annotationProcessor 'org.projectlombok:lombok:1.18.28' //ManasCore implementation fg.deobf("com.github.manasmods:ManasCore:${minecraftVersion}-${manasCoreVersion}") From 8b0ad0c8b6887b5795c8224aa6505dcd90e759de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 01:04:31 +0000 Subject: [PATCH 2/6] [Update]: Bump net.minecraftforge.gradle:ForgeGradle from 5.1.+ to 6.0.7 Bumps net.minecraftforge.gradle:ForgeGradle from 5.1.+ to 6.0.7. --- updated-dependencies: - dependency-name: net.minecraftforge.gradle:ForgeGradle dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 25a34bd6..e0503b12 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true classpath 'org.parchmentmc:librarian:1.+' classpath 'org.spongepowered:mixingradle:0.7.+' } From 2c6056e0c88e64ab1181cc1ca0a619befcb39df4 Mon Sep 17 00:00:00 2001 From: Nieadni <103650147+Nieadni@users.noreply.github.com> Date: Mon, 14 Aug 2023 19:54:31 +0100 Subject: [PATCH 3/6] Updated Mod Version, Updated all the dependencies however the JEI one is not working and I am not sure why --- build.gradle | 2 +- gradle.properties | 16 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../manasmods/unordinary_basics/changelog.txt | 44 +------------------ 4 files changed, 11 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 06507757..2096ae83 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,7 @@ minecraft { } } - forceExit false + //forceExit false } } } diff --git a/gradle.properties b/gradle.properties index bded8e17..2719dcbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,14 +9,14 @@ parchmentVersion=2022.09.04 # mods.toml data minecraftVersionCheck=[1.18.2,1.19) # Mod Information see https://mcforge.readthedocs.io/en/1.18.x/gettingstarted/versioning/#examples -modVersion=1.0.2.0 +modVersion=1.0.2.1 modId=unordinary_basics # Dependencies -jei_version=9.7.0.209 -manasCoreVersion=1.0.0.0 -apotheosisVersion=3846000 -placeboVersion=3845997 +jei_version=10.2.1.1005 +manasCoreVersion=1.0.2.0 +apotheosisVersion=4634636 +placeboVersion=4500363 patchouliVersion=3846086 -enchantmentDescriptionsVersion=3821023 -bookshelfVersion=3832270 -geckolibVersion=3.0.29 \ No newline at end of file +enchantmentDescriptionsVersion=4277221 +bookshelfVersion=4556713 +geckolibVersion=3.0.57 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..59bc51a2 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt index 96f2659c..8c7d07d4 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt +++ b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt @@ -1,47 +1,5 @@ == Change Log == -¬ Added a Custom Inventory - -/** Items **/ - -¬ Added some new gear - - Backpacks - - Potion Belt - - Quiver - - Builder's Glove - - Slime Compass - - Redstone Pouch - - Glider - - Rabbit Boots -¬ Added Map Book (no functionality yet) -¬ Added new enchantments and curses - - Curse of Breaking - - Curse of Fatigue - - Curse of Hallucination - - Master Miner - - Vein Miner - - Tree Feller -¬ Added an end-game sword -¬ Updated Recipes -¬ Added New Recipes for Stone Tools - -/** Blocks **/ - -¬ Added Item Sorter block -¬ Added Enchantment Library (no functionality yet) -¬ Added New Recipes for some blocks crafted with stone - -/** Misc Changes **/ - -¬ Added several new inventory slots - - Back Slot - - Waist Slot -¬ Updated some vanilla words -¬ Ability to hit through foliage -¬ Added a keybinding to enter prone mode -¬ Removed the experience limit on the anvil -¬ Gave special properties to some armour sets -¬ Made it so dirt-like slabs and stairs behave like their full-block counterparts -¬ Fixed a bug with bed banner patterns +¬ == End of Change Log == \ No newline at end of file From 34d0093f547e649c7d22dbf102f576650abf908c Mon Sep 17 00:00:00 2001 From: Nieadni <103650147+Nieadni@users.noreply.github.com> Date: Mon, 14 Aug 2023 20:05:12 +0100 Subject: [PATCH 4/6] Updated Parchment --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2719dcbe..a5798f63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ minecraftVersion=1.18.2 # Forge date forgeVersion=40.1.76 # Parchment Version -parchmentVersion=2022.09.04 +parchmentVersion=2022.11.06 # mods.toml data minecraftVersionCheck=[1.18.2,1.19) # Mod Information see https://mcforge.readthedocs.io/en/1.18.x/gettingstarted/versioning/#examples From c20d6d8ac1131269cd906cd18ddd12b6803b7ffb Mon Sep 17 00:00:00 2001 From: Nieadni <103650147+Nieadni@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:04:24 +0100 Subject: [PATCH 5/6] Updated Glider to be more akin to BotW --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 70 +++++++++++++++++-- .../slabs_to_block_snow_block.json} | 4 +- .../stairs_to_block_snow_block.json} | 4 +- ...ow.json => slabs_to_block_snow_block.json} | 2 +- ...w.json => stairs_to_block_snow_block.json} | 2 +- .../block/ItemSorterBlock.java | 9 ++- .../manasmods/unordinary_basics/changelog.txt | 6 +- .../item/custom/GliderItem.java | 4 +- .../assets/unordinary_basics/lang/en_us.json | 1 + 10 files changed, 87 insertions(+), 17 deletions(-) rename src/generated/resources/data/minecraft/advancements/recipes/{decorations/slabs_to_block_snow.json => building_blocks/slabs_to_block_snow_block.json} (84%) rename src/generated/resources/data/minecraft/advancements/recipes/{decorations/stairs_to_block_snow.json => building_blocks/stairs_to_block_snow_block.json} (84%) rename src/generated/resources/data/minecraft/recipes/{slabs_to_block_snow.json => slabs_to_block_snow_block.json} (85%) rename src/generated/resources/data/minecraft/recipes/{stairs_to_block_snow.json => stairs_to_block_snow_block.json} (90%) diff --git a/gradle.properties b/gradle.properties index a5798f63..5dbf7181 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ minecraftVersionCheck=[1.18.2,1.19) modVersion=1.0.2.1 modId=unordinary_basics # Dependencies -jei_version=10.2.1.1005 +jei_version=9.7.2.281 manasCoreVersion=1.0.2.0 apotheosisVersion=4634636 placeboVersion=4500363 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1fa93b83..d34c8d11 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1672,6 +1672,7 @@ ad653e899057e061f26befa1625298dde4271441 data/minecraft/advancements/recipes/bui 0f41ae42959ff659abccce58cb8ee6445a2031af data/minecraft/advancements/recipes/building_blocks/slabs_to_block_smooth_quartz.json 4189b6953e3cac83885c149a38d83a73c03b6032 data/minecraft/advancements/recipes/building_blocks/slabs_to_block_smooth_red_sandstone.json 22652572eb70d5dfb2f00c3ddc21ea28330fdf41 data/minecraft/advancements/recipes/building_blocks/slabs_to_block_smooth_sandstone.json +7931368ded4805672b43c8bd5e00ba4ee3aaefcb data/minecraft/advancements/recipes/building_blocks/slabs_to_block_snow_block.json 240b039bac3f3d4bafef74abf1a2dd5cc0757462 data/minecraft/advancements/recipes/building_blocks/slabs_to_block_soul_sand.json 8eaa53593fa23892e6373b718f1d7c72252b47ed data/minecraft/advancements/recipes/building_blocks/slabs_to_block_soul_soil.json a90262f79228ea3f18306808f8c98268ce6d1971 data/minecraft/advancements/recipes/building_blocks/slabs_to_block_spruce_log.json @@ -1873,6 +1874,7 @@ e5cfe7b51ac2a317d7dbe58f8b6db6a35e9bd3de data/minecraft/advancements/recipes/bui 0646c8311da0be93a2ac2523c6c04d2b19e061bd data/minecraft/advancements/recipes/building_blocks/stairs_to_block_smooth_quartz.json 48390fe1f87b6c5040271771cb3a7d02c8540d86 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_smooth_red_sandstone.json 5568f523c0b24a22b4bc6538aec1f0330bb31597 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_smooth_sandstone.json +64f97670e010dee50c97528783c41b492cd8f94e data/minecraft/advancements/recipes/building_blocks/stairs_to_block_snow_block.json 6b4256bfacb0558654fa8e78a81ed7fd5976ca6a data/minecraft/advancements/recipes/building_blocks/stairs_to_block_soul_sand.json 2d2955dfd935dec8f02663f15152d46df3cf3294 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_soul_soil.json bdacead1213b45729912a5e19eb3f10d0e7cdc71 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_spruce_log.json @@ -1910,14 +1912,64 @@ d70da14202c83807505d2808772f59c6c831bf12 data/minecraft/advancements/recipes/bui 2262191fde63b6b10940775a0758d6b6f4b19ae1 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_yellow_terracotta.json dee3b6bab8cfa24e7c119e578e6ae183e75bf734 data/minecraft/advancements/recipes/building_blocks/stairs_to_block_yellow_wool.json 10853cfedaab53c5e86bf283247277ffa9512076 data/minecraft/advancements/recipes/combat/arrow.json -38704509787eec1dd630881c65b422baca3f8355 data/minecraft/advancements/recipes/decorations/slabs_to_block_snow.json -06f6623e439178c5497c5119e21afe6a3f8ea5c0 data/minecraft/advancements/recipes/decorations/stairs_to_block_snow.json 5435ca5f028feed9ebe32e3897bf1bb93e7f3227 data/minecraft/advancements/recipes/misc/leather_from_campfire_cooking.json 38eaab3ad9a8b0f62b13c2b7dd06a35d6c1f0816 data/minecraft/advancements/recipes/misc/leather_from_smelting.json +05d7d5000b8e89931956fd9c088d5c9f937b9c5e data/minecraft/advancements/recipes/unordinary_basics.tab2/basalt_slab_from_basalt_stonecutting.json +a870ad4793d62359b2e8da09b7f24a3f0ab12a56 data/minecraft/advancements/recipes/unordinary_basics.tab2/basalt_stairs_from_basalt_stonecutting.json +cd434ce6651988c62cd85f946bd851af392aa66e data/minecraft/advancements/recipes/unordinary_basics.tab2/calcite_slab_from_calcite_stonecutting.json +ec745e77eb0395c3b2beb7d62ccd4e7244dfd08d data/minecraft/advancements/recipes/unordinary_basics.tab2/calcite_stairs_from_calcite_stonecutting.json +ad485017a543ac62f3c0a40dd4b3c041be53ccc2 data/minecraft/advancements/recipes/unordinary_basics.tab2/chiseled_deepslate_slab_from_chiseled_deepslate_stonecutting.json +d6b6868709219d4e8649e0a0362817a0a3294193 data/minecraft/advancements/recipes/unordinary_basics.tab2/chiseled_deepslate_stairs_from_chiseled_deepslate_stonecutting.json +c95087c62fcc294701e885e1382a5bd2f03e371c data/minecraft/advancements/recipes/unordinary_basics.tab2/chiseled_stone_brick_slab_from_chiseled_stone_bricks_stonecutting.json +289a266df2d95ae1389a253caadd5c8c9d683c7e data/minecraft/advancements/recipes/unordinary_basics.tab2/chiseled_stone_brick_stairs_from_chiseled_stone_bricks_stonecutting.json +ed1712b83c763dbdedf89dc84531d5a08f49e8aa data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json +af8a6d9e00fca07cae5884ff5128ab3d9254868f data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json +e9abcbd905ea6ad102f989857db75bd1ef779e29 data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json +8c1edae80c516a596fca03f3fae6e3ef2011e5b4 data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json +359ec064aca3f3fbba340381b3c431d27f048c67 data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json +7d0a6ed370397e01c98382c4cdeb567188909c13 data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json +f6e38102690365cb6948702aed2a0958bc8d275a data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_stone_brick_slab_from_cracked_stone_bricks_stonecutting.json +8beb75211bf961c5420a9f3478f90661e48127e8 data/minecraft/advancements/recipes/unordinary_basics.tab2/cracked_stone_brick_stairs_from_cracked_stone_bricks_stonecutting.json +2b376e20e349491ab9f0878da1e7f18e1ef1e9c3 data/minecraft/advancements/recipes/unordinary_basics.tab2/cut_red_sandstone_stairs_from_cut_red_sandstone_stonecutting.json +2b866d38ef15bdecdaabfc3303f57564935d92e0 data/minecraft/advancements/recipes/unordinary_basics.tab2/cut_sandstone_stairs_from_cut_sandstone_stonecutting.json +bee75a52e69b36d365a70e7fa9fa061a11ea1aeb data/minecraft/advancements/recipes/unordinary_basics.tab2/dripstone_slab_from_dripstone_block_stonecutting.json +e48faf1fe6ff32addd1fc7ccd08fdf6815df44dc data/minecraft/advancements/recipes/unordinary_basics.tab2/dripstone_stairs_from_dripstone_block_stonecutting.json +841cf9877c5eee93e210f0b0d022894e875e0985 data/minecraft/advancements/recipes/unordinary_basics.tab2/end_stone_slab_from_end_stone_stonecutting.json +2f3c5767032f67d01dbd81c6232d99aaac086b50 data/minecraft/advancements/recipes/unordinary_basics.tab2/end_stone_stairs_from_end_stone_stonecutting.json +af5e1df95fe7aa80b3dcc5a6183c86b904e89d17 data/minecraft/advancements/recipes/unordinary_basics.tab2/polished_basalt_slab_from_polished_basalt_stonecutting.json +cad2c65f6da796bc4d0ee40df90729302973eb2f data/minecraft/advancements/recipes/unordinary_basics.tab2/polished_basalt_stairs_from_polished_basalt_stonecutting.json +da5696dec37ea424cc25db6bdbbcf40fb53b7d4d data/minecraft/advancements/recipes/unordinary_basics.tab2/purpur_pillar_slab_from_purpur_pillar_stonecutting.json +22d485c1aacf9eaa36b5bea2c7f2a6f9bcd8875d data/minecraft/advancements/recipes/unordinary_basics.tab2/purpur_pillar_stairs_from_purpur_pillar_stonecutting.json +0c784b8f13241b345aae18c80997801519b21ba5 data/minecraft/advancements/recipes/unordinary_basics.tab2/terracotta_slab_from_terracotta_stonecutting.json +00899a9c3d60beae10341b42839b3d21c25a57aa data/minecraft/advancements/recipes/unordinary_basics.tab2/terracotta_stairs_from_terracotta_stonecutting.json +38d53a5dbabf0c163a1f0fb116af99a94f8ad90c data/minecraft/advancements/recipes/unordinary_basics.tab2/tuff_slab_from_tuff_stonecutting.json +e130084e26f35abb41f1794e56a60a7e37524714 data/minecraft/advancements/recipes/unordinary_basics.tab2/tuff_stairs_from_tuff_stonecutting.json 0a65d8721bc50b7e3a07b329526c294fe9c873df data/minecraft/advancements/recipes/unordinary_basics.tab3/technoblade_crown_smithing.json a20fcca185b7d4008dd0e8f4b1700ca03320264e data/minecraft/recipes/arrow.json +5b247aef6d88758ae351daef1d90b57cd65f5fb2 data/minecraft/recipes/basalt_slab_from_basalt_stonecutting.json +de973dd77dceb074304e83876be87c2dffd858aa data/minecraft/recipes/basalt_stairs_from_basalt_stonecutting.json +8b0192434cef4bbbd9581e51d6cbadc9635a5aa0 data/minecraft/recipes/calcite_slab_from_calcite_stonecutting.json +99f43e9b78569a951432dc94d4876d2a2d07e0f3 data/minecraft/recipes/calcite_stairs_from_calcite_stonecutting.json +1369edcb80ae50120748a6ea87b272da47771b5f data/minecraft/recipes/chiseled_deepslate_slab_from_chiseled_deepslate_stonecutting.json +571fed9ad2d81fe62d9ad9652afbb2df8b0db8b9 data/minecraft/recipes/chiseled_deepslate_stairs_from_chiseled_deepslate_stonecutting.json +9baa380499c8608075fb1c1330955dbd523247f9 data/minecraft/recipes/chiseled_stone_brick_slab_from_chiseled_stone_bricks_stonecutting.json +c59e165e38cc36479b99110413faf36c1fc09f58 data/minecraft/recipes/chiseled_stone_brick_stairs_from_chiseled_stone_bricks_stonecutting.json 837977fbf68af49637c92d2b8b2cd74555e79f8f data/minecraft/recipes/copper_block_from_blasting_raw_copper_block.json 8b1b46c26488376ab8aaf0642a46b8752dadc97c data/minecraft/recipes/copper_block_from_smelting.json +0bcc223d5d48c6a29812f9fb6d0e500a7a2427f0 data/minecraft/recipes/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json +ea26ca4f96b5392ad929cd6f44a4f5161d04f037 data/minecraft/recipes/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json +135d73a630c73e3ceaac7c01b499a4baa7cd40e1 data/minecraft/recipes/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json +4fb6f005b697415537bf33d707bad14997d470df data/minecraft/recipes/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json +c195b52e69da08f68a23b8d4860b1e125c40f455 data/minecraft/recipes/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json +40880bc0f5139830c678d6b295d1852b8ed15388 data/minecraft/recipes/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json +ba0ad72e9539dea7ff409777858e6a0c19925aa4 data/minecraft/recipes/cracked_stone_brick_slab_from_cracked_stone_bricks_stonecutting.json +09ed2e519783f4d7060525ebe04590a45bfffce7 data/minecraft/recipes/cracked_stone_brick_stairs_from_cracked_stone_bricks_stonecutting.json +9acbe7a0035e4b3d14421640cefa184951200549 data/minecraft/recipes/cut_red_sandstone_stairs_from_cut_red_sandstone_stonecutting.json +5a2d2527c0047223081428117cca0ece3786af3b data/minecraft/recipes/cut_sandstone_stairs_from_cut_sandstone_stonecutting.json +48fe6b974ac06143539523c27e5f4bebd55ea088 data/minecraft/recipes/dripstone_slab_from_dripstone_block_stonecutting.json +7aa699a16416f09230b1cdb361d97b060806337a data/minecraft/recipes/dripstone_stairs_from_dripstone_block_stonecutting.json +91c8923b8c5ba27fbc936023517f4ff174a8e725 data/minecraft/recipes/end_stone_slab_from_end_stone_stonecutting.json +f0389b2f4336afdc97ae3e7a46210fd5b0ca7644 data/minecraft/recipes/end_stone_stairs_from_end_stone_stonecutting.json 281d655ccf4217b4bae8f05b4cc78dc3acccc0dc data/minecraft/recipes/fletching/arrow.json ae55784e62325a0a2838dab0aa99e2c7ee388476 data/minecraft/recipes/fletching/spectral_arrow.json 9d8c57dad35beea46404ee1daaddd6fc82635888 data/minecraft/recipes/fletching/tipped_arrow_absorption.json @@ -1989,6 +2041,10 @@ bd4fca841653ad5733014b1dc22746a73c372635 data/minecraft/recipes/iron_block_from_ 43b4185f6982caa9f8d13dd1c3e5f8c330845aac data/minecraft/recipes/iron_block_from_smelting.json 587eedc5b5b57c7f8ef703f50977e202297e941f data/minecraft/recipes/leather_from_campfire_cooking.json 12cb2aaf22dbe17e0302e50f70d6dd78e64e4d42 data/minecraft/recipes/leather_from_smelting.json +bfa1ebdfd4b53ccd8ff9dbb859bee87c59b18c1f data/minecraft/recipes/polished_basalt_slab_from_polished_basalt_stonecutting.json +31c113e0d7dd212de18a896d68016fda16e43ad2 data/minecraft/recipes/polished_basalt_stairs_from_polished_basalt_stonecutting.json +beb46ed80855c3505674a05c6d6b537bd5dbc816 data/minecraft/recipes/purpur_pillar_slab_from_purpur_pillar_stonecutting.json +80ede6e5012b3df66d8b56d9b7465b2c0217577c data/minecraft/recipes/purpur_pillar_stairs_from_purpur_pillar_stonecutting.json 029435b22c9012bcd9390449c17b3757878550f7 data/minecraft/recipes/slabs_to_block_acacia_log.json ba6047d5f86fad2ec31331fc4e408da56d1affc7 data/minecraft/recipes/slabs_to_block_acacia_planks.json ef1b68407cb04654ea730dad061c4486aa13732b data/minecraft/recipes/slabs_to_block_amethyst_block.json @@ -2152,7 +2208,7 @@ c3a0e5d9dc2f27b926dcd5b3bd670a46140600b5 data/minecraft/recipes/slabs_to_block_s 467af68dfeda79996d4391594d7d0543579cfd0e data/minecraft/recipes/slabs_to_block_smooth_quartz.json a794816980e96c167115551ee47768263922df1c data/minecraft/recipes/slabs_to_block_smooth_red_sandstone.json 784ba95b9432406d5371316f4cf2a1a4086f9444 data/minecraft/recipes/slabs_to_block_smooth_sandstone.json -1f4e267ae72e0171e3aa19c4f102b52712c2fa01 data/minecraft/recipes/slabs_to_block_snow.json +29e180d4f24d79dfecb61e34b4420dd3799761e1 data/minecraft/recipes/slabs_to_block_snow_block.json 1d27092007ca7c10b156250f84b68854ca9d1e0e data/minecraft/recipes/slabs_to_block_soul_sand.json a0467fe7e6f8f5c432574c7729ba9ab76d909a50 data/minecraft/recipes/slabs_to_block_soul_soil.json dd6897646dce7c5bb75606e65e32b671ca28a77a data/minecraft/recipes/slabs_to_block_spruce_log.json @@ -2354,7 +2410,7 @@ c6ebc0897d00a48ad0df337add7e7b78b8d31888 data/minecraft/recipes/stairs_to_block_ 5d53c61b52cc4d563d8ddf9cee29b9e960d600ed data/minecraft/recipes/stairs_to_block_smooth_quartz.json f8c46aeec88bd077aa1bc48e290d5479a1b52a87 data/minecraft/recipes/stairs_to_block_smooth_red_sandstone.json f605ee55ce5dd99278a40bb8b86c84920e3ff171 data/minecraft/recipes/stairs_to_block_smooth_sandstone.json -cba09660b4d315c6259d8d53234b752232e6bba5 data/minecraft/recipes/stairs_to_block_snow.json +e589b77a3645e9e833c598192cdefa5760378f3a data/minecraft/recipes/stairs_to_block_snow_block.json 99d3f3a02d66e03312e94d3dcb66054697c8a4df data/minecraft/recipes/stairs_to_block_soul_sand.json 055d6c260860c47528e7c2622d8f7fd890fc2f61 data/minecraft/recipes/stairs_to_block_soul_soil.json da1c04e5eefca8ecc174e1ed3a7bed545afcd568 data/minecraft/recipes/stairs_to_block_spruce_log.json @@ -2392,6 +2448,10 @@ f0f465ad706fccb7c9838fb1482680f47c6a88a5 data/minecraft/recipes/stairs_to_block_ 839b2d6c29886925ab20cdcabf6b54355a9ba573 data/minecraft/recipes/stairs_to_block_yellow_terracotta.json 30702fcec69d16336be972d51b03efc766b1f6ab data/minecraft/recipes/stairs_to_block_yellow_wool.json a6b64c90218b3336332b015087f7d7dae18f52ef data/minecraft/recipes/technoblade_crown_smithing.json +f7da7692ccb258de5b41bdfd7fd54f02e6e922eb data/minecraft/recipes/terracotta_slab_from_terracotta_stonecutting.json +8a86fdfc74a400e7292c792794494c62dc42fd01 data/minecraft/recipes/terracotta_stairs_from_terracotta_stonecutting.json +8e85b337d9b2b35857e6c57dd37295f04247693d data/minecraft/recipes/tuff_slab_from_tuff_stonecutting.json +86b4ae101dc195a4665f81e8f63eb177de8cfb9d data/minecraft/recipes/tuff_stairs_from_tuff_stonecutting.json a5a665269e8be06c37969b2aae3bc81533237919 data/minecraft/tags/blocks/mineable/axe.json 476bdbf484aeee71b8db38eaae9edf3ad6ec7364 data/minecraft/tags/blocks/mineable/pickaxe.json 7bdf381c9974f326db8037e90858f7264ea6b57c data/minecraft/tags/blocks/mineable/shovel.json @@ -2430,6 +2490,7 @@ c9e79e938824c92d43abacae22e995442f84095e data/unordinary_basics/advancements/rec 15510cc4afcac3d0931f567e935eb121c18dc4a6 data/unordinary_basics/advancements/recipes/tools/stone_pickaxe.json 1105647a9370b08466a81d788c76d7e0c6c8a217 data/unordinary_basics/advancements/recipes/tools/stone_shovel.json af00d5195950b6c5601657f47a90a000dfd68da5 data/unordinary_basics/advancements/recipes/transportation/saddle.json +7c721e700a6c7cd296d978b9e103eb7762688f7a data/unordinary_basics/advancements/recipes/unordinary_basics.tab/item_sorter.json 038adacdb36ddae2ca6db077c498ee4fc813e8ac data/unordinary_basics/advancements/recipes/unordinary_basics.tab2/acacia_log_slab.json 27d055d547bf70717c545578ec2bf67114e8948d data/unordinary_basics/advancements/recipes/unordinary_basics.tab2/acacia_log_stairs.json 05fadfb013c620a2778f1a0930d0fdccffca24b8 data/unordinary_basics/advancements/recipes/unordinary_basics.tab2/basalt_slab.json @@ -3232,6 +3293,7 @@ f30e0d4fe4e06da5306e027d6a824d9171bf4864 data/unordinary_basics/recipes/hopper.j 5e7fb6573c5a330534233a44aeeebc4c43d03442 data/unordinary_basics/recipes/ice_slab.json 00d5272e2b32bee50b9a05f011ef15d2e4ad3b32 data/unordinary_basics/recipes/ice_stairs.json 233082400b274eff49ea623f7ed8bcb47bd12858 data/unordinary_basics/recipes/iron_horse_armor.json +1d910dfed6810fac07305a50e88dcf94728e1b3b data/unordinary_basics/recipes/item_sorter.json a9c98c9505a7693a9f8f0ceaba5d1f478dc68342 data/unordinary_basics/recipes/jungle_log_slab.json 50960fd71179549deacf056e3e6176451a660d1e data/unordinary_basics/recipes/jungle_log_stairs.json ee51be8ee06eb9b0ff4d92dc8f4218894370e3c7 data/unordinary_basics/recipes/leather_horse_armor.json diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/slabs_to_block_snow.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/slabs_to_block_snow_block.json similarity index 84% rename from src/generated/resources/data/minecraft/advancements/recipes/decorations/slabs_to_block_snow.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/slabs_to_block_snow_block.json index 4dc58b74..e1c94dbd 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/decorations/slabs_to_block_snow.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/slabs_to_block_snow_block.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "minecraft:slabs_to_block_snow" + "minecraft:slabs_to_block_snow_block" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "minecraft:slabs_to_block_snow" + "recipe": "minecraft:slabs_to_block_snow_block" } } }, diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/stairs_to_block_snow.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/stairs_to_block_snow_block.json similarity index 84% rename from src/generated/resources/data/minecraft/advancements/recipes/decorations/stairs_to_block_snow.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/stairs_to_block_snow_block.json index f75384e2..6b00e9a5 100644 --- a/src/generated/resources/data/minecraft/advancements/recipes/decorations/stairs_to_block_snow.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/stairs_to_block_snow_block.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "minecraft:stairs_to_block_snow" + "minecraft:stairs_to_block_snow_block" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "minecraft:stairs_to_block_snow" + "recipe": "minecraft:stairs_to_block_snow_block" } } }, diff --git a/src/generated/resources/data/minecraft/recipes/slabs_to_block_snow.json b/src/generated/resources/data/minecraft/recipes/slabs_to_block_snow_block.json similarity index 85% rename from src/generated/resources/data/minecraft/recipes/slabs_to_block_snow.json rename to src/generated/resources/data/minecraft/recipes/slabs_to_block_snow_block.json index db2b64be..685abbc9 100644 --- a/src/generated/resources/data/minecraft/recipes/slabs_to_block_snow.json +++ b/src/generated/resources/data/minecraft/recipes/slabs_to_block_snow_block.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "minecraft:snow" + "item": "minecraft:snow_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/stairs_to_block_snow.json b/src/generated/resources/data/minecraft/recipes/stairs_to_block_snow_block.json similarity index 90% rename from src/generated/resources/data/minecraft/recipes/stairs_to_block_snow.json rename to src/generated/resources/data/minecraft/recipes/stairs_to_block_snow_block.json index 96b16d12..9a942bf4 100644 --- a/src/generated/resources/data/minecraft/recipes/stairs_to_block_snow.json +++ b/src/generated/resources/data/minecraft/recipes/stairs_to_block_snow_block.json @@ -15,7 +15,7 @@ } ], "result": { - "item": "minecraft:snow", + "item": "minecraft:snow_block", "count": 3 } } \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java index dc06c81e..a49a4e8e 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java @@ -1,7 +1,6 @@ package com.github.manasmods.unordinary_basics.block; import com.github.manasmods.unordinary_basics.block.entity.ItemSorterBlockEntity; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -11,7 +10,11 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -75,7 +78,7 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla if (!pLevel.isClientSide()) { BlockEntity entity = pLevel.getBlockEntity(pPos); if (entity instanceof ItemSorterBlockEntity itemSorterBlockEntity) { - if (Screen.hasShiftDown() && pPlayer.getMainHandItem().isEmpty()) { + if (pPlayer.isCrouching() && pPlayer.getMainHandItem().isEmpty()) { NetworkHooks.openGui(((ServerPlayer) pPlayer), itemSorterBlockEntity, pPos); } else { itemSorterBlockEntity.filterItemsOfPlayer(pPlayer,pPos,pState,pLevel); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt index 8c7d07d4..c11dd322 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt +++ b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt @@ -1,5 +1,9 @@ == Change Log == -¬ +¬ Added Tool Tip to Item Sorter Block + +TODO: + - Fix Redstone Pouch bug. In jar file (we think), placing down redstone will crash the game. + - Update Master Miner to only mine blocks of a same or similar hardness (to avoid cheesing mining long to mine blocks) == End of Change Log == \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java index e2b03b8e..dede65f2 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java @@ -17,11 +17,11 @@ public class GliderItem extends Item { /** * Changes the level of the slow falling effect, the higher this is, the slower the player will fall */ - private static int FALL_SPEED_MODIFIER = 4; + private static int FALL_SPEED_MODIFIER = 6; /** * Changes the glider's automatic movement forward's speed, the higher this is, the slower the glider will move */ - private static int GLIDE_SPEED_MODIFIER = 4; + private static int GLIDE_SPEED_MODIFIER = 0; private static final MobEffectInstance SLOW_FALLING = new MobEffectInstance(MobEffects.SLOW_FALLING, 1, FALL_SPEED_MODIFIER, false, false); diff --git a/src/main/resources/assets/unordinary_basics/lang/en_us.json b/src/main/resources/assets/unordinary_basics/lang/en_us.json index f9b0724e..17897606 100644 --- a/src/main/resources/assets/unordinary_basics/lang/en_us.json +++ b/src/main/resources/assets/unordinary_basics/lang/en_us.json @@ -5,6 +5,7 @@ "block.unordinary_basics.enchantment_library": "Enchantment Library §c(WIP)§", "block.unordinary_basics.item_sorter": "Item Sorter", + "block.unordinary_basics.item_sorter.desc": "Sneak and Right Click to Open GUI. Right Click to move items from your inventory to block inventory according to what is in the Item Sorters Filters", "item.minecraft.milk_bucket": "Bucket of Cow's Milk", From 05db76b3089f1cd861334ffa2af2bbaab42476dd Mon Sep 17 00:00:00 2001 From: Nieadni <103650147+Nieadni@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:43:28 +0100 Subject: [PATCH 6/6] Updated Glider to be more akin to BotW --- .../github/manasmods/unordinary_basics/changelog.txt | 1 + .../unordinary_basics/item/custom/GliderItem.java | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt index c11dd322..43c88266 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt +++ b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt @@ -5,5 +5,6 @@ TODO: - Fix Redstone Pouch bug. In jar file (we think), placing down redstone will crash the game. - Update Master Miner to only mine blocks of a same or similar hardness (to avoid cheesing mining long to mine blocks) + - Fix Rendering of Glider in Off Hand. == End of Change Log == \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java index dede65f2..4da462db 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java @@ -5,23 +5,17 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MoverType; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.phys.Vec3; public class GliderItem extends Item { /** * Changes the level of the slow falling effect, the higher this is, the slower the player will fall */ - private static int FALL_SPEED_MODIFIER = 6; - /** - * Changes the glider's automatic movement forward's speed, the higher this is, the slower the glider will move - */ - private static int GLIDE_SPEED_MODIFIER = 0; + private static int FALL_SPEED_MODIFIER = 8; private static final MobEffectInstance SLOW_FALLING = new MobEffectInstance(MobEffects.SLOW_FALLING, 1, FALL_SPEED_MODIFIER, false, false); @@ -46,8 +40,6 @@ public void inventoryTick(ItemStack pStack, Level pLevel, Entity pEntity, int pS LivingEntity livingEntity = (LivingEntity) pEntity; livingEntity.addEffect(SLOW_FALLING); - Vec3 direction = livingEntity.getViewVector(1.0F); - livingEntity.move(MoverType.SELF,new Vec3(direction.x / GLIDE_SPEED_MODIFIER,direction.y / (GLIDE_SPEED_MODIFIER * 2),direction.z / GLIDE_SPEED_MODIFIER)); System.out.println("Moved"); }