0.15.0

README.md

@@ -1,8 +1,13 @@
 # For info on the mod go to either
-* [the wiki](https://git.smthng.de/Jenny/Enhanced-Explosives/wiki)
 * [modrinth](https://modrinth.com/mod/enhanced-explosives)
 * [curseforge](https://www.curseforge.com/minecraft/mc-mods/enhanced-explosives)
+* in-game wiki (guidebook & patchouli)
 
-# How to run the mod in an IDE
+# How to run / build the mod in an IDE
-* If you use Intellij, you can import the project from git
+* git clone the project
-* You will have to run "runData" once, else textures will be missing
+* run the _runData_ gradle task, it generates the item & block models
+  * the data generation only works in versions =>1.20.1, as I didn't backport it. If you want to build the 
+    mod for versions before that, you can run the _runData_ gradle task in the 1.20.1 branch and switch back to the 
+    branch for your desired version
+* run _runClient_ to start a minecraft session, or run _jar_ to generate a .jar file of the mod (located at _.
+  /build/reobfJar/output.jar_)

build.gradle

@@ -114,6 +114,10 @@ minecraft {
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+
+            // fixes patchouli mixin error
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
         }
     }
 }

src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java

@@ -65,7 +65,7 @@ public class blocks {
     public static final RegistryObject<Item> TNT_BEDROCK_ITEM = ITEMS.register("tnt_bedrock", () -> new BlockItemTooltip(TNT_BEDROCK.get(), new Item.Properties()));
 
     public static final RegistryObject<Block> TNT_ENTITY = BLOCKS.register("tnt_entity", () -> new entityTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80));
-    public static final RegistryObject<Item> TNT_ENTITY_ITEM = ITEMS.register("tnt_entity", () -> new BlockItemTooltip(TNT_BEDROCK.get(), new Item.Properties()));
+    public static final RegistryObject<Item> TNT_ENTITY_ITEM = ITEMS.register("tnt_entity", () -> new BlockItemTooltip(TNT_ENTITY.get(), new Item.Properties()));
 
 
     public static void register(IEventBus bus) {

src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java

@@ -31,6 +31,8 @@ public class ModBlockStateProvider extends BlockStateProvider {
         sideTopBottom(blocks.TNT_128);
         sideTopBottom(blocks.TNT_ENDER);
         sideTopBottom(blocks.TNT_CLAYMORE);
+        sideTopBottom(blocks.TNT_BEDROCK);
+        sideTopBottom(blocks.TNT_ENTITY);
         SideTop(blocks.TNT_BLACK_HOLE);
         SideTop(blocks.TNT_REPULSIVE);
         SideOnlyTNT(blocks.TNT_CLUSTER_2);

src/main/resources/META-INF/mods.toml

@@ -2,13 +2,13 @@ modLoader = "javafml"
 logoFile = "logo.png"
 loaderVersion = "${loader_version_range}"
 license = "${mod_license}"
-issueTrackerURL = "https://git.smthng.de/Jenny/Enhanced-Explosives/issues" #optional
 [[mods]]
 modId = "${mod_id}"
 version = "${mod_version}"
 displayName = "${mod_name}"
 authors = "${mod_authors}"
 displayTest = "MATCH_VERSION"
+displayURL = "https://git.smthng.de/Jenny/Enhanced-Explosives"
 description = '''${mod_description}'''
 [[dependencies."${mod_id}"]] #optional
 modId = "forge"

src/main/resources/assets/enhancedexplosives/books/guide_enhanced_explosives.xml

@@ -14,6 +14,8 @@
             <link ref=":se_selective_tnt">Selective</link>
             <link ref=":se_ender_tnt">Ender TNT</link>
             <link ref=":se_repulsive_tnt">Repulsive TNT</link>
+            <link ref=":se_bedrock_tnt">Bedrock TNT</link>
+            <link ref=":se_entity_tnt">Entity TNT</link>
             <title>Arrows</title>
             <link ref=":ch_tnt_arrow">TNT Arrow</link>
             <link ref=":se_concussive_arrow">Concussive Arrow</link>
@@ -91,6 +93,22 @@
             <p>This TNT will push entities away when primed.</p>
         </section>
     </chapter>
+    <chapter id="ch_bedrock_tnt">
+        <section id="se_bedrock_tnt">
+            <page_title>
+                <title>Bedrock TNT</title>
+            </page_title>
+            <p>This TNT will destroy the one bedrock block below it.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_entity_tnt">
+        <section id="se_entity_tnt">
+            <page_title>
+                <title>Entity TNT</title>
+            </page_title>
+            <p>This TNT won't destroy blocks but hurt entities.</p>
+        </section>
+    </chapter>
     <chapter id="ch_tnt_arrow">
         <section id="se_tnt_arrow">
             <page_title>

src/main/resources/assets/enhancedexplosives/lang/en_us.json

@@ -13,6 +13,8 @@
   "block.enhancedexplosives.tnt_selective": "Selective TNT",
   "block.enhancedexplosives.tnt_ender": "Ender TNT",
   "block.enhancedexplosives.tnt_repulsive": "Repulsive TNT",
+  "block.enhancedexplosives.tnt_bedrock": "Bedrock TNT",
+  "block.enhancedexplosives.tnt_entity": "Entity TNT",
 
   "tooltip.enhancedexplosives.tnt_cluster_2": "splits into 2 small TNTs",
   "tooltip.enhancedexplosives.tnt_cluster_4": "splits into 4 small TNTs",

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_bedrock.json

@@ -0,0 +1,12 @@
+{
+  "name": "Bedrock TNT",
+  "icon": "enhancedexplosives:tnt_bedrock",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT removes the block below it if it's bedrock.",
+      "recipe": "enhancedexplosives:tnt_bedrock"
+    }
+  ]
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_entity.json

@@ -0,0 +1,12 @@
+{
+  "name": "Entity TNT",
+  "icon": "enhancedexplosives:tnt_entity",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT does not damage blocks.",
+      "recipe": "enhancedexplosives:tnt_entity"
+    }
+  ]
+}

