tmp

build.gradle

@@ -88,11 +88,17 @@ minecraft {
         client {
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', mod_id
+            // fixes patchouli mixin error
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
         }
 
         server {
             property 'forge.enabledGameTestNamespaces', mod_id
             args '--nogui'
+            // fixes patchouli mixin error
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
         }
 
         // This run config launches GameTestServer and runs all registered gametests, then exits.
@@ -116,39 +122,18 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
-    // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
-    // flatDir {
-    //     dir 'libs'
-    // }
+    maven {
+        url "https://cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use.
-    // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
-    // The "userdev" classifier will be requested and setup by ForgeGradle.
-    // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
-    // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-
-    // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
-    // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
-
-    // Example mod dependency using a mod jar from ./libs with a flat dir repository
-    // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
-    // The group id is ignored when searching -- in this case, it is "blank"
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
-
-    // For more info:
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+    implementation fg.deobf("curse.maven:guidebook-253874:4593765")
+    implementation fg.deobf("curse.maven:patchouli-306770:4633797")
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx3G
+# CreateCoredumpOnCrash only works on jdk9+
+org.gradle.jvmargs=-Xmx3G -XX:-CreateCoredumpOnCrash
 org.gradle.daemon=false
 
 minecraft_version=1.20.1
@@ -12,7 +13,7 @@ mapping_version=2023.09.03-1.20.1
 mod_id=enhancedexplosives
 mod_name=Enhanced Explosives
 mod_license=All Rights Reserved
-mod_version=0.13.2
+mod_version=0.15.0
 mod_group_id=com.jenny
-mod_authors=Jenny
+mod_authors=xJenny69
 mod_description=strong & throwable explosives

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

@@ -1,16 +1,19 @@
 package com.jenny.enhancedexplosives;
 
+import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.particles.ArrowParticle;
 import com.jenny.enhancedexplosives.particles.particles;
 import net.minecraft.client.Minecraft;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
 import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
 
-@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class eventBusEvents {
+@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+public class ClientEvents {
     @SubscribeEvent
     public static void registerParticleFactories(final RegisterParticleProvidersEvent event) {
         Minecraft.getInstance().particleEngine.register(particles.CONCUSSIVE_ARROW_PARTICLE.get(),
@@ -22,4 +25,9 @@ public class eventBusEvents {
         Minecraft.getInstance().particleEngine.register(particles.TUNNEL_ARROW_PARTICLE.get(),
                 ArrowParticle.Provider::new);
     }
+
+    @SubscribeEvent
+    public static void onClientSetup(FMLClientSetupEvent event) {
+        entities.registerRenderers();
+    }
 }

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

@@ -7,7 +7,6 @@ import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.items.items;
 import com.jenny.enhancedexplosives.particles.particles;
 import com.mojang.logging.LogUtils;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -15,7 +14,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.slf4j.Logger;
@@ -54,14 +52,4 @@ public class EnhancedExplosives {
     public void onServerStarting(ServerStartingEvent event) {
 
     }
-
-    // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
-    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-    public static class ClientModEvents {
-
-        @SubscribeEvent
-        public static void onClientSetup(FMLClientSetupEvent event) {
-            entities.registerRenderers();
-        }
-    }
 }

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

@@ -1,9 +1,9 @@
 package com.jenny.enhancedexplosives.blocks;
 
 import com.jenny.enhancedexplosives.items.BlockItemTooltip;
-
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -14,49 +14,51 @@ import net.minecraftforge.registries.RegistryObject;
 import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
 
 public class blocks {
+    private static final BlockBehaviour.Properties DEFAULT_PROPS = BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).instabreak().sound(SoundType.GRASS).ignitedByLava();
+
     public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
 
-    public static final RegistryObject<Block> TNT_8 = BLOCKS.register("tnt_8", () -> new strongerTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE), 8.0f, 80));
+    public static final RegistryObject<Block> TNT_8 = BLOCKS.register("tnt_8", () -> new strongerTNTBlock(DEFAULT_PROPS, 8.0f, 80));
     public static final RegistryObject<Item> TNT_8_ITEM = ITEMS.register("tnt_8", () -> new BlockItemTooltip(TNT_8.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_16 = BLOCKS.register("tnt_16", () -> new strongerTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 16.0f, 80));
+    public static final RegistryObject<Block> TNT_16 = BLOCKS.register("tnt_16", () -> new strongerTNTBlock(DEFAULT_PROPS, 16.0f, 80));
     public static final RegistryObject<Item> TNT_16_ITEM = ITEMS.register("tnt_16", () -> new BlockItemTooltip(TNT_16.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_32 = BLOCKS.register("tnt_32", () -> new strongerTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 32.0f, 80));
+    public static final RegistryObject<Block> TNT_32 = BLOCKS.register("tnt_32", () -> new strongerTNTBlock(DEFAULT_PROPS, 32.0f, 80));
     public static final RegistryObject<Item> TNT_32_ITEM = ITEMS.register("tnt_32", () -> new BlockItemTooltip(TNT_32.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_64 = BLOCKS.register("tnt_64", () -> new strongerTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 64.0f, 80));
+    public static final RegistryObject<Block> TNT_64 = BLOCKS.register("tnt_64", () -> new strongerTNTBlock(DEFAULT_PROPS, 64.0f, 80));
     public static final RegistryObject<Item> TNT_64_ITEM = ITEMS.register("tnt_64", () -> new BlockItemTooltip(TNT_64.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_128 = BLOCKS.register("tnt_128", () -> new strongerTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 128.0f, 80));
+    public static final RegistryObject<Block> TNT_128 = BLOCKS.register("tnt_128", () -> new strongerTNTBlock(DEFAULT_PROPS, 128.0f, 80));
     public static final RegistryObject<Item> TNT_128_ITEM = ITEMS.register("tnt_128", () -> new BlockItemTooltip(TNT_128.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_CLUSTER_2 = BLOCKS.register("tnt_cluster_2", () -> new ClusterTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 2, 10));
+    public static final RegistryObject<Block> TNT_CLUSTER_2 = BLOCKS.register("tnt_cluster_2", () -> new ClusterTNTBlock(DEFAULT_PROPS, 4.0f, 80, 2, 10));
     public static final RegistryObject<Item> TNT_CLUSTER_2_ITEM = ITEMS.register("tnt_cluster_2", () -> new BlockItemTooltip(TNT_CLUSTER_2.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_CLUSTER_4 = BLOCKS.register("tnt_cluster_4", () -> new ClusterTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 4, 10));
+    public static final RegistryObject<Block> TNT_CLUSTER_4 = BLOCKS.register("tnt_cluster_4", () -> new ClusterTNTBlock(DEFAULT_PROPS, 4.0f, 80, 4, 10));
     public static final RegistryObject<Item> TNT_CLUSTER_4_ITEM = ITEMS.register("tnt_cluster_4", () -> new BlockItemTooltip(TNT_CLUSTER_4.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_CLUSTER_8 = BLOCKS.register("tnt_cluster_8", () -> new ClusterTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 8, 10));
+    public static final RegistryObject<Block> TNT_CLUSTER_8 = BLOCKS.register("tnt_cluster_8", () -> new ClusterTNTBlock(DEFAULT_PROPS, 4.0f, 80, 8, 10));
     public static final RegistryObject<Item> TNT_CLUSTER_8_ITEM = ITEMS.register("tnt_cluster_8", () -> new BlockItemTooltip(TNT_CLUSTER_8.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_HOMING = BLOCKS.register("tnt_homing", () -> new homingTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 1));
+    public static final RegistryObject<Block> TNT_HOMING = BLOCKS.register("tnt_homing", () -> new homingTNTBlock(DEFAULT_PROPS, 4.0f, 80, 1));
     public static final RegistryObject<Item> TNT_HOMING_ITEM = ITEMS.register("tnt_homing", () -> new BlockItemTooltip(TNT_HOMING.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_BLACK_HOLE = BLOCKS.register("tnt_black_hole", () -> new blackHoleTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 1));
+    public static final RegistryObject<Block> TNT_BLACK_HOLE = BLOCKS.register("tnt_black_hole", () -> new blackHoleTNTBlock(DEFAULT_PROPS, 4.0f, 80, 1));
     public static final RegistryObject<Item> TNT_BLACK_HOLE_ITEM = ITEMS.register("tnt_black_hole", () -> new BlockItemTooltip(TNT_BLACK_HOLE.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_CLAYMORE =  BLOCKS.register("tnt_claymore", () -> new claymoreTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 2.0f, 20, 256));
+    public static final RegistryObject<Block> TNT_CLAYMORE = BLOCKS.register("tnt_claymore", () -> new claymoreTNTBlock(DEFAULT_PROPS, 2.0f, 20, 256));
     public static final RegistryObject<Item> TNT_CLAYMORE_ITEM = ITEMS.register("tnt_claymore", () -> new BlockItemTooltip(TNT_CLAYMORE.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_SELECTIVE = BLOCKS.register("tnt_selective", () -> new selectiveTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 32.0f, 80));
+    public static final RegistryObject<Block> TNT_SELECTIVE = BLOCKS.register("tnt_selective", () -> new selectiveTNTBlock(DEFAULT_PROPS, 32.0f, 80));
     public static final RegistryObject<Item> TNT_SELECTIVE_ITEM = ITEMS.register("tnt_selective", () -> new BlockItemTooltip(TNT_SELECTIVE.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_ENDER = BLOCKS.register("tnt_ender", () -> new enderTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80));
+    public static final RegistryObject<Block> TNT_ENDER = BLOCKS.register("tnt_ender", () -> new enderTNTBlock(DEFAULT_PROPS, 4.0f, 80));
     public static final RegistryObject<Item> TNT_ENDER_ITEM = ITEMS.register("tnt_ender", () -> new BlockItemTooltip(TNT_ENDER.get(), new Item.Properties()));
 
-    public static final RegistryObject<Block> TNT_REPULSIVE = BLOCKS.register("tnt_repulsive", () -> new repulsiveTNTBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED), 4.0f, 80, 1));
+    public static final RegistryObject<Block> TNT_REPULSIVE = BLOCKS.register("tnt_repulsive", () -> new repulsiveTNTBlock(DEFAULT_PROPS, 4.0f, 80, 1));
     public static final RegistryObject<Item> TNT_REPULSIVE_ITEM = ITEMS.register("tnt_repulsive", () -> new BlockItemTooltip(TNT_REPULSIVE.get(), new Item.Properties()));
 
 

src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java

@@ -43,7 +43,6 @@ public class tntArrow extends baseArrow {
     @Override
     public void spawnParticles(float partialTicks) {
         for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {
-            double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100;
             Vec3 DeltaMovement = getDeltaMovement();
             Vec3 pos = particlePos(0.5);
             level().addParticle(particles.TNT_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z);

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

@@ -4,7 +4,6 @@ import com.jenny.enhancedexplosives.entities.arrows.*;
 import com.jenny.enhancedexplosives.entities.client.*;
 import com.jenny.enhancedexplosives.entities.throwable.dynamite;
 import com.jenny.enhancedexplosives.entities.tnt.*;
-
 import net.minecraft.client.renderer.entity.EntityRenderers;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
@@ -21,35 +20,35 @@ public class entities {
 
     public static final RegistryObject<EntityType<homingPrimedTNT>> TNT_HOMING =
             ENTITY_TYPES.register("tnt_homing", () -> EntityType.Builder.<homingPrimedTNT>of(homingPrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_homing"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_homing"));
 
     public static final RegistryObject<EntityType<StrongerPrimedTNT>> TNT_STRONGER =
             ENTITY_TYPES.register("tnt_stronger", () -> EntityType.Builder.<StrongerPrimedTNT>of(StrongerPrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_stronger"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_stronger"));
 
     public static final RegistryObject<EntityType<ClusterPrimedTNT>> TNT_CLUSTER =
             ENTITY_TYPES.register("tnt_cluster", () -> EntityType.Builder.<ClusterPrimedTNT>of(ClusterPrimedTNT::new, MobCategory.MISC)
-                    .sized(0.48F, 0.48F).fireImmune().clientTrackingRange(8).build("tnt_cluster"));
+                    .sized(0.48F, 0.48F).fireImmune().clientTrackingRange(10).updateInterval(10).build("tnt_cluster"));
 
     public static final RegistryObject<EntityType<blackHolePrimedTNT>> TNT_BLACK_HOLE =
             ENTITY_TYPES.register("tnt_blackhole", () -> EntityType.Builder.<blackHolePrimedTNT>of(blackHolePrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_blackhole"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_blackhole"));
 
     public static final RegistryObject<EntityType<selectivePrimedTNT>> TNT_SELECTIVE =
             ENTITY_TYPES.register("tnt_selective", () -> EntityType.Builder.<selectivePrimedTNT>of(selectivePrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_selective"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_selective"));
 
     public static final RegistryObject<EntityType<claymorePrimedTNT>> TNT_CLAYMORE =
             ENTITY_TYPES.register("tnt_claymore", () -> EntityType.Builder.<claymorePrimedTNT>of(claymorePrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_claymore"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_claymore"));
 
     public static final RegistryObject<EntityType<enderPrimedTNT>> TNT_ENDER =
             ENTITY_TYPES.register("tnt_ender", () -> EntityType.Builder.<enderPrimedTNT>of(enderPrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_ender"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_ender"));
 
     public static final RegistryObject<EntityType<repulsivePrimedTNT>> TNT_REPULSIVE =
             ENTITY_TYPES.register("tnt_repulsive", () -> EntityType.Builder.<repulsivePrimedTNT>of(repulsivePrimedTNT::new, MobCategory.MISC)
-                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_repulsive"));
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_repulsive"));
 
     public static final RegistryObject<EntityType<tntArrow>> ARROW_TNT =
             ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.<tntArrow>of(tntArrow::new, MobCategory.MISC)

src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java

@@ -25,20 +25,20 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
 
     public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel, @Nullable LivingEntity owner) {
         super(pEntityType, pLevel);
-        commonInit(pLevel, owner);
-        this.fuse = getFuse();
-    }
-
-    private void commonInit(@NotNull Level pLevel, @Nullable LivingEntity owner) {
-        double d0 = pLevel.random.nextDouble() * (double)((float)Math.PI * 2F);
-        this.setDeltaMovement(-Math.sin(d0) * 0.02D, (double)0.2F, -Math.cos(d0) * 0.02D);
         this.blocksBuilding = true;
         this.setOwner(owner);
+        this.fuse = getFuse();
     }
 
     public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel, @Nullable LivingEntity owner, Vec3 pos, int fuse, float power) {
         super(pEntityType, pLevel);
-        commonInit(pLevel, owner);
+        this.blocksBuilding = true;
+        this.setOwner(owner);
+        double d0 = pLevel.random.nextDouble() * (double) ((float) Math.PI * 2F);
+        this.setDeltaMovement(-Math.sin(d0) * 0.02D, (double) 0.2F, -Math.cos(d0) * 0.02D);
+        xo = pos.x;
+        yo = pos.y;
+        zo = pos.z;
         setPos(pos);
         setFuse(fuse);
         setPower(power);

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

@@ -1,64 +1,36 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader = "javafml" #mandatory
+modLoader = "javafml"
 logoFile = "logo.png"
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion = "${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
+loaderVersion = "${loader_version_range}"
 license = "${mod_license}"
-# A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId = "${mod_id}" #mandatory
-# The version number of the mod
-version = "${mod_version}" #mandatory
-# A display name for the mod
-displayName = "${mod_name}" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
-#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="enhancedexplosives.png" #optional
-# A text field displayed in the mod UI
-#credits="Thanks for this example mod goes to Java" #optional
-# A text field displayed in the mod UI
-authors = "${mod_authors}" #optional
-# Display Test controls the display for your mod in the server connection screen
-# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
-# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
-# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
-# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
-# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
-
-# The description text for the mod (multi line!) (#mandatory)
+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"
 description = '''${mod_description}'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies."${mod_id}"]] #optional
-# the modid of the dependency
-modId = "forge" #mandatory
-# Does this dependency have to exist - if not, ordering below must be specified
-mandatory = true #mandatory
-# The version range of the dependency
-versionRange = "${forge_version_range}" #mandatory
-# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
-# BEFORE - This mod is loaded BEFORE the dependency
-# AFTER - This mod is loaded AFTER the dependency
+modId = "forge"
+mandatory = true
+versionRange = "${forge_version_range}"
 ordering = "NONE"
-# Side this dependency is applied on - BOTH, CLIENT, or SERVER
-side = "BOTH"# Here's another dependency
+side = "BOTH"
 [[dependencies."${mod_id}"]]
 modId = "minecraft"
 mandatory = true
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"
+[[dependencies."${mod_id}"]]
+modId = "gbook"
+mandatory = false
+versionRange = "[1.7.3,)"
+ordering = "BEFORE"
+side = "BOTH"
+[[dependencies."${mod_id}"]]
+modId = "patchouli"
+mandatory = false
+versionRange = "[1.0.6,)"
+ordering = "BEFORE"
+side = "BOTH"

src/main/resources/assets/enhancedexplosives/books.json

@@ -0,0 +1,3 @@
+[
+  "enhancedexplosives:books/guide_enhanced_explosives.xml"
+]

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

@@ -0,0 +1,134 @@
+<book title="Enhanced Explosives">
+    <include ref="gbook:xml/standard.xml"/>
+    <chapter id="ch_landing">
+        <section id="se_landing">
+            <page_title>
+                <title>Content</title>
+            </page_title>
+            <title>TNTs</title>
+            <link ref=":se_compressed_tnt">Compressed TNT</link>
+            <link ref=":se_cluster_tnt">Cluster TNT</link>
+            <link ref=":se_homing_tnt">Homing TNT</link>
+            <link ref=":se_black_hole_tnt">Black Hole TNT</link>
+            <link ref=":se_claymore_tnt">Claymore TNT</link>
+            <link ref=":se_selective_tnt">Selective</link>
+            <link ref=":se_ender_tnt">Ender TNT</link>
+            <link ref=":se_repulsive_tnt">Repulsive TNT</link>
+            <title>Arrows</title>
+            <link ref=":ch_tnt_arrow">TNT Arrow</link>
+            <link ref=":se_concussive_arrow">Concussive Arrow</link>
+            <link ref=":se_carpet_arrow">Carpet Bombing Arrow</link>
+            <link ref=":se_tunnel_arrow">Tunnel Arrow</link>
+            <title>Other</title>
+            <link ref=":se_dynamite">Dynamite</link>
+        </section>
+    </chapter>
+    <chapter id="ch_compressed_tnt">
+        <section id="se_compressed_tnt">
+            <page_title>
+                <title>Compressed TNT</title>
+            </page_title>
+            <p>These TNTs are stronger than vanilla TNT. They are crafted from 4 TNTs of the previous stage and offer
+                double the explosion strength.
+            </p>
+        </section>
+    </chapter>
+    <chapter id="ch_cluster_tnt">
+        <section id="se_cluster_tnt">
+            <page_title>
+                <title>Cluster TNT</title>
+            </page_title>
+            <p>These TNTs spawn multiple smaller TNTs when primed. Each spawned TNT is as strong as vanilla TNT.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_homing_tnt">
+        <section id="se_homing_tnt">
+            <page_title>
+                <title>Homing TNT</title>
+            </page_title>
+            <p>This TNT targets the closest mob and moves towards it.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_black_hole_tnt">
+        <section id="se_black_hole_tnt">
+            <page_title>
+                <title>Black Hole TNT</title>
+            </page_title>
+            <p>This TNT attracts close entities towards itself before exploding.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_claymore_tnt">
+        <section id="se_claymore_tnt">
+            <page_title>
+                <title>Claymore TNT</title>
+            </page_title>
+            <p>This TNT shoots many arrows in a circle around the TNT, instead of exploding.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_selective_tnt">
+        <section id="se_selective_tnt">
+            <page_title>
+                <title>Selective TNT</title>
+            </page_title>
+            <p>This TNT will only destroy the type of block it is sitting upon when exploding. It will still honour the
+                blocks blast resistance, e.g. it won't destroy bedrock.
+            </p>
+        </section>
+    </chapter>
+    <chapter id="ch_ender_tnt">
+        <section id="se_ender_tnt">
+            <page_title>
+                <title>Ender TNT</title>
+            </page_title>
+            <p>This TNT will teleport randomly teleport when primed.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_repulsive_tnt">
+        <section id="se_repulsive_tnt">
+            <page_title>
+                <title>Repulsive TNT</title>
+            </page_title>
+            <p>This TNT will push entities away when primed.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_tnt_arrow">
+        <section id="se_tnt_arrow">
+            <page_title>
+                <title>TNT Arrow</title>
+            </page_title>
+            <p>This arrow explodes on impact with half the strength of TNT.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_concussive_arrow">
+        <section id="se_concussive_arrow">
+            <page_title>
+                <title>TNT Arrow</title>
+            </page_title>
+            <p>This arrow explodes on impact without damaging blocks.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_carpet_arrow">
+        <section id="se_carpet_arrow">
+            <page_title>
+                <title>Carpet Bombing Arrow</title>
+            </page_title>
+            <p>This arrow splits into many Concussive Arrows as soon as it starts falling.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_tunnel_arrow">
+        <section id="se_tunnel_arrow">
+            <page_title>
+                <title>Tunnel Arrow</title>
+            </page_title>
+            <p>This arrow spawns multiple explosions in a line equivalent to its direction on hit.</p>
+        </section>
+    </chapter>
+    <chapter id="ch_dynamite">
+        <section id="se_dynamite">
+            <page_title>
+                <title>Dynamite</title>
+            </page_title>
+            <p>Dynamite can be thrown like a potion and explodes with the strength of vanilla TNT.</p>
+        </section>
+    </chapter>
+</book>

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/arrows.json

@@ -0,0 +1,5 @@
+{
+  "name": "Arrows",
+  "description": "These are all new arrows",
+  "icon": "minecraft:arrow"
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/other.json

@@ -0,0 +1,5 @@
+{
+  "name": "Others",
+  "description": "Some other new stuff",
+  "icon": "minecraft:bedrock"
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/tnts.json

@@ -0,0 +1,5 @@
+{
+  "name": "TNTs",
+  "description": "These are all new TNTs",
+  "icon": "minecraft:tnt"
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_carpet.json

@@ -0,0 +1,12 @@
+{
+  "name": "Carpet Bombing Arrow",
+  "icon": "enhancedexplosives:arrow_carpet",
+  "category": "enhancedexplosives:arrows",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This arrow splits into many explosive arrows as soon as it starts falling. Whether the arrows are concussive or TNT Arrows depends on the config.",
+      "recipe": "enhancedexplosives:arrow_carpet"
+    }
+  ]
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_concussive.json

@@ -0,0 +1,12 @@
+{
+  "name": "Concussive Arrow",
+  "icon": "enhancedexplosives:arrow_concussive",
+  "category": "enhancedexplosives:arrows",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This arrow explodes like TNT on impact, but without damaging blocks.",
+      "recipe": "enhancedexplosives:arrow_concussive"
+    }
+  ]
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tnt.json

@@ -0,0 +1,12 @@
+{
+  "name": "TNT Arrow",
+  "icon": "enhancedexplosives:arrow_tnt",
+  "category": "enhancedexplosives:arrows",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This arrow explodes like TNT on impact.",
+      "recipe": "enhancedexplosives:arrow_tnt"
+    }
+  ]
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tunnel.json

@@ -0,0 +1,12 @@
+{
+  "name": "Tunnel Arrow",
+  "icon": "enhancedexplosives:arrow_tunnel",
+  "category": "enhancedexplosives:arrows",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This arrow summons multiple explosions in front of it, along it's direction on impact, forming a tunnel in front.",
+      "recipe": "enhancedexplosives:arrow_tunnel"
+    }
+  ]
+}

src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/other/dynamite.json

@@ -0,0 +1,12 @@
+{
+  "name": "Dynamite",
+  "icon": "enhancedexplosives:dynamite",
+  "category": "enhancedexplosives:other",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "Can be thrown like a splash potion, but bounces on the ground and explodes like a tnt.",
+      "recipe": "enhancedexplosives:dynamite"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Quintuple Compressed TNT",
+  "icon": "enhancedexplosives:tnt_128",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT behaves like vanilla TNT, but with 32x the explosion strength.",
+      "recipe": "enhancedexplosives:tnt_128"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Double Compressed TNT",
+  "icon": "enhancedexplosives:tnt_16",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT behaves like vanilla TNT, but with 4x the explosion strength.",
+      "recipe": "enhancedexplosives:tnt_16"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Triple Compressed TNT",
+  "icon": "enhancedexplosives:tnt_32",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT behaves like vanilla TNT, but with 8x the explosion strength.",
+      "recipe": "enhancedexplosives:tnt_32"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Quadruple Compressed TNT",
+  "icon": "enhancedexplosives:tnt_64",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT behaves like vanilla TNT, but with 16x the explosion strength.",
+      "recipe": "enhancedexplosives:tnt_64"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Compressed TNT",
+  "icon": "enhancedexplosives:tnt_8",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT behaves like vanilla TNT, but with 2x the explosion strength.",
+      "recipe": "enhancedexplosives:tnt_8"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Black Hole TNT",
+  "icon": "enhancedexplosives:tnt_black_hole",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT pulls entities towards itself.",
+      "recipe": "enhancedexplosives:tnt_black_hole"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Claymore TNT",
+  "icon": "enhancedexplosives:tnt_claymore",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT shoots many arrows in a circle around the TNT, instead of exploding.",
+      "recipe": "enhancedexplosives:tnt_claymore"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "2× TNT Cluster",
+  "icon": "enhancedexplosives:tnt_cluster_2",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT splits into 2 smaller TNTs when primed",
+      "recipe": "enhancedexplosives:tnt_cluster_2"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "4× TNT Cluster",
+  "icon": "enhancedexplosives:tnt_cluster_4",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT splits into 4 smaller TNTs when primed",
+      "recipe": "enhancedexplosives:tnt_cluster_4"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "8× TNT Cluster",
+  "icon": "enhancedexplosives:tnt_cluster_8",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT splits into 8 smaller TNTs when primed",
+      "recipe": "enhancedexplosives:tnt_cluster_8"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Ender TNT",
+  "icon": "enhancedexplosives:tnt_ender",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT teleports like an enderman when primed.",
+      "recipe": "enhancedexplosives:tnt_ender"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Homing TNT",
+  "icon": "enhancedexplosives:tnt_homing",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT follows the closest mob.",
+      "recipe": "enhancedexplosives:tnt_homing"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Repulsive TNT",
+  "icon": "enhancedexplosives:tnt_repulsive",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT pushes close entities away.",
+      "recipe": "enhancedexplosives:tnt_repulsive"
+    }
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "name": "Selective TNT",
+  "icon": "enhancedexplosives:tnt_selective",
+  "category": "enhancedexplosives:tnts",
+  "pages": [
+    {
+      "type": "patchouli:crafting",
+      "text": "This TNT will only destroy the type of block it is sitting upon when exploding. It will still honour the blocks blast resistance, e.g. it won't destroy bedrock.",
+      "recipe": "enhancedexplosives:tnt_selective"
+    }
+  ]
+}

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

@@ -0,0 +1,7 @@
+{
+  "name": "Yurrr!",
+  "landing_text": "Skrrr Skrr",
+  "version": 1,
+  "creative_tab": "enhancedexplosives:enhancedexplosives",
+  "use_resource_pack": true
+}