Merge pull request #72 from CamoMano/1.21-dev

1.21 dev
CamoMano · Jul 8, 2024 · 82377c4 · 82377c4
2 parents 7f645d2 + a66bf4c
commit 82377c4
Show file tree

Hide file tree

Showing 53 changed files with 1,158 additions and 51 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,3 +1,4 @@
+---
 name: Bug Report
 description: For reporting bugs and/or any issues you encounter will playing with Enriched.
 labels:
@@ -7,30 +8,50 @@ body:
     attributes:
       value: >-
         # READ THIS BEFORE OPENING AN ISSUE
-        
-        **This issue tracker is not for support requests!**
-        If you need help with crashes or any other issues, please ask for help in [Camo's Discord server]() instead of opening and issue here.
-        In addition, please make sure you have at least done the following:
-        
-        - **Have you ensured that all of your mods (including Enriched) are up-to-date?**
-        The latest version of Enriched can be found on either [GitHub Releases](https://github.com/CamoMano/Enriched/releases) or
-        its [CurseForge page](https://www.curseforge.com/minecraft/mc-mods/enriched).
-        
-        - **Have you used the [search tool](https://github.com/CamoMano/Enriched/issues) to see if your issue has already been reported?**
-        If so, you should leave a comment under the existing issue to add any additional information, if you have any,
-        
-        - **Have you created a base set of instructions to reproduce the issue?**
-        If your issue only occurs with other mods installed, then you should try to narrow down exactly which mods are causing the issue.
-        Please don't provide a list of all of the mods you use and expect us to figure out which ones are problematic.
+
+        **This issue tracker is not for support requests!** If you need help with crashes or any other issues, please ask for help in [Camo's Discord server]() instead of opening and issue here. In addition, please make sure you have at least done the following:
+
+        - **Have you ensured that all of your mods (including Enriched) are up-to-date?** The latest version of Enriched can be found on either [GitHub Releases](https://github.com/CamoMano/Enriched/releases) or its [CurseForge page](https://www.curseforge.com/minecraft/mc-mods/enriched).
+
+        - **Have you used the [search tool](https://github.com/CamoMano/Enriched/issues) to see if your issue has already been reported?** If so, you should leave a comment under the existing issue to add any additional information, if you have any,
+
+        - **Have you created a base set of instructions to reproduce the issue?** If your issue only occurs with other mods installed, then you should try to narrow down exactly which mods are causing the issue. Please don't provide a list of all of the mods you use and expect us to figure out which ones are problematic.
+  - type: input
+    id: enriched-version
+    attributes:
+      label: Enriched Version
+      description: What version of Enriched are you using?
+      placeholder: ex. 4.0
+    validations:
+      required: true
+  - type: input
+    id: fabricapi-version
+    attributes:
+      label: Enriched Version
+      description: What version of Fabric API are you using?
+      placeholder: ex. 0.100.6+1.21
+    validations:
+      required: true
+  - type: input
+    id: fabricloader-version
+    attributes:
+      label: Fabric Loader Version
+      description: What version of Fabric are you using?
+      placeholder: ex. 0.15.11
+    validations:
+      required: true
   - type: textarea
     id: bug-description
     attributes:
       label: Bug Description
       description: >-
-        Here you should describe the issue you are encountering in as much detail and depth as you can. The description should include the behavior you were expecting,
-        what behavior happened instead and why you believe this to be a bug. If the issue only occurs with specific mods installed, you must be provide the names of those mods
-        and the versions of them you were using.
-        
+        Here you should describe the issue you are encountering in as much
+        detail and depth as you can. The description should include the behavior
+        you were expecting, what behavior happened instead and why you believe
+        this to be a bug. If the issue only occurs with specific mods installed,
+        you must be provide the names of those mods and the versions of them you
+        were using.
+
         **Tip**: If you have any videos, screenshots or other information that you think are necessary and help better explain the issue, you should attach them here.
     validations:
       required: true
@@ -39,33 +60,38 @@ body:
     attributes:
       label: Bug Reproduction Steps
       description: >-
-        Here you should provide instructions on how to reproduce this issue. Make sure your instructions are clear and concise as other people will have to follow them in order
-        to reproduce the bug in their own environment.
-        
+        Here you should provide instructions on how to reproduce this
+        issue. Make sure your instructions are clear and concise as other people
+        will have to follow them in order to reproduce the bug in their own
+        environment.
+
         **Tip:**: A common way to fill out this section is in the form of a step-by-step guide.
     validations:
       required: true
   - type: textarea
     id: minecraft-log-file
     attributes:
       label: Minecraft Log File
-      description: >-
-        **Tip**: You can find the game's log files within the `.minecraft/logs` directory. Most often, you only need to provide the `latest.log` file as that holds the logs
-        to the most recently played session of the game, but you can provide the other ones if you find it necessary.
-      placeholder: ->
-        Drag and drop the log file(s) here.
+      description: "**Tip**: You can find the game's log files within the
+        `.minecraft/logs` directory. Most often, you only need to provide the
+        `latest.log` file as that holds the logs to the most recently played
+        session of the game, but you can provide the other ones if you find it
+        necessary."
+      placeholder: -> Drag and drop the log file(s) here.
     validations:
       required: true
   - type: textarea
     id: minecraft-crash-report
     attributes:
       label: Minecraft Crash Report
       description: >-
-        If even the issue doesn't cause the game to crash, a crash report will still be useful. This is because it contains important hardware and software configuration. You
-        can manually crash by the holding down the F3 + C keys together for about 10 seconds. This works anywhere in the game such as on the title screen or while in a world.
-        
+        If even the issue doesn't cause the game to crash, a crash report
+        will still be useful. This is because it contains important hardware and
+        software configuration. You can manually crash by the holding down the
+        F3 + C keys together for about 10 seconds. This works anywhere in the
+        game such as on the title screen or while in a world.
+
         **Tip**: You can usually find crash reports within the `.minecraft/crash-reports` directory.
-      placeholder: ->
-        Drag and drop the crash report file here.
+      placeholder: -> Drag and drop the crash report file here.
     validations:
-      required: true
+      required: true
diff --git a/gradle.properties b/gradle.properties
@@ -8,9 +8,9 @@ org.gradle.debug=false
 minecraft_version=1.21
 yarn_mappings_version=1.21+build.7
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.4+1.21
+fabric_api_version=0.100.6+1.21
 # Mod Properties
-mod_version=4.0
+mod_version=4.1
 maven_group=com.enrichedmc
 archives_base_name=enriched
 # Dependencies

diff --git a/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223 b/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223
@@ -1,4 +1,4 @@
-// 1.21	2024-07-07T16:11:52.8576247	Enriched/Tags for minecraft:block
+// 1.21	2024-07-08T11:51:51.783504	Enriched/Tags for minecraft:block
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_ruby_tool.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\block\redwood_logs.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_emerald_tool.json

diff --git a/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1 b/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1
@@ -1,4 +1,4 @@
-// 1.21	2024-07-07T16:11:52.8566186	Enriched/Block Loot Tables
+// 1.21	2024-07-08T11:51:51.7814976	Enriched/Block Loot Tables
 de886d29608aa25104c1b2e8d6f056a55c95549a data\enriched\loot_table\blocks\polished_dark_granite_stairs.json
 58b8c0cbcc1f69bf41c5952003634e84f9b358f6 data\enriched\loot_table\blocks\steel_block.json
 c2ea10b722d238b6880fb7a966b95763936ee841 data\enriched\loot_table\blocks\stripped_redwood_log.json
@@ -12,14 +12,14 @@ b2cadbc201ca01913bcc63d5023432f233c265dd data\enriched\loot_table\blocks\strippe
 32b33f29ff5f105d23d4f02dfaa7fc1702b78f91 data\enriched\loot_table\blocks\redwood_sapling.json
 6bca2b41f1204eb70645aa39914a8a7f14cf8fec data\enriched\loot_table\blocks\redwood_button.json
 8c332ac7d159a890a00c10c8090324518ee5806f data\enriched\loot_table\blocks\marble_slab.json
-e832cea0fef07ade8612a2a956e05daee59e3e1f data\enriched\loot_table\blocks\deepslate_tanzanite_ore.json
+10ff8c85244ee40b6818270b64f5c5681563bc3a data\enriched\loot_table\blocks\deepslate_tanzanite_ore.json
 4d72567b9a3498143d0fae80ae0b4f93a60c423f data\enriched\loot_table\blocks\marble.json
 b8b8f5625b9520dbb58c189e2c434ebfa309b3be data\enriched\loot_table\blocks\dark_granite_wall.json
 d7843b3a8d9160043dc57726c9baaa82489d1728 data\enriched\loot_table\blocks\redwood_fence.json
 2c894972a977ec871a0fcaff9e529e96dc186c77 data\enriched\loot_table\blocks\redwood_stairs.json
 c786f17fb10144bd7f97581a03f2966004616780 data\enriched\loot_table\blocks\dark_granite.json
 742c24721d6015ee27577c46c68dfd3d0a1e4947 data\enriched\loot_table\blocks\redwood_planks.json
-5c8207c3b5ba4429ddf811bc788c094fcd5375b4 data\enriched\loot_table\blocks\tanzanite_ore.json
+6e6a03b6da715c8d5e6120afc0f11552c223dc43 data\enriched\loot_table\blocks\tanzanite_ore.json
 f51bd689224fdeb5a1a0daeb9674b101387f3ef6 data\enriched\loot_table\blocks\polished_dark_granite.json
 8e844ea180f56a98a79d6de691ac241200019c04 data\enriched\loot_table\blocks\potted_redwood_sapling.json
 9805d00c3880577ec7c94b99dc02d29c56132707 data\enriched\loot_table\blocks\dark_granite_stairs.json

diff --git a/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd b/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd
@@ -1,4 +1,4 @@
-// 1.21	2024-07-07T16:11:52.8576247	Enriched/Tags for minecraft:item
+// 1.21	2024-07-08T11:51:51.7825052	Enriched/Tags for minecraft:item
 681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\item\planks.json
 75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\item\logs_that_burn.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\item\redwood_logs.json