src/main/resources/data/enhancedexplosives/loot_tables/tnt_bedrock.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "enhancedexplosives:tnt_bedrock"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/enhancedexplosives/loot_tables/tnt_entity.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "enhancedexplosives:tnt_entity"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/enhancedexplosives/patchouli_books/enhancedexplosives_guide/book.json

@@ -1,6 +1,6 @@
 {
-  "name": "Yurrr!",
+  "name": "EE Manual",
-  "landing_text": "Skrrr Skrr",
+  "landing_text": "If you find bugs or have suggestions for improving this mod, please message me on curseforge, my discord, or gitea (link in mod info).",
   "version": 1,
   "creative_tab": "enhancedexplosives:enhancedexplosives",
   "use_resource_pack": true

src/main/resources/data/enhancedexplosives/recipes/tnt_bedrock.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "pattern": [
+    "AA ",
+    "AA ",
+    "   "
+  ],
+  "key": {
+    "A": {
+      "item": "enhancedexplosives:tnt_128"
+    }
+  },
+  "result": {
+    "item": "enhancedexplosives:tnt_bedrock"
+  }
+}

src/main/resources/data/enhancedexplosives/recipes/tnt_entity.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "redstone",
+  "ingredients":[
+    {
+      "item": "minecraft:tnt"
+    },
+    {
+      "item": "minecraft:water_bucket"
+    }
+  ],
+  "result": {
+    "item": "enhancedexplosives:tnt_entity"
+  }
+}

src/main/resources/data/enhancedexplosives/recipes/tnt_repulsive.json

@@ -10,6 +10,6 @@
     }
   ],
   "result": {
-    "item": "enhancedexplosives:tnt_black_hole"
+    "item": "enhancedexplosives:tnt_repulsive"
   }
 }

src/main/resources/data/enhancedexplosives/recipes/tnt_selective.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "combat",
+  "ingredients":[
+    {
+      "item": "minecraft:tnt"
+    },
+    {
+      "item": "minecraft:obsidian"
+    }
+  ],
+  "result": {
+    "item": "enhancedexplosives:tnt_selective"
+  }
+}