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
-* If you use Intellij, you can import the project from git
-* You will have to run "runData" once, else textures will be missing
+# How to run / build the mod in an IDE
+* git clone the project
+* 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

@@ -32,7 +32,7 @@ minecraft {
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
     minecraft {
-        mappings channel: 'parchment', version: '2023.09.03-1.20.1'
+        mappings channel: mapping_channel, version: mapping_version
     }
 
     // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
@@ -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.
@@ -108,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"
         }
     }
 }
@@ -116,39 +126,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:3904597")
+    implementation fg.deobf("curse.maven:patchouli-306770:3936481")
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -1,49 +1,18 @@
-org.gradle.jvmargs=-Xmx3G
+# CreateCoredumpOnCrash only works on jdk9+
+org.gradle.jvmargs=-Xmx3G -XX:-CreateCoredumpOnCrash
 org.gradle.daemon=false
-# The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.20.1
-# The Minecraft version range can use any release version of Minecraft as bounds.
-# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
-# as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.1]
-# The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=47.3.22
-# The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[47,)
-# The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[47,)
-# The mapping channel to use for mappings.
-# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
-# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
-#
-# | Channel   | Version              |                                                                                |
-# |-----------|----------------------|--------------------------------------------------------------------------------|
-# | official  | MCVersion            | Official field/method names from Mojang mapping files                          |
-# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
-#
-# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
-# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-#
-# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
-# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
+minecraft_version=1.19.2
+minecraft_version_range=[1.19.2]
+forge_version=43.5.0
+forge_version_range=[43,)
+loader_version_range=[43,)
 mapping_channel=parchment
-# The mapping version to query from the mapping channel.
-# This must match the format required by the mapping channel.
-mapping_version=1.20.1
-# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
-# Must match the String constant located in the main mod class annotated with @Mod.
+mapping_version=2022.11.27-1.19.2
+
 mod_id=enhancedexplosives
-# The human-readable display name for the mod.
 mod_name=Enhanced Explosives
-# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
-# The mod version. See https://semver.org/
-mod_version=0.9.0
-# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
-# This should match the base package used for the mod sources.
-# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
+mod_version=0.15.0
 mod_group_id=com.jenny
-# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
-mod_authors=Jenny
-# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_authors=xJenny69
 mod_description=strong & throwable explosives

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

@@ -1,23 +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.minecraft.client.particle.TextureSheetParticle;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleType;
-import net.minecraft.core.particles.SimpleParticleType;
+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.registries.RegistryObject;
-
-import java.util.Iterator;
+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(),
@@ -29,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

@@ -1,12 +1,12 @@
 package com.jenny.enhancedexplosives;
 
 import com.jenny.enhancedexplosives.blocks.blocks;
-import com.jenny.enhancedexplosives.particles.particles;
 import com.jenny.enhancedexplosives.config.ConfigClient;
+import com.jenny.enhancedexplosives.config.ConfigServer;
 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;
@@ -14,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;
@@ -26,6 +25,7 @@ public class EnhancedExplosives {
     public static final String MODID = "enhancedexplosives";
     private static final Logger LOGGER = LogUtils.getLogger();
 
+    @SuppressWarnings("removal")
     public EnhancedExplosives() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
 
@@ -34,16 +34,16 @@ public class EnhancedExplosives {
         particles.register(modEventBus);
         blocks.register(modEventBus);
         items.register(modEventBus);
-        creativeTab.register(modEventBus);
         entities.register(modEventBus);
 
         // Register ourselves for server and other game events we are interested in
         MinecraftForge.EVENT_BUS.register(this);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigClient.SPEC);
+        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigClient.SPEC, "enhancedexplosives-client.toml");
+        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigServer.SPEC, "enhancedexplosives-server.toml");
     }
 
     private void commonSetup(final FMLCommonSetupEvent event) {
-
+        items.registerDispenser();
     }
 
     // You can use SubscribeEvent and let the Event Bus discover methods to call
@@ -51,14 +51,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/ClusterTNTBlock.java

@@ -67,7 +67,7 @@ public class ClusterTNTBlock extends TntBlock {
         if (!level.isClientSide) {
             for (int i = 0; i < childCount; i++) {
                 int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
-                ClusterPrimedTNT primedtnt = new ClusterPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, ft, getMove(level, childRange));
+                ClusterPrimedTNT primedtnt = new ClusterPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft, getMove(level, childRange));
                 level.addFreshEntity(primedtnt);
             }
         }

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

@@ -0,0 +1,59 @@
+package com.jenny.enhancedexplosives.blocks;
+
+import com.jenny.enhancedexplosives.entities.tnt.bedrockPrimedTNT;
+import com.jenny.enhancedexplosives.entities.tnt.selectivePrimedTNT;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.TntBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+public class bedrockTNTBlock extends TntBlock {
+    public final float pRadius;
+    public final int fuseTime;
+
+    public bedrockTNTBlock(Properties p_57422_, float pRadius, int fuseTime) {
+        super(p_57422_);
+        this.pRadius = pRadius;
+        this.fuseTime = fuseTime;
+    }
+
+    @Override
+    public void onCaughtFire(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @Nullable Direction face, @Nullable LivingEntity igniter) {
+        explode(world, pos, igniter, this.pRadius, this.fuseTime);
+    }
+
+    @Deprecated
+    public static void explode(Level p_57434_, BlockPos p_57435_, float pRadius, int fuseTime) {
+        explode(p_57434_, p_57435_, (LivingEntity)null, pRadius, fuseTime);
+    }
+
+    @Deprecated
+    private static void explode(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_, float pRadius, int fuseTime) {
+        if (!p_57437_.isClientSide) {
+            bedrockPrimedTNT primedtnt = new bedrockPrimedTNT(p_57437_, (double)p_57438_.getX() + (double)0.5F, (double)p_57438_.getY(), (double)p_57438_.getZ() + (double)0.5F, p_57439_, pRadius, fuseTime);
+            p_57437_.addFreshEntity(primedtnt);
+            p_57437_.playSound((Player)null, primedtnt.getX(), primedtnt.getY(), primedtnt.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0F, 1.0F);
+            p_57437_.gameEvent(p_57439_, GameEvent.PRIME_FUSE, p_57438_);
+        }
+
+    }
+
+    @Override
+    public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
+        if (!level.isClientSide) {
+            int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
+            bedrockPrimedTNT primedtnt = new bedrockPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft);
+            level.addFreshEntity(primedtnt);
+        }
+    }
+}

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

@@ -50,7 +50,7 @@ public class blackHoleTNTBlock extends TntBlock {
     @Override
     public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
         if (!level.isClientSide) {
-            blackHolePrimedTNT primedtnt = new blackHolePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, fuseTime, speed);
+            blackHolePrimedTNT primedtnt = new blackHolePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, fuseTime, speed);
             int i = primedtnt.getFuse();
             primedtnt.setFuse((short) (level.random.nextInt(i / 4) + i / 8));
             level.addFreshEntity(primedtnt);

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

@@ -1,60 +1,72 @@
 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.minecraft.world.level.material.Material;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
 import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
+import static com.jenny.enhancedexplosives.creativeTab.CREATIVE_MODE_TAB;
 
 public class blocks {
+    private static final BlockBehaviour.Properties DEFAULT_PROPS = BlockBehaviour.Properties.of(Material.EXPLOSIVE).instabreak().sound(SoundType.GRASS);
+
     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<Item> TNT_8_ITEM = ITEMS.register("tnt_8", () -> new BlockItemTooltip(TNT_8.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_16_ITEM = ITEMS.register("tnt_16", () -> new BlockItemTooltip(TNT_16.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_32_ITEM = ITEMS.register("tnt_32", () -> new BlockItemTooltip(TNT_32.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_64_ITEM = ITEMS.register("tnt_64", () -> new BlockItemTooltip(TNT_64.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_128_ITEM = ITEMS.register("tnt_128", () -> new BlockItemTooltip(TNT_128.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<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_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().tab(CREATIVE_MODE_TAB)));
 
-    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<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_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().tab(CREATIVE_MODE_TAB)));
 
-    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<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_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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_HOMING_ITEM = ITEMS.register("tnt_homing", () -> new BlockItemTooltip(TNT_HOMING.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<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_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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_CLAYMORE_ITEM = ITEMS.register("tnt_claymore", () -> new BlockItemTooltip(TNT_CLAYMORE.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_SELECTIVE_ITEM = ITEMS.register("tnt_selective", () -> new BlockItemTooltip(TNT_SELECTIVE.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
 
-    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<Item> TNT_ENDER_ITEM = ITEMS.register("tnt_ender", () -> new BlockItemTooltip(TNT_ENDER.get(), new Item.Properties()));
+    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().tab(CREATIVE_MODE_TAB)));
+
+    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().tab(CREATIVE_MODE_TAB)));
+
+    public static final RegistryObject<Block> TNT_BEDROCK = BLOCKS.register("tnt_bedrock", () -> new bedrockTNTBlock(DEFAULT_PROPS, 4.0f, 80));
+    public static final RegistryObject<Item> TNT_BEDROCK_ITEM = ITEMS.register("tnt_bedrock", () -> new BlockItemTooltip(TNT_BEDROCK.get(), new Item.Properties().tab(CREATIVE_MODE_TAB)));
+
+    public static final RegistryObject<Block> TNT_ENTITY = BLOCKS.register("tnt_entity", () -> new entityTNTBlock(DEFAULT_PROPS, 4.0f, 80));
+    public static final RegistryObject<Item> TNT_ENTITY_ITEM = ITEMS.register("tnt_entity", () -> new BlockItemTooltip(TNT_ENTITY.get(), new Item.Properties().tab(CREATIVE_MODE_TAB)));
 
 
     public static void register(IEventBus bus) {

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

@@ -52,7 +52,7 @@ public class claymoreTNTBlock extends TntBlock {
     public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
         if (!level.isClientSide) {
             int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
-            claymorePrimedTNT primedtnt = new claymorePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, ft, projectileCount);
+            claymorePrimedTNT primedtnt = new claymorePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft, projectileCount);
             level.addFreshEntity(primedtnt);
         }
     }

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

@@ -1,8 +1,7 @@
 package com.jenny.enhancedexplosives.blocks;
 
-import com.jenny.enhancedexplosives.entities.tnt.enderPrimedTNT;
 import com.jenny.enhancedexplosives.config.ConfigClient;
-
+import com.jenny.enhancedexplosives.entities.tnt.enderPrimedTNT;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
@@ -15,7 +14,6 @@ import net.minecraft.world.level.block.TntBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.levelgen.Heightmap;
-
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
@@ -83,7 +81,7 @@ public class enderTNTBlock extends TntBlock {
         if (!level.isClientSide) {
             BlockPos pos = getSpawnPos(level, blockPos);
             if (pos != null) {
-                enderPrimedTNT primedtnt = new enderPrimedTNT(level, pos.getX() + 0.5F, pos.getY(), pos.getZ() + 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, fuseTime);
+                enderPrimedTNT primedtnt = new enderPrimedTNT(level, pos.getX() + 0.5F, pos.getY(), pos.getZ() + 0.5F, pExplosion.getSourceMob(), pRadius, fuseTime);
                 int i = primedtnt.getFuse();
                 primedtnt.setFuse((short) (level.random.nextInt(i / 4) + i / 8));
                 level.addFreshEntity(primedtnt);
@@ -95,7 +93,7 @@ public class enderTNTBlock extends TntBlock {
     }
 
     public static void spawnParticles(Level level, BlockPos blockPos) {
-        if (ConfigClient.tntParticles) {
+        if (ConfigClient.tntParticles.get()) {
             for (int i = 1; i <= ConfigClient.calcPCount(30); i++) {
                 float x = blockPos.getX() + (float) level.getRandom().nextIntBetweenInclusive(-10, 10) / 10 + 0.5F;
                 float y = blockPos.getY() + (float) level.getRandom().nextIntBetweenInclusive(-10, 10) / 10;

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

@@ -0,0 +1,59 @@
+package com.jenny.enhancedexplosives.blocks;
+
+import com.jenny.enhancedexplosives.entities.tnt.EntityPrimedTNT;
+import com.jenny.enhancedexplosives.entities.tnt.bedrockPrimedTNT;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.TntBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+public class entityTNTBlock extends TntBlock {
+    public final float pRadius;
+    public final int fuseTime;
+
+    public entityTNTBlock(Properties p_57422_, float pRadius, int fuseTime) {
+        super(p_57422_);
+        this.pRadius = pRadius;
+        this.fuseTime = fuseTime;
+    }
+
+    @Override
+    public void onCaughtFire(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @Nullable Direction face, @Nullable LivingEntity igniter) {
+        explode(world, pos, igniter, this.pRadius, this.fuseTime);
+    }
+
+    @Deprecated
+    public static void explode(Level p_57434_, BlockPos p_57435_, float pRadius, int fuseTime) {
+        explode(p_57434_, p_57435_, (LivingEntity)null, pRadius, fuseTime);
+    }
+
+    @Deprecated
+    private static void explode(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_, float pRadius, int fuseTime) {
+        if (!p_57437_.isClientSide) {
+            EntityPrimedTNT primedtnt = new EntityPrimedTNT(p_57437_, (double)p_57438_.getX() + (double)0.5F, (double)p_57438_.getY(), (double)p_57438_.getZ() + (double)0.5F, p_57439_, pRadius, fuseTime);
+            p_57437_.addFreshEntity(primedtnt);
+            p_57437_.playSound((Player)null, primedtnt.getX(), primedtnt.getY(), primedtnt.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0F, 1.0F);
+            p_57437_.gameEvent(p_57439_, GameEvent.PRIME_FUSE, p_57438_);
+        }
+
+    }
+
+    @Override
+    public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
+        if (!level.isClientSide) {
+            int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
+            EntityPrimedTNT primedtnt = new EntityPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft);
+            level.addFreshEntity(primedtnt);
+        }
+    }
+}

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

@@ -51,7 +51,7 @@ public class homingTNTBlock extends TntBlock {
     @Override
     public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
         if (!level.isClientSide) {
-            homingPrimedTNT primedtnt = new homingPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, fuseTime, speed);
+            homingPrimedTNT primedtnt = new homingPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, fuseTime, speed);
             int i = primedtnt.getFuse();
             primedtnt.setFuse((short) (level.random.nextInt(i / 4) + i / 8));
             level.addFreshEntity(primedtnt);

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

@@ -0,0 +1,59 @@
+package com.jenny.enhancedexplosives.blocks;
+
+import com.jenny.enhancedexplosives.entities.tnt.repulsivePrimedTNT;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.TntBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+public class repulsiveTNTBlock extends TntBlock {
+    public final float pRadius, speed;
+    public final int fuseTime;
+
+    public repulsiveTNTBlock(Properties p_57422_, float pRadius, int fuseTime, float speed) {
+        super(p_57422_);
+        this.pRadius = pRadius;
+        this.fuseTime = fuseTime;
+        this.speed = speed;
+    }
+
+    @Override
+    public void onCaughtFire(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @Nullable Direction face, @Nullable LivingEntity igniter) {
+        explode(world, pos, igniter, this.pRadius, this.fuseTime, this.speed);
+    }
+
+    @Deprecated
+    public static void explode(Level p_57434_, BlockPos p_57435_, float pRadius, int fuseTime, float speed) {
+        explode(p_57434_, p_57435_, (LivingEntity)null, pRadius, fuseTime, speed);
+    }
+
+    @Deprecated
+    private static void explode(Level level, BlockPos blockPos, @Nullable LivingEntity entity, float pRadius, int fuseTime, float speed) {
+        if (!level.isClientSide) {
+            repulsivePrimedTNT primedtnt = new repulsivePrimedTNT(level, (double)blockPos.getX() + (double)0.5F, (double)blockPos.getY(), (double)blockPos.getZ() + (double)0.5F, entity, pRadius, fuseTime, speed);
+            level.addFreshEntity(primedtnt);
+            level.playSound((Player)null, primedtnt.getX(), primedtnt.getY(), primedtnt.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0F, 1.0F);
+            level.gameEvent(entity, GameEvent.PRIME_FUSE, blockPos);
+        }
+    }
+
+    @Override
+    public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
+        if (!level.isClientSide) {
+            repulsivePrimedTNT primedtnt = new repulsivePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, fuseTime, speed);
+            int i = primedtnt.getFuse();
+            primedtnt.setFuse((short) (level.random.nextInt(i / 4) + i / 8));
+            level.addFreshEntity(primedtnt);
+        }
+    }
+}

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

@@ -51,7 +51,7 @@ public class selectiveTNTBlock extends TntBlock {
     public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
         if (!level.isClientSide) {
             int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
-            selectivePrimedTNT primedtnt = new selectivePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, ft);
+            selectivePrimedTNT primedtnt = new selectivePrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft);
             level.addFreshEntity(primedtnt);
         }
     }

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

@@ -52,7 +52,7 @@ public class strongerTNTBlock extends TntBlock {
     public void wasExploded(Level level, @NotNull BlockPos blockPos, @NotNull Explosion pExplosion) {
         if (!level.isClientSide) {
             int ft = (short) (level.random.nextInt(fuseTime / 4) + fuseTime / 8);
-            StrongerPrimedTNT primedtnt = new StrongerPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getIndirectSourceEntity(), pRadius, ft);
+            StrongerPrimedTNT primedtnt = new StrongerPrimedTNT(level, (double) blockPos.getX() + (double) 0.5F, (double) blockPos.getY(), (double) blockPos.getZ() + (double) 0.5F, pExplosion.getSourceMob(), pRadius, ft);
             level.addFreshEntity(primedtnt);
         }
     }

src/main/java/com/jenny/enhancedexplosives/config/ConfigClient.java

@@ -1,42 +1,35 @@
 package com.jenny.enhancedexplosives.config;
 
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.config.ModConfigEvent;
 
 import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
 
 @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class ConfigClient {
     private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    public static final ForgeConfigSpec SPEC;
 
-    private static final ForgeConfigSpec.ConfigValue<Boolean> C_ARROW_PARTICLES =
-            BUILDER.comment("whether to spawn client-side particles for arrows")
-                    .define("arrowParticles", true);
+    public static final ForgeConfigSpec.ConfigValue<Boolean> arrowParticles;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> tntParticles;
+    public static final ForgeConfigSpec.ConfigValue<Double> particlePercent;
 
-    private static final ForgeConfigSpec.ConfigValue<Boolean> C_TNT_PARTICLES =
-            BUILDER.comment("weather to spawn client-side particles for tnt")
-                    .define("tntParticles", true);
+    static {
+        arrowParticles =
+                BUILDER.comment("particles from arrows arrows")
+                        .define("arrow_particles", true);
+        tntParticles =
+                BUILDER.comment("particles from tnt")
+                        .define("tnt_particles", true);
+        particlePercent =
+                BUILDER.comment("amount of spawned particles (0.0 = None, 1.0 = normal, values higher are valid too)")
+                        .define("particle_amount", 1.0D);
 
-    private static final ForgeConfigSpec.ConfigValue<Double> C_PARTICLE_PERCENT =
-            BUILDER.comment("amount of particles to spawn (0.0 = None, 1.0 = normal, values higher are valid too)")
-                    .define("arrowParticleCount", 1.0D);
+        SPEC = BUILDER.build();
 
-    public static final ForgeConfigSpec SPEC = BUILDER.build();
-
-    public static boolean arrowParticles, tntParticles;
-    public static float particlePercent;
-
-    @SubscribeEvent
-    static void onLoad(final ModConfigEvent event)
-    {
-        arrowParticles = C_ARROW_PARTICLES.get();
-        tntParticles = C_TNT_PARTICLES.get();
-        particlePercent = C_PARTICLE_PERCENT.get().floatValue();
     }
 
     public static int calcPCount(int pCount) {
-        return Math.round(pCount * particlePercent);
+        return (int) Math.round(pCount * particlePercent.get());
     }
 }

src/main/java/com/jenny/enhancedexplosives/config/ConfigServer.java

@@ -0,0 +1,30 @@
+package com.jenny.enhancedexplosives.config;
+
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.fml.common.Mod;
+
+import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
+
+@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class ConfigServer {
+    private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    public static final ForgeConfigSpec SPEC;
+
+    public static final ForgeConfigSpec.ConfigValue<Boolean> claymoreInstantDespawn;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> homingAtPlayers;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> carpetCompactDetonation;
+
+    static {
+        claymoreInstantDespawn =
+                BUILDER.comment("Claymore arrows despawn instantly upon hitting a surface")
+                        .define("claymore_instant_arrow_despawn", false);
+        homingAtPlayers =
+                BUILDER.comment("Homing TNTs are allowed to follow players")
+                        .define("homing_tnt_target_players", true);
+        carpetCompactDetonation =
+                BUILDER.comment("Carpet Arrow TNTs explode upon explosion damage; This reduces spread")
+                        .define("carpet_arrow_compact_detonation", true);
+
+        SPEC = BUILDER.build();
+    }
+}

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

@@ -1,42 +1,14 @@
 package com.jenny.enhancedexplosives;
 
 import com.jenny.enhancedexplosives.blocks.blocks;
-import com.jenny.enhancedexplosives.items.items;
-
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.RegistryObject;
-
-import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
+import net.minecraft.world.item.ItemStack;
 
 public class creativeTab {
-    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
-    public static final RegistryObject<CreativeModeTab> CREATIVE_TAB = CREATIVE_MODE_TABS.register("enhancedexplosives", () -> CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> blocks.TNT_8_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> {
-        output.accept(blocks.TNT_8.get());
-        output.accept(blocks.TNT_16.get());
-        output.accept(blocks.TNT_32.get());
-        output.accept(blocks.TNT_64.get());
-        output.accept(blocks.TNT_128.get());
-        output.accept(blocks.TNT_CLUSTER_2.get());
-        output.accept(blocks.TNT_CLUSTER_4.get());
-        output.accept(blocks.TNT_CLUSTER_8.get());
-        output.accept(blocks.TNT_HOMING.get());
-        output.accept(blocks.TNT_BLACK_HOLE.get());
-        output.accept(blocks.TNT_CLAYMORE.get());
-        output.accept(blocks.TNT_SELECTIVE.get());
-        output.accept(blocks.TNT_ENDER.get());
-        output.accept(items.TNT_ARROW.get());
-        output.accept(items.CONCUSSIVE_ARROW.get());
-        output.accept(items.CARPET_ARROW.get());
-        output.accept(items.TUNNEL_ARROW.get());
-        output.accept(items.DYNAMITE.get());
-    }).title(Component.literal("Enhanced Explosives")).build());
-
-    public static void register(IEventBus bus) {
-        CREATIVE_MODE_TABS.register(bus);
-    }
+    public static final CreativeModeTab CREATIVE_MODE_TAB = new CreativeModeTab("enhancedexplosives") {
+        @Override
+        public ItemStack makeIcon() {
+            return new ItemStack(blocks.TNT_8_ITEM.get());
+        }
+    };
 }

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

@@ -1,27 +0,0 @@
-package com.jenny.enhancedexplosives.datagen;
-
-import net.minecraft.core.HolderLookup;
-import net.minecraft.data.DataGenerator;
-import net.minecraft.data.PackOutput;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.data.event.GatherDataEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import org.jetbrains.annotations.NotNull;
-import java.util.concurrent.CompletableFuture;
-
-import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
-
-@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class DataGenerators {
-    @SubscribeEvent
-    public static void gatherData(@NotNull GatherDataEvent event) {
-        DataGenerator generator = event.getGenerator();
-        PackOutput packOutput = generator.getPackOutput();
-        ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
-        CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
-
-        generator.addProvider(event.includeClient(), new ModBlockStateProvider(packOutput, existingFileHelper));
-        generator.addProvider(event.includeClient(), new ModItemModelProvider(packOutput, existingFileHelper));
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.jenny.enhancedexplosives.datagen;
-
-import com.jenny.enhancedexplosives.blocks.blocks;
-
-import net.minecraft.data.PackOutput;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.*;
-import net.minecraftforge.client.model.generators.BlockStateProvider;
-import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-import net.minecraftforge.client.model.generators.ModelFile;
-
-import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
-
-public class ModBlockStateProvider extends BlockStateProvider {
-    public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) {
-        super(output, MODID, exFileHelper);
-    }
-
-    @Override
-    protected void registerStatesAndModels() {
-        sideTopBottom(blocks.TNT_8);
-        sideTopBottom(blocks.TNT_16);
-        sideTopBottom(blocks.TNT_32);
-        sideTopBottom(blocks.TNT_64);
-        sideTopBottom(blocks.TNT_128);
-        sideTopBottom(blocks.TNT_ENDER);
-        sideTopBottom(blocks.TNT_CLAYMORE);
-        sideTopBottom(blocks.TNT_HOMING);
-        blockWithItem(blocks.TNT_BLACK_HOLE);
-    }
-
-    private void blockWithItem(RegistryObject<Block> blockRegistryObject) {
-        simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
-    }
-
-    private void SideTop(RegistryObject<Block> blockRegistryObject) {
-        simpleBlockWithItem(blockRegistryObject.get(), topSide(blockRegistryObject.get()));
-    }
-
-    private void blockItem(RegistryObject<Block> blockRegistryObject) {
-        simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(MODID +
-                ":block/" + ForgeRegistries.BLOCKS.getKey(blockRegistryObject.get()).getPath()));
-    }
-
-    private void topBottom2Sides(RegistryObject<Block> blockRegistryObject) {
-        simpleBlockWithItem(blockRegistryObject.get(), northEastTopBottom(blockRegistryObject.get()));
-    }
-
-    private ResourceLocation key(Block block) {
-        return ForgeRegistries.BLOCKS.getKey(block);
-    }
-
-    private String name(Block block) {
-        return key(block).getPath();
-    }
-
-    private ResourceLocation extend(ResourceLocation rl, String suffix) {
-        return new ResourceLocation(rl.getNamespace(), rl.getPath() + suffix);
-    }
-
-    public void sideTopBottom(RegistryObject<Block> blockRegistryObject) {
-        Block block = blockRegistryObject.get();
-        ModelFile model = models().cubeBottomTop(name(block), extend(blockTexture(block), "_side"), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top"));
-        this.getVariantBuilder(block).forAllStates(blockState -> ConfiguredModel.builder().modelFile(model).build());
-        simpleBlockItem(block, model);
-    }
-
-    public ModelFile northEastTopBottom(Block block) {
-        return models().cube(name(block), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top"), extend(blockTexture(block), "_nw"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_nw")).texture("particle", extend(blockTexture(block), "_se"));
-    }
-
-    public ModelFile cube(Block block) {
-        return models().cube(name(block), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top"), extend(blockTexture(block), "_north"),  extend(blockTexture(block), "_south"),  extend(blockTexture(block), "_east"),  extend(blockTexture(block), "_west")).texture("particle", extend(blockTexture(block), "_north"));
-    }
-
-    public ModelFile topSide(Block block) {
-        return models().cubeColumn(name(block), extend(blockTexture(block), ""), extend(blockTexture(block), "_top"));
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.jenny.enhancedexplosives.datagen;
-
-import com.jenny.enhancedexplosives.items.items;
-
-import net.minecraft.data.PackOutput;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraftforge.client.model.generators.ItemModelBuilder;
-import net.minecraftforge.client.model.generators.ItemModelProvider;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.registries.RegistryObject;
-
-import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
-
-public class ModItemModelProvider extends ItemModelProvider {
-    public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, MODID, existingFileHelper);
-    }
-
-    @Override
-    protected void registerModels() {
-        simpleItem(items.TNT_ARROW);
-        simpleItem(items.CONCUSSIVE_ARROW);
-        simpleItem(items.CARPET_ARROW);
-        simpleItem(items.TUNNEL_ARROW);
-    }
-
-    private ItemModelBuilder simpleItem(RegistryObject<Item> item) {
-        return withExistingParent(item.getId().getPath(),
-                new ResourceLocation("item/generated")).texture("layer0",
-                new ResourceLocation(MODID,"item/" + item.getId().getPath()));
-    }
-}

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

@@ -1,240 +1,62 @@
 package com.jenny.enhancedexplosives.entities.arrows;
 
-import com.google.common.collect.Sets;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.network.syncher.EntityDataSerializers;
-import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.Entity;
+import com.jenny.enhancedexplosives.config.ConfigClient;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.entity.projectile.Arrow;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.alchemy.Potion;
-import net.minecraft.world.item.alchemy.PotionUtils;
-import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.Set;
-
 public class baseArrow extends AbstractArrow {
-    private static final int EXPOSED_POTION_DECAY_TIME = 600;
-    private static final int NO_EFFECT_COLOR = -1;
-    private static final EntityDataAccessor<Integer> ID_EFFECT_COLOR = SynchedEntityData.defineId(Arrow.class, EntityDataSerializers.INT);
-    private static final byte EVENT_POTION_PUFF = 0;
-    private Potion potion = Potions.EMPTY;
-    private final Set<MobEffectInstance> effects = Sets.newHashSet();
-    private boolean fixedColor;
     private int tick = 0;
 
     public baseArrow(EntityType<? extends baseArrow> pEntityType, Level pLevel) {
         super(pEntityType, pLevel);
     }
 
-    public baseArrow(Level pLevel, double pX, double pY, double pZ, EntityType<? extends baseArrow> pEntityType) {
-        super(pEntityType, pX, pY, pZ, pLevel);
-    }
-
     public baseArrow(Level pLevel, LivingEntity pShooter, EntityType<? extends baseArrow> pEntityType) {
         super(pEntityType, pShooter, pLevel);
     }
 
-    public void setEffectsFromItem(ItemStack pStack) {
-        if (pStack.is(Items.TIPPED_ARROW)) {
-            this.potion = PotionUtils.getPotion(pStack);
-            Collection<MobEffectInstance> collection = PotionUtils.getCustomEffects(pStack);
-            if (!collection.isEmpty()) {
-                for(MobEffectInstance mobeffectinstance : collection) {
-                    this.effects.add(new MobEffectInstance(mobeffectinstance));
-                }
-            }
-
-            int i = getCustomColor(pStack);
-            if (i == -1) {
-                this.updateColor();
-            } else {
-                this.setFixedColor(i);
-            }
-        } else if (pStack.is(Items.ARROW)) {
-            this.potion = Potions.EMPTY;
-            this.effects.clear();
-            this.entityData.set(ID_EFFECT_COLOR, -1);
-        }
-
-    }
-
-    public static int getCustomColor(ItemStack pStack) {
-        CompoundTag compoundtag = pStack.getTag();
-        return compoundtag != null && compoundtag.contains("CustomPotionColor", 99) ? compoundtag.getInt("CustomPotionColor") : -1;
-    }
-
-    private void updateColor() {
-        this.fixedColor = false;
-        if (this.potion == Potions.EMPTY && this.effects.isEmpty()) {
-            this.entityData.set(ID_EFFECT_COLOR, -1);
-        } else {
-            this.entityData.set(ID_EFFECT_COLOR, PotionUtils.getColor(PotionUtils.getAllEffects(this.potion, this.effects)));
-        }
-
-    }
-
-    public void addEffect(MobEffectInstance pEffectInstance) {
-        this.effects.add(pEffectInstance);
-        this.getEntityData().set(ID_EFFECT_COLOR, PotionUtils.getColor(PotionUtils.getAllEffects(this.potion, this.effects)));
-    }
-
-    protected void defineSynchedData() {
-        super.defineSynchedData();
-        this.entityData.define(ID_EFFECT_COLOR, -1);
+    public baseArrow(Level pLevel, EntityType<? extends baseArrow> pEntityType) {
+        super(pEntityType, pLevel);
     }
 
     public void tick() {
         super.tick();
         if (this.level().isClientSide) {
-            if (this.inGround) {
-                if (this.inGroundTime % 5 == 0) {
-                    this.makeParticle(1);
-                }
-            } else {
+            if (!this.inGround && ConfigClient.arrowParticles.get()) {
                 spawnParticles(0);
             }
             this.tick++;
-        } else if (this.inGround && this.inGroundTime != 0 && !this.effects.isEmpty() && this.inGroundTime >= 600) {
-            this.level().broadcastEntityEvent(this, (byte)0);
-            this.potion = Potions.EMPTY;
-            this.effects.clear();
-            this.entityData.set(ID_EFFECT_COLOR, -1);
         }
     }
 
-    private void makeParticle(int pParticleAmount) {
-        int i = this.getColor();
-        if (i != -1 && pParticleAmount > 0) {
-            double d0 = (double)(i >> 16 & 255) / 255.0D;
-            double d1 = (double)(i >> 8 & 255) / 255.0D;
-            double d2 = (double)(i >> 0 & 255) / 255.0D;
-
-            for(int j = 0; j < pParticleAmount; ++j) {
-                this.level().addParticle(ParticleTypes.ENTITY_EFFECT, this.getRandomX(0.5D), this.getRandomY(), this.getRandomZ(0.5D), d0, d1, d2);
-            }
-
-        }
-    }
-
-    public int getColor() {
-        return this.entityData.get(ID_EFFECT_COLOR);
-    }
-
-    private void setFixedColor(int pFixedColor) {
-        this.fixedColor = true;
-        this.entityData.set(ID_EFFECT_COLOR, pFixedColor);
-    }
-
-    public void addAdditionalSaveData(@NotNull CompoundTag pCompound) {
-        super.addAdditionalSaveData(pCompound);
-        if (this.potion != Potions.EMPTY) {
-            pCompound.putString("Potion", BuiltInRegistries.POTION.getKey(this.potion).toString());
-        }
-
-        if (this.fixedColor) {
-            pCompound.putInt("Color", this.getColor());
-        }
-
-        if (!this.effects.isEmpty()) {
-            ListTag listtag = new ListTag();
-
-            for(MobEffectInstance mobeffectinstance : this.effects) {
-                listtag.add(mobeffectinstance.save(new CompoundTag()));
-            }
-
-            pCompound.put("CustomPotionEffects", listtag);
-        }
-
-    }
-
-    public void readAdditionalSaveData(@NotNull CompoundTag pCompound) {
-        super.readAdditionalSaveData(pCompound);
-        if (pCompound.contains("Potion", 8)) {
-            this.potion = PotionUtils.getPotion(pCompound);
-        }
-
-        for(MobEffectInstance mobeffectinstance : PotionUtils.getCustomEffects(pCompound)) {
-            this.addEffect(mobeffectinstance);
-        }
-
-        if (pCompound.contains("Color", 99)) {
-            this.setFixedColor(pCompound.getInt("Color"));
-        } else {
-            this.updateColor();
-        }
-
-    }
-
-    protected void doPostHurtEffects(@NotNull LivingEntity pLiving) {
-        super.doPostHurtEffects(pLiving);
-        Entity entity = this.getEffectSource();
-
-        for(MobEffectInstance mobeffectinstance : this.potion.getEffects()) {
-            pLiving.addEffect(new MobEffectInstance(mobeffectinstance.getEffect(), Math.max(mobeffectinstance.mapDuration((p_268168_) -> {
-                return p_268168_ / 8;
-            }), 1), mobeffectinstance.getAmplifier(), mobeffectinstance.isAmbient(), mobeffectinstance.isVisible()), entity);
-        }
-
-        if (!this.effects.isEmpty()) {
-            for(MobEffectInstance mobeffectinstance1 : this.effects) {
-                pLiving.addEffect(mobeffectinstance1, entity);
-            }
-        }
-
-    }
-
     @NotNull
     protected ItemStack getPickupItem() {
-        if (this.effects.isEmpty() && this.potion == Potions.EMPTY) {
-            return new ItemStack(Items.ARROW);
-        } else {
-            ItemStack itemstack = new ItemStack(Items.TIPPED_ARROW);
-            PotionUtils.setPotion(itemstack, this.potion);
-            PotionUtils.setCustomEffects(itemstack, this.effects);
-            if (this.fixedColor) {
-                itemstack.getOrCreateTag().putInt("CustomPotionColor", this.getColor());
-            }
-
-            return itemstack;
-        }
+        return new ItemStack(Items.ARROW);
     }
 
-    public void handleEntityEvent(byte pId) {
-        if (pId == 0) {
-            int i = this.getColor();
-            if (i != -1) {
-                double d0 = (double)(i >> 16 & 255) / 255.0D;
-                double d1 = (double)(i >> 8 & 255) / 255.0D;
-                double d2 = (double)(i >> 0 & 255) / 255.0D;
-
-                for(int j = 0; j < 20; ++j) {
-                    this.level().addParticle(ParticleTypes.ENTITY_EFFECT, this.getRandomX(0.5D), this.getRandomY(), this.getRandomZ(0.5D), d0, d1, d2);
-                }
-            }
-        } else {
-            super.handleEntityEvent(pId);
-        }
-
+    protected Vec3 particlePos(double dist) {
+        Double speed = getDeltaMovement().length();
+        return new Vec3(
+                level().getRandom().nextIntBetweenInclusive(-100, 100),
+                level().getRandom().nextIntBetweenInclusive(-100, 100),
+                level().getRandom().nextIntBetweenInclusive(-100, 100)
+        ).normalize().scale(dist + ((double) level().getRandom().nextIntBetweenInclusive(0, 100) / 100)).add(position());
     }
 
     public void spawnParticles(float partialTicks) {
-
     }
 
     public int getTick() {
         return this.tick;
     }
+
+    public Level level() {
+        return level;
+    }
 }

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

@@ -35,7 +35,7 @@ public class carpetArrow extends baseArrow {
     protected void spawnChildren(int count) {
         RandomSource rng = level().getRandom();
         for (int i = 0; i < count; i++) {
-            carpetArrowPart arrow = new carpetArrowPart(entities.ARROW_CARPT_PART.get(), level());
+            carpetArrowPart arrow = new carpetArrowPart(entities.ARROW_CARPET_PART.get(), level());
             double r = (double) rng.nextIntBetweenInclusive(-100, 100) / 200;
             Vec3 move = new Vec3(
                     (double) rng.nextIntBetweenInclusive(-100, 100) / 100,
@@ -54,14 +54,10 @@ public class carpetArrow extends baseArrow {
 
     @Override
     public void spawnParticles(float partialTicks) {
-        for (int i = 1; i <= ConfigClient.calcPCount(3); i++) {
+        for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {
             double m = (double) level().getRandom().nextIntBetweenInclusive(-100, 100) / 100;
             Vec3 DeltaMovement = getDeltaMovement();
-            Vec3 pos = new Vec3(
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10,
-                    0,
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10
-            ).normalize().multiply(m, 0, m).add(getPosition(partialTicks));
+            Vec3 pos = particlePos(0.5);
             level().addParticle(particles.CARPET_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z);
         }
     }

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

@@ -1,12 +1,14 @@
 package com.jenny.enhancedexplosives.entities.arrows;
 
 import com.jenny.enhancedexplosives.config.ConfigClient;
+import com.jenny.enhancedexplosives.config.ConfigServer;
 import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.items.items;
 import com.jenny.enhancedexplosives.particles.particles;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -17,22 +19,27 @@ public class carpetArrowPart extends baseArrow {
     }
 
     public carpetArrowPart(Level pLevel, LivingEntity pShooter) {
-        super(pLevel, pShooter, entities.ARROW_CARPT_PART.get());
+        super(pLevel, entities.ARROW_CARPET_PART.get());
     }
 
     @Override
     public void tick() {
         super.tick();
-        if (this.inGround) {
-            this.level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE);
-            this.discard();
+        if (this.inGround || (this.hurtMarked && !this.level().isClientSide && ConfigServer.carpetCompactDetonation.get())) {
+            explode();
         }
     }
 
     @Override
     protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
-        this.level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE);
-        this.discard();
+        explode();
+    }
+
+    public void explode() {
+        if (!level().isClientSide) {
+            level().explode(this, getX(), getY(), getZ(), 8.0f, Explosion.BlockInteraction.BREAK);
+        }
+        discard();
     }
 
     @NotNull

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

@@ -1,26 +1,42 @@
 package com.jenny.enhancedexplosives.entities.arrows;
 
+import com.jenny.enhancedexplosives.config.ConfigServer;
 import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.items.items;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-
 import org.jetbrains.annotations.NotNull;
 
 public class claymoreArrow extends baseArrow{
+    private final int r = level().isClientSide ? 0 : (ConfigServer.claymoreInstantDespawn.get() ? -20 : level().getRandom().nextInt(0, 20));
+    
     public claymoreArrow(EntityType<claymoreArrow> pEntityType, Level pLevel) {
         super(pEntityType, pLevel);
+
     }
 
-    public claymoreArrow(@NotNull  Level pLevel, @NotNull LivingEntity pShooter) {
+    public claymoreArrow(@NotNull Level pLevel) {
+        super(entities.ARROW_CLAYMORE.get(), pLevel);
+    }
+
+    public claymoreArrow(@NotNull Level pLevel, @NotNull LivingEntity pShooter) {
         super(pLevel, pShooter, entities.ARROW_CLAYMORE.get());
     }
 
     @Override
     protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
-        pTarget.hurt(damageSources().mobProjectile(this, (LivingEntity) getOwner()), 15);
+        pTarget.hurt(DamageSource.arrow(this, getOwner()), 15);
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+        if (!level().isClientSide && this.inGroundTime > 20 + r) {
+            discard();
+        }
     }
 
     @Override

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

@@ -1,13 +1,13 @@
 package com.jenny.enhancedexplosives.entities.arrows;
 
+import com.jenny.enhancedexplosives.config.ConfigClient;
 import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.items.items;
-import com.jenny.enhancedexplosives.config.ConfigClient;
 import com.jenny.enhancedexplosives.particles.particles;
-
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -25,14 +25,14 @@ public class concussiveArrow extends baseArrow{
     public void tick() {
         super.tick();
         if (this.inGround) {
-            this.level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE);
+            this.level().explode(this, getX(), getY(), getZ(), 8.0f, Explosion.BlockInteraction.NONE);
             this.discard();
         }
     }
 
     @Override
     protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
-        this.level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE);
+        this.level().explode(this, getX(), getY(), getZ(), 8.0f, Explosion.BlockInteraction.NONE);
         this.discard();
     }
 
@@ -43,15 +43,10 @@ public class concussiveArrow extends baseArrow{
 
     @Override
     public void spawnParticles(float partialTicks) {
-        for (int i = 1; i <= ConfigClient.calcPCount(3); i++) {
-            double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100;
-            Vec3 DeltaMovement = getDeltaMovement();
-            Vec3 pos = new Vec3(
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10,
-                    0,
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10
-            ).normalize().multiply(m, m, m).add(getPosition(partialTicks));
-            level().addParticle(particles.CONCUSSIVE_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z);
+        for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {
+            Vec3 delta = getDeltaMovement();
+            Vec3 pos = particlePos(0.5);
+            level().addParticle(particles.CONCUSSIVE_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, delta.x, delta.y, delta.z);
         }
     }
 }

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

@@ -1,13 +1,13 @@
 package com.jenny.enhancedexplosives.entities.arrows;
 
 import com.jenny.enhancedexplosives.config.ConfigClient;
-import com.jenny.enhancedexplosives.items.items;
 import com.jenny.enhancedexplosives.entities.entities;
-
+import com.jenny.enhancedexplosives.items.items;
 import com.jenny.enhancedexplosives.particles.particles;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -25,14 +25,14 @@ public class tntArrow extends baseArrow {
     public void tick() {
         super.tick();
         if (this.inGround) {
-            this.level().explode(this, this.getX(), this.getY(), this.getZ(), 2, Level.ExplosionInteraction.TNT);
+            this.level().explode(this, this.getX(), this.getY(), this.getZ(), 2, Explosion.BlockInteraction.BREAK);
             this.discard();
         }
     }
 
     @Override
     protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
-        this.level().explode(this, this.getX(), this.getY(), this.getZ(), 2, Level.ExplosionInteraction.TNT);
+        this.level().explode(this, this.getX(), this.getY(), this.getZ(), 2, Explosion.BlockInteraction.BREAK);
         this.discard();
     }
 
@@ -43,14 +43,9 @@ public class tntArrow extends baseArrow {
 
     @Override
     public void spawnParticles(float partialTicks) {
-        for (int i = 1; i <= ConfigClient.calcPCount(3); i++) {
-            double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100;
+        for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {
             Vec3 DeltaMovement = getDeltaMovement();
-            Vec3 pos = new Vec3(
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10,
-                    0,
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10
-            ).normalize().multiply(m, m, m).add(getPosition(partialTicks));
+            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/arrows/tunnelArrow.java

@@ -6,13 +6,15 @@ import com.jenny.enhancedexplosives.particles.particles;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
 public class tunnelArrow extends baseArrow{
-    public static int explosionCount = 16;
-    public static int spacing = 2;
+    protected static final int explosionCount = 12;
+    protected static final int spacing = 2;
+    protected static final float power = 8;
 
     public tunnelArrow(EntityType<tunnelArrow> pEntityType, Level pLevel) {
         super(pEntityType, pLevel);
@@ -26,22 +28,27 @@ public class tunnelArrow extends baseArrow{
     public void tick() {
         super.tick();
         if (inGround) {
-            explode();
+            if (!level().isClientSide) {
+                explode();
+            }
             discard();
         }
     }
 
     @Override
     protected void doPostHurtEffects(@NotNull LivingEntity pTarget) {
-        explode();
-        this.discard();
+        if (!level().isClientSide) {
+            explode();
+        }
+        discard();
     }
 
     protected void explode() {
         Vec3 rot = getTargetVec( - getXRot(), - getYRot(), 0);
         for (int i = 0; i < explosionCount; i++) {
             Vec3 pos = position().add(rot.multiply(i * spacing, i * spacing, i * spacing));
-            this.level().explode(this, pos.x, pos.y, pos.z, 8.0f, Level.ExplosionInteraction.TNT);
+            level().explode(this, pos.x, pos.y, pos.z,
+                    power, Explosion.BlockInteraction.BREAK);
         }
     }
 
@@ -54,14 +61,10 @@ public class tunnelArrow extends baseArrow{
 
     @Override
     public void spawnParticles(float partialTicks) {
-        for (int i = 1; i <= ConfigClient.calcPCount(3); i++) {
+        for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {
             double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100;
             Vec3 DeltaMovement = getDeltaMovement();
-            Vec3 pos = new Vec3(
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10,
-                    0,
-                    (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10
-            ).normalize().multiply(m, m, m).add(getPosition(partialTicks));
+            Vec3 pos = particlePos(0.5);
             level().addParticle(particles.TUNNEL_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z);
         }
     }

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

@@ -1,9 +1,8 @@
 package com.jenny.enhancedexplosives.entities.client;
 
-import com.jenny.enhancedexplosives.config.ConfigClient;
 import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
+import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -35,9 +34,9 @@ public class BaseTNTRenderer<T extends basePrimedTNT> extends EntityRenderer<T>
             float f1 = 1.0F + f * 0.3F;
             pPoseStack.scale(f1, f1, f1);
         }
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(-90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(-90.0F));
         pPoseStack.translate(-0.5F, -0.5F, 0.5F);
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(90.0F));
         TntMinecartRenderer.renderWhiteSolidBlock(this.blockRenderer, pEntity.renderBlock().defaultBlockState(), pPoseStack, pBuffer, pPackedLight, i / 5 % 2 == 0);
         pPoseStack.popPose();
         super.render(pEntity, pEntityYaw, pPartialTicks, pPoseStack, pBuffer, pPackedLight);

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

@@ -0,0 +1,51 @@
+package com.jenny.enhancedexplosives.entities.client;
+
+import com.jenny.enhancedexplosives.entities.tnt.selectivePrimedTNT;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Vector3f;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.block.BlockRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.TntMinecartRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlas;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.block.Block;
+import org.jetbrains.annotations.NotNull;
+
+public class SelectiveTNTRenderer<T extends selectivePrimedTNT> extends EntityRenderer<T> {
+    private final BlockRenderDispatcher blockRenderer;
+
+    public SelectiveTNTRenderer(EntityRendererProvider.Context pContext) {
+        super(pContext);
+        this.shadowRadius = 0.5F;
+        this.blockRenderer = pContext.getBlockRenderDispatcher();
+    }
+
+    public void render(T pEntity, float pEntityYaw, float pPartialTicks, PoseStack pPoseStack, @NotNull MultiBufferSource pBuffer, int pPackedLight) {
+        pPoseStack.pushPose();
+        pPoseStack.translate(0.0F, 0.5F, 0.0F);
+        int i = pEntity.getFuse();
+        if ((float)i - pPartialTicks + 1.0F < 10.0F) {
+            float f = 1.0F - ((float)i - pPartialTicks + 1.0F) / 10.0F;
+            f = Mth.clamp(f, 0.0F, 1.0F);
+            f *= f;
+            f *= f;
+            float f1 = 1.0F + f * 0.3F;
+            pPoseStack.scale(f1, f1, f1);
+        }
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(-90.0F));
+        pPoseStack.translate(-0.5F, -0.5F, 0.5F);
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(90.0F));
+        Block block = (i / 5 % 2 == 0) ? pEntity.renderBlockBeneath(): pEntity.renderBlock();
+        TntMinecartRenderer.renderWhiteSolidBlock(this.blockRenderer, block.defaultBlockState(), pPoseStack, pBuffer, pPackedLight, false);
+        pPoseStack.popPose();
+        super.render(pEntity, pEntityYaw, pPartialTicks, pPoseStack, pBuffer, pPackedLight);
+    }
+
+    @NotNull
+    public ResourceLocation getTextureLocation(@NotNull T pEntity) {
+        return TextureAtlas.LOCATION_BLOCKS;
+    }
+}

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

@@ -1,10 +1,8 @@
 package com.jenny.enhancedexplosives.entities.client;
 
 import com.jenny.enhancedexplosives.entities.arrows.baseArrow;
-import com.jenny.enhancedexplosives.config.*;
-
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
+import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -13,7 +11,6 @@ import net.minecraft.client.renderer.entity.TntMinecartRenderer;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Blocks;
-
 import org.jetbrains.annotations.NotNull;
 
 public class TNTArrowRenderer extends EntityRenderer<baseArrow> {
@@ -31,9 +28,9 @@ public class TNTArrowRenderer extends EntityRenderer<baseArrow> {
         pPoseStack.translate(0.0F, 0.5F, 0.0F);
         pPoseStack.scale(0.5f, 0.5f, 0.5f);
         int i = pEntity.getTick();
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(-90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(-90.0F));
         pPoseStack.translate(-0.5F, -0.5F, 0.5F);
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(90.0F));
         TntMinecartRenderer.renderWhiteSolidBlock(this.blockRenderer, Blocks.TNT.defaultBlockState(), pPoseStack, pBuffer, pPackedLight, i / 5 % 2 == 0);
         pPoseStack.popPose();
         super.render(pEntity, pEntityYaw, pPartialTicks, pPoseStack, pBuffer, pPackedLight);

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

@@ -4,7 +4,6 @@ import net.minecraft.client.renderer.entity.ArrowRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.projectile.AbstractArrow;
-
 import org.jetbrains.annotations.NotNull;
 
 import static net.minecraft.client.renderer.entity.TippableArrowRenderer.NORMAL_ARROW_LOCATION;

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

@@ -2,7 +2,7 @@ package com.jenny.enhancedexplosives.entities.client;
 
 import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
+import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -38,9 +38,9 @@ public class clusterTNTRenderer extends EntityRenderer<basePrimedTNT> {
             pPoseStack.scale(0.5f, 0.5f, 0.5f);
         }
 
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(-90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(-90.0F));
         pPoseStack.translate(-0.5F, -1.0F, 0.5F);
-        pPoseStack.mulPose(Axis.YP.rotationDegrees(90.0F));
+        pPoseStack.mulPose(Vector3f.YP.rotationDegrees(90.0F));
         TntMinecartRenderer.renderWhiteSolidBlock(this.blockRenderer, pEntity.renderBlock().defaultBlockState(), pPoseStack, pBuffer, pPackedLight, i / 5 % 2 == 0);
         pPoseStack.popPose();
         super.render(pEntity, pEntityYaw, pPartialTicks, pPoseStack, pBuffer, pPackedLight);

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,31 +20,44 @@ 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"));
+                    .fireImmune().sized(0.48F, 0.48F).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)
+                    .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_repulsive"));
+
+    public static final RegistryObject<EntityType<bedrockPrimedTNT>> TNT_BEDROCK =
+            ENTITY_TYPES.register("tnt_bedrock", () -> EntityType.Builder.<bedrockPrimedTNT>of(bedrockPrimedTNT::new, MobCategory.MISC)
+                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_bedrock"));
+
+    public static final RegistryObject<EntityType<EntityPrimedTNT>> TNT_ENTITY =
+            ENTITY_TYPES.register("tnt_entity", () -> EntityType.Builder.<EntityPrimedTNT>of(EntityPrimedTNT::new, MobCategory.MISC)
+                    .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_entity"));
+
 
     public static final RegistryObject<EntityType<tntArrow>> ARROW_TNT =
             ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.<tntArrow>of(tntArrow::new, MobCategory.MISC)
@@ -63,7 +75,7 @@ public class entities {
             ENTITY_TYPES.register("arrow_claymore", () -> EntityType.Builder.<claymoreArrow>of(claymoreArrow::new, MobCategory.MISC)
                     .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_claymore"));
 
-    public static final RegistryObject<EntityType<carpetArrowPart>> ARROW_CARPT_PART =
+    public static final RegistryObject<EntityType<carpetArrowPart>> ARROW_CARPET_PART =
             ENTITY_TYPES.register("arrow_carpet_part", () -> EntityType.Builder.<carpetArrowPart>of(carpetArrowPart::new, MobCategory.MISC)
                     .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_carpet_part"));
 
@@ -84,8 +96,12 @@ public class entities {
         EntityRenderers.register(TNT_HOMING.get(), BaseTNTRenderer::new);
         EntityRenderers.register(TNT_BLACK_HOLE.get(), BaseTNTRenderer::new);
         EntityRenderers.register(TNT_CLAYMORE.get(), BaseTNTRenderer::new);
-        EntityRenderers.register(TNT_SELECTIVE.get(), BaseTNTRenderer::new);
         EntityRenderers.register(TNT_ENDER.get(), BaseTNTRenderer::new);
+        EntityRenderers.register(TNT_REPULSIVE.get(), BaseTNTRenderer::new);
+        EntityRenderers.register(TNT_BEDROCK.get(), BaseTNTRenderer::new);
+        EntityRenderers.register(TNT_ENTITY.get(), BaseTNTRenderer::new);
+
+        EntityRenderers.register(TNT_SELECTIVE.get(), SelectiveTNTRenderer::new);
 
         EntityRenderers.register(TNT_CLUSTER.get(), clusterTNTRenderer::new);
         EntityRenderers.register(DYNAMITE.get(), clusterTNTRenderer::new);
@@ -93,8 +109,9 @@ public class entities {
         EntityRenderers.register(ARROW_TNT.get(), TNTArrowRenderer::new);
         EntityRenderers.register(ARROW_CONCUSSIVE.get(), TNTArrowRenderer::new);
         EntityRenderers.register(ARROW_CARPET.get(), TNTArrowRenderer::new);
-        EntityRenderers.register(ARROW_CARPT_PART.get(), TNTArrowRenderer::new);
+        EntityRenderers.register(ARROW_CARPET_PART.get(), TNTArrowRenderer::new);
         EntityRenderers.register(ARROW_TUNNEL.get(), TNTArrowRenderer::new);
+
         EntityRenderers.register(ARROW_CLAYMORE.get(), baseArrowRenderer::new);
     }
 }

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

@@ -2,7 +2,6 @@ package com.jenny.enhancedexplosives.entities.throwable;
 
 import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT;
-import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
@@ -21,7 +20,7 @@ public class dynamite extends basePrimedTNT {
     }
 
     public dynamite(EntityType<dynamite> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     @Override
@@ -32,7 +31,7 @@ public class dynamite extends basePrimedTNT {
         Vec3 beforeMove = getDeltaMovement();
         this.move(MoverType.SELF, this.getDeltaMovement());
         this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
-        if (this.onGround()) {
+        if (this.onGround) {
             this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, 0, 0.7D).add(0, (-beforeMove.y) * 0.5, 0));
         }
 
@@ -46,7 +45,7 @@ public class dynamite extends basePrimedTNT {
         } else {
             this.updateInWaterStateAndDoFluidPushing();
             if (this.level().isClientSide) {
-                this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
+                spawnParticles();
             }
         }
     }
@@ -58,7 +57,7 @@ public class dynamite extends basePrimedTNT {
         Vec3 vec = new Vec3(f, f1, f2).multiply(pVelocity, pVelocity, pVelocity);
         this.setDeltaMovement(vec);
         Vec3 vec3 = pShooter.getDeltaMovement();
-        this.setDeltaMovement(this.getDeltaMovement().add(vec3.x, pShooter.onGround() ? 0.0D : vec3.y, vec3.z));
+        this.setDeltaMovement(this.getDeltaMovement().add(vec3.x, pShooter.isOnGround() ? 0.0D : vec3.y, vec3.z));
     }
 
     public Block renderBlock() {

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

@@ -1,7 +1,7 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
-import com.jenny.enhancedexplosives.blocks.blocks;
 import com.jenny.enhancedexplosives.entities.entities;
+import com.jenny.enhancedexplosives.util;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
@@ -15,11 +15,11 @@ public class ClusterPrimedTNT extends basePrimedTNT {
 
     public ClusterPrimedTNT (Level pLevel, double pX, double pY, double pZ, @Nullable LivingEntity pOwner, float power, int fuse, Vec3 move) {
         super(entities.TNT_CLUSTER.get(), pLevel, pOwner, new Vec3(pX, pY, pZ), fuse, power);
-        this.addDeltaMovement(move);
+        util.addDeltaMovement(this, move);
     }
 
     public ClusterPrimedTNT(EntityType<ClusterPrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     @Override

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

@@ -0,0 +1,54 @@
+package com.jenny.enhancedexplosives.entities.tnt;
+
+import com.jenny.enhancedexplosives.blocks.blocks;
+import com.jenny.enhancedexplosives.entities.entities;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+import java.util.Objects;
+
+public class EntityPrimedTNT extends basePrimedTNT {
+    static class noEntityExplosionCalculator extends ExplosionDamageCalculator {
+        public boolean shouldBlockExplode(@NotNull Explosion pExplosion, @NotNull BlockGetter pReader, @NotNull BlockPos pPos, @NotNull BlockState pState, float pPower) {
+            return false;
+        }
+    }
+
+    public EntityPrimedTNT(Level pLevel, double pX, double pY, double pZ, @Nullable LivingEntity pOwner, float power, int fuse) {
+        super(entities.TNT_ENTITY.get(), pLevel, pOwner, new Vec3(pX, pY, pZ), fuse, power);
+    }
+
+    public EntityPrimedTNT(EntityType<EntityPrimedTNT> entityType, Level level) {
+        super(entityType, level);
+    }
+    @Override
+    protected void explode() {
+        noEntityExplosionCalculator dmgCalc = new noEntityExplosionCalculator();
+        this.level().explode(this, DamageSource.explosion(getOwner()), dmgCalc, getX(), getY(), getZ(), getPower(), false, Explosion.BlockInteraction.BREAK);
+    }
+
+    public BlockPos getBlockBelow() {
+        return new BlockPos((int) Math.floor(getX()), (int) Math.floor(getY()) - 1, (int) Math.floor(getZ()));
+    }
+
+    public String getBlock() {
+        return level().getBlockState(getBlockBelow()).getBlock().toString();
+    }
+
+    @Override
+    public Block renderBlock() {
+        return blocks.TNT_ENTITY.get();
+    }
+}

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

@@ -17,7 +17,7 @@ public class StrongerPrimedTNT extends basePrimedTNT {
     }
 
     public StrongerPrimedTNT(EntityType<StrongerPrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     @Override

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

@@ -1,11 +1,15 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
+import com.jenny.enhancedexplosives.config.ConfigClient;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.*;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -14,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 
-public abstract class basePrimedTNT extends Entity implements TraceableEntity {
+public abstract class basePrimedTNT extends Entity {
     private static final EntityDataAccessor<Integer> DATA_FUSE_ID = SynchedEntityData.defineId(basePrimedTNT.class, EntityDataSerializers.INT);
     private static final EntityDataAccessor<Float> DATA_POWER_ID = SynchedEntityData.defineId(basePrimedTNT.class, EntityDataSerializers.FLOAT);
 
@@ -22,30 +26,26 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
     private LivingEntity owner;
     private int fuse = 0;
 
-    public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, Level pLevel, @Nullable LivingEntity owner) {
+    public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel) {
         super(pEntityType, pLevel);
-        commonInit(pLevel, owner);
-        this.fuse = getFuse();
-    }
-
-    private void commonInit(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.owner = owner;
     }
 
-    public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, Level pLevel, @Nullable LivingEntity owner, Vec3 pos, int fuse, float power) {
-        super(pEntityType, pLevel);
-        commonInit(pLevel, owner);
+    public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel, @Nullable LivingEntity owner, Vec3 pos, int fuse, float power) {
+        this(pEntityType, pLevel);
         setPos(pos);
+        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.setOwner(owner);
+        this.xo = pos.x;
+        this.yo = pos.y;
+        this.zo = pos.z;
         setFuse(fuse);
         setPower(power);
-        this.fuse = getFuse();
     }
 
     protected void explode() {
-        this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), this.getPower(), Level.ExplosionInteraction.TNT);
+        this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), this.getPower(), Explosion.BlockInteraction.BREAK);
     }
 
     public int getFuse() {
@@ -65,8 +65,17 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
     }
 
     public void tick() {
+        if (!level().isClientSide) {
+            System.out.println("Server: " + tickCount + "|x=" + (getX() - 0.5F) + "|y=" + getY() + "|z=" + (getZ() - 0.5F));
+        } else {
+            System.out.println("Client: " + tickCount + "|x=" + (getX() - 0.5F) + "|y=" + getY() + "|z=" + (getZ() - 0.5F));
+        }
+
+
         if (level().isClientSide) {
-            spawnParticles(0);
+            if (ConfigClient.tntParticles.get()) {
+                spawnParticles();
+            }
         }
         if (!this.isNoGravity()) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D));
@@ -74,7 +83,7 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
 
         this.move(MoverType.SELF, this.getDeltaMovement());
         this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
-        if (this.onGround()) {
+        if (this.onGround) {
             this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
         }
 
@@ -87,9 +96,6 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
             }
         } else {
             this.updateInWaterStateAndDoFluidPushing();
-            if (this.level().isClientSide) {
-                this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
-            }
         }
     }
 
@@ -138,5 +144,15 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
         return this.fuse;
     }
 
-    public void spawnParticles(float partialTicks) {}
+    public void spawnParticles() {
+        level().addParticle(ParticleTypes.SMOKE, getX(), getY(), getZ(), 0, 0, 0);
+    }
+
+    public Level level() {
+        return level;
+    }
+
+    public Packet<?> getAddEntityPacket() {
+        return new ClientboundAddEntityPacket(this);
+    }
 }

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

@@ -0,0 +1,62 @@
+package com.jenny.enhancedexplosives.entities.tnt;
+
+import com.jenny.enhancedexplosives.blocks.blocks;
+import com.jenny.enhancedexplosives.entities.entities;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+import java.util.Objects;
+
+public class bedrockPrimedTNT extends basePrimedTNT {
+    static class noExplosionCalculator extends ExplosionDamageCalculator {
+        public boolean shouldBlockExplode(@NotNull Explosion pExplosion, @NotNull BlockGetter pReader, @NotNull BlockPos pPos, @NotNull BlockState pState, float pPower) {
+            return false;
+        }
+    }
+
+    public bedrockPrimedTNT(Level pLevel, double pX, double pY, double pZ, @Nullable LivingEntity pOwner, float power, int fuse) {
+        super(entities.TNT_BEDROCK.get(), pLevel, pOwner, new Vec3(pX, pY, pZ), fuse, power);
+    }
+
+    public bedrockPrimedTNT(EntityType<bedrockPrimedTNT> entityType, Level level) {
+        super(entityType, level);
+    }
+    @Override
+    protected void explode() {
+        noExplosionCalculator dmgCalc = new noExplosionCalculator();
+        this.level().explode(this, DamageSource.explosion(getOwner()), dmgCalc, getX(), getY(), getZ(), getPower(), false, Explosion.BlockInteraction.BREAK);
+        explodeBelow();
+    }
+
+    public BlockPos getBlockBelow() {
+        return new BlockPos((int) Math.floor(getX()), (int) Math.floor(getY()) - 1, (int) Math.floor(getZ()));
+    }
+
+    public String getBlock() {
+        return level().getBlockState(getBlockBelow()).getBlock().toString();
+    }
+
+    private void explodeBelow()
+    {
+            if (Objects.equals(getBlock(), Blocks.BEDROCK.toString())) {
+                level().destroyBlock(getBlockBelow(), false);
+            }
+    }
+
+    @Override
+    public Block renderBlock() {
+        return blocks.TNT_BEDROCK.get();
+    }
+}

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

@@ -2,11 +2,14 @@ package com.jenny.enhancedexplosives.entities.tnt;
 
 import com.jenny.enhancedexplosives.blocks.blocks;
 import com.jenny.enhancedexplosives.entities.entities;
+import com.jenny.enhancedexplosives.util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.AABB;
@@ -24,7 +27,7 @@ public class blackHolePrimedTNT extends basePrimedTNT {
     }
 
     public blackHolePrimedTNT(EntityType<blackHolePrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
         this.setSpeed(this.getSpeed());
     }
 
@@ -57,7 +60,7 @@ public class blackHolePrimedTNT extends basePrimedTNT {
     @Override
     public void tick() {
         for (Entity e : findTargets()) {
-            e.addDeltaMovement(targetVector(e));
+            util.addDeltaMovement(e, targetVector(e));
         }
         super.tick();
     }

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

@@ -26,7 +26,7 @@ public class claymorePrimedTNT extends basePrimedTNT {
     }
 
     public claymorePrimedTNT(EntityType<claymorePrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     public Vec3 targetVector(RandomSource rng) {
@@ -42,10 +42,12 @@ public class claymorePrimedTNT extends basePrimedTNT {
         RandomSource rng = level().getRandom();
         for (int i = 0; i < getPCount(); i++) {
             Vec3 target = targetVector(rng);
-            assert this.getOwner() != null;
-            Projectile e = new claymoreArrow(level(), this.getOwner());
+            Projectile e = new claymoreArrow(level());
             e.setPos(position().add(0, 0.5, 0));
             e.setDeltaMovement(target);
+            if (getOwner() != null) {
+                e.setOwner(getOwner());
+            }
             level().addFreshEntity(e);
         }
 

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

@@ -17,7 +17,7 @@ public class enderPrimedTNT extends basePrimedTNT {
     }
 
     public enderPrimedTNT(EntityType<enderPrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     public Block renderBlock() {

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

@@ -1,23 +1,26 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
 import com.jenny.enhancedexplosives.blocks.blocks;
-import com.jenny.enhancedexplosives.entities.entities;
 import com.jenny.enhancedexplosives.config.ConfigClient;
-
-import net.minecraft.core.BlockPos;
+import com.jenny.enhancedexplosives.config.ConfigServer;
+import com.jenny.enhancedexplosives.entities.entities;
+import com.jenny.enhancedexplosives.util;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.*;
-import net.minecraft.world.entity.ai.targeting.TargetingConditions;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
 
 public class homingPrimedTNT extends basePrimedTNT {
     private static final EntityDataAccessor<Float> DATA_SPEED_ID = SynchedEntityData.defineId(homingPrimedTNT.class, EntityDataSerializers.FLOAT);
@@ -30,7 +33,7 @@ public class homingPrimedTNT extends basePrimedTNT {
     }
 
     public homingPrimedTNT(EntityType<homingPrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
 
     private Vec3 targetVector() {
@@ -51,10 +54,34 @@ public class homingPrimedTNT extends basePrimedTNT {
     }
 
     public void findTarget() {
+        target = closestEntity(getEntities());
+    }
+
+    private LivingEntity closestEntity(List<LivingEntity> entities) {
+        double dist = Double.MAX_VALUE;
+        LivingEntity target = null;
+        for (LivingEntity e : entities) {
+            double newDist = e.position().distanceTo(position());
+            if (newDist < dist) {
+                target = e;
+                dist = newDist;
+            }
+        }
+        return target;
+    }
+
+    protected List<LivingEntity> getEntities() {
+        List<LivingEntity> ret_list = new ArrayList<>();
         Vec3 corner1 = this.position().subtract(15, 15, 15);
         Vec3 corner2 = this.position().add(15, 15, 15);
         AABB boundingBox = new AABB(corner1, corner2);
-        target = this.level().getNearestEntity(LivingEntity.class, TargetingConditions.forNonCombat(), null, this.getX(), this.getY(), this.getZ(), boundingBox);
+
+        for (LivingEntity entity : level().getEntitiesOfClass(LivingEntity.class, boundingBox)) {
+            if (level().getPlayerByUUID(entity.getUUID()) == null || ConfigServer.homingAtPlayers.get()) { // prevent aiming at player if config says so
+                ret_list.add(entity);
+            }
+        }
+        return ret_list;
     }
 
     @Override
@@ -63,7 +90,11 @@ public class homingPrimedTNT extends basePrimedTNT {
             findTarget();
         }
         else {
-            if (getTargetDist() > 15) {target = null;} else {addDeltaMovement(targetVector());}
+            if (getTargetDist() > 15) {
+                target = null;
+            } else {
+                util.addDeltaMovement(this, targetVector());
+            }
         }
 
         super.tick();
@@ -96,10 +127,9 @@ public class homingPrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    public void spawnParticles(float partialTicks) {
-        Vec3 pos = getPosition(partialTicks);
+    public void spawnParticles() {
         for (int i = 1; i <= ConfigClient.calcPCount(1); i++) {
-            level().addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, 0, 0, 0);
+            level().addParticle(ParticleTypes.FLAME, getX(), getY(), getZ(), 0, 0, 0);
         }
     }
 

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

@@ -0,0 +1,99 @@
+package com.jenny.enhancedexplosives.entities.tnt;
+
+import com.jenny.enhancedexplosives.blocks.blocks;
+import com.jenny.enhancedexplosives.entities.entities;
+import com.jenny.enhancedexplosives.util;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class repulsivePrimedTNT extends basePrimedTNT {
+    private static final EntityDataAccessor<Float> DATA_SPEED_ID = SynchedEntityData.defineId(repulsivePrimedTNT.class, EntityDataSerializers.FLOAT);
+
+    public repulsivePrimedTNT(Level pLevel, double pX, double pY, double pZ, @Nullable LivingEntity pOwner, float power, int fuse, float speed) {
+        super(entities.TNT_REPULSIVE.get(), pLevel, pOwner, new Vec3(pX, pY, pZ), fuse, power);
+        this.setSpeed(speed);
+    }
+
+    public repulsivePrimedTNT(EntityType<repulsivePrimedTNT> entityType, Level level) {
+        super(entityType, level);
+        this.setSpeed(this.getSpeed());
+    }
+
+    private Vec3 targetVector(Entity target) {
+        double dist = getTargetDist(target);
+        float speed = getSpeed();
+        Vec3 mult = new Vec3(speed / dist, speed / dist, speed / dist);
+        return target.position().subtract(this.position()).normalize().multiply(mult);
+    }
+
+    public double getTargetDist(Entity target) {
+        return target.position().subtract(this.position()).length();
+    }
+
+    public List<Entity> findTargets() {
+        Vec3 corner1 = this.position().subtract(15, 15, 15);
+        Vec3 corner2 = this.position().add(15, 15, 15);
+        AABB boundingBox = new AABB(corner1, corner2);
+        return this.level().getEntities(this, boundingBox);
+
+    }
+
+    @Override
+    public void tick() {
+        for (Entity e : findTargets()) {
+            util.addDeltaMovement(e, targetVector(e));
+        }
+        super.tick();
+    }
+
+    @Override
+    public void explode() {
+        for (Entity e : findTargets()) {
+            util.addDeltaMovement(e, targetVector(e).scale(3));
+        }
+        super.explode();
+    }
+
+    @Override
+    protected void addAdditionalSaveData(CompoundTag pCompound) {
+        pCompound.putFloat("Speed", this.getSpeed());
+        super.addAdditionalSaveData(pCompound);
+    }
+
+    @Override
+    protected void readAdditionalSaveData(CompoundTag pCompound) {
+        this.setSpeed(pCompound.getFloat("Speed"));
+        super.readAdditionalSaveData(pCompound);
+    }
+
+    public void setSpeed(float speed) {
+        this.entityData.set(DATA_SPEED_ID, speed);
+    }
+
+    public float getSpeed() {
+        return this.entityData.get(DATA_SPEED_ID);
+    }
+
+    @Override
+    protected void defineSynchedData() {
+        this.entityData.define(DATA_SPEED_ID, 4.0f);
+        super.defineSynchedData();
+    }
+
+    @Override
+    public Block renderBlock() {
+        return blocks.TNT_REPULSIVE.get();
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
+import com.jenny.enhancedexplosives.blocks.blocks;
 import com.jenny.enhancedexplosives.entities.entities;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.BlockGetter;
@@ -9,7 +11,6 @@ import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.ExplosionDamageCalculator;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -34,20 +35,24 @@ public class selectivePrimedTNT extends basePrimedTNT {
     }
 
     public selectivePrimedTNT(EntityType<selectivePrimedTNT> entityType, Level level) {
-        super(entityType, level, null);
+        super(entityType, level);
     }
     @Override
     protected void explode() {
         SelectiveExplosionCalculator dmgCalc = new SelectiveExplosionCalculator(getBlock());
-        this.level().explode(this, null, dmgCalc, position(), getPower(), false, Level.ExplosionInteraction.TNT);
+        this.level().explode(this, DamageSource.explosion(getOwner()), dmgCalc, getX(), getY(), getZ(), getPower(), false, Explosion.BlockInteraction.BREAK);
     }
 
     public String getBlock() {
-        return level().getBlockState(new BlockPos((int) getX(), (int) getY() - 1, (int) getZ())).getBlock().toString();
+        return renderBlockBeneath().toString();
     }
 
     @Override
     public Block renderBlock() {
-        return level().getBlockState(new BlockPos((int) getX(), (int) getY() - 1, (int) getZ())).getBlock();
+        return blocks.TNT_SELECTIVE.get();
+    }
+
+    public Block renderBlockBeneath() {
+        return level().getBlockState(new BlockPos((int) Math.floor(getX()), (int) Math.floor(getY()) - 1, (int) Math.floor(getZ()))).getBlock();
     }
  }

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

@@ -1,23 +1,59 @@
 package com.jenny.enhancedexplosives.items;
 
+import com.jenny.enhancedexplosives.entities.arrows.baseArrow;
+import com.jenny.enhancedexplosives.entities.entities;
+import net.minecraft.core.Position;
+import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
+import org.jetbrains.annotations.NotNull;
 
 import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
+import static com.jenny.enhancedexplosives.creativeTab.CREATIVE_MODE_TAB;
 
 public class items {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
 
     public static final RegistryObject<Item> TNT_ARROW = ITEMS.register("arrow_tnt", () -> new ArrowTNT(new Item.Properties()));
-    public static final RegistryObject<Item> CONCUSSIVE_ARROW = ITEMS.register("arrow_concussive", () -> new ArrowConcussive(new Item.Properties()));
-    public static final RegistryObject<Item> CARPET_ARROW = ITEMS.register("arrow_carpet", () -> new ArrowCarpet(new Item.Properties()));
-    public static final RegistryObject<Item> DYNAMITE = ITEMS.register("dynamite", () -> new Dynamite(new Item.Properties()));
-    public static final RegistryObject<Item> TUNNEL_ARROW =  ITEMS.register("arrow_tunnel", () -> new ArrowTunnel(new Item.Properties()));
+    public static final RegistryObject<Item> CONCUSSIVE_ARROW = ITEMS.register("arrow_concussive", () -> new ArrowConcussive(new Item.Properties().tab(CREATIVE_MODE_TAB)));
+    public static final RegistryObject<Item> CARPET_ARROW = ITEMS.register("arrow_carpet", () -> new ArrowCarpet(new Item.Properties().tab(CREATIVE_MODE_TAB)));
+    public static final RegistryObject<Item> TUNNEL_ARROW = ITEMS.register("arrow_tunnel", () -> new ArrowTunnel(new Item.Properties().tab(CREATIVE_MODE_TAB)));
+    public static final RegistryObject<Item> DYNAMITE = ITEMS.register("dynamite", () -> new Dynamite(new Item.Properties().tab(CREATIVE_MODE_TAB)));
 
     public static void register(IEventBus bus) {
         ITEMS.register(bus);
     }
+
+    public static void registerDispenser() {
+        class ArrowDispenseBehaviour extends AbstractProjectileDispenseBehavior {
+            private final EntityType<? extends baseArrow> arrowType;
+
+            public ArrowDispenseBehaviour(EntityType<? extends baseArrow> arrow) {
+                this.arrowType = arrow;
+            }
+
+            @Override
+            protected @NotNull Projectile getProjectile(@NotNull Level pLevel, @NotNull Position pPosition, @NotNull ItemStack pStack) {
+                baseArrow arrow = arrowType.create(pLevel);
+                assert arrow != null;
+                arrow.setPos(pPosition.x(), pPosition.y(), pPosition.z());
+                arrow.pickup = AbstractArrow.Pickup.ALLOWED;
+                return arrow;
+            }
+        }
+
+        DispenserBlock.registerBehavior(TNT_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_TNT.get()));
+        DispenserBlock.registerBehavior(CONCUSSIVE_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_CONCUSSIVE.get()));
+        DispenserBlock.registerBehavior(CARPET_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_CARPET.get()));
+        DispenserBlock.registerBehavior(TUNNEL_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_TUNNEL.get()));
+    }
 }

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

@@ -0,0 +1,10 @@
+package com.jenny.enhancedexplosives;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
+
+public class util {
+    public static void addDeltaMovement(Entity entity, Vec3 movement) {
+        entity.setDeltaMovement(movement.add(entity.getDeltaMovement()));
+    }
+}

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)
+[[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}'''
-# 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,160 @@
+<book title="Enhanced Explosives">
+
+    <!--> Template files are bugged till gbook 3.7.2 <-->
+    <template id="page_title" height="43" mode="flow">
+        <p align="center"><image src="gbook:gui/book" w="120" h="7" tx="50" ty="10"/></p>
+        <space height="4"/>
+        <element index="0" align="center" scale="1.5"/> <!-- Intended use with one-line paragraph -->
+        <p align="center"><image src="gbook:gui/book" w="120" h="7" tx="50" ty="10"/></p>
+    </template>
+
+    <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>
+            <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>
+            <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_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>
+                <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/lang/en_us.json

@@ -1,4 +1,6 @@
 {
+  "itemGroup.enhancedexplosives": "Enhanced Explosives",
+
   "block.enhancedexplosives.tnt_8": "Compressed TNT",
   "block.enhancedexplosives.tnt_16": "Double Compressed TNT",
   "block.enhancedexplosives.tnt_32": "Triple Compressed TNT",
@@ -12,6 +14,9 @@
   "block.enhancedexplosives.tnt_claymore": "Claymore TNT",
   "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",
@@ -21,6 +26,7 @@
   "tooltip.enhancedexplosives.tnt_claymore": "throws arrows into all direcctions upon explosion",
   "tooltip.enhancedexplosives.tnt_selective": "only destroys the type of block it explodes on",
   "tooltip.enhancedexplosives.tnt_ender": "teleports in a 16 block radius upon priming",
+  "tooltip.enhancedexplosives.tnt_repulsive": "repels all close entities",
 
   "item.enhancedexplosives.arrow_tnt": "TNT Arrow",
   "item.enhancedexplosives.arrow_concussive": "Concussive Arrow",
@@ -30,7 +36,7 @@
 
   "tooltip.enhancedexplosives.arrow_tnt": "explodes on impact",
   "tooltip.enhancedexplosives.arrow_concussive": "explodes on impact without block damage",
-  "tooltip.enhancedexplosives.arrow_carpet": "splits into multiple TNT arrows when it starts falling",
+  "tooltip.enhancedexplosives.arrow_carpet": "splits into multiple concussive arrows when it starts falling",
   "tooltip.enhancedexplosives.arrow_tunnel": "explodes along the direction it is looking at",
   "tooltip.enhancedexplosives.dynamite": "TNT, but throwable"
 }

src/main/resources/assets/enhancedexplosives/models/item/dynamite.json

@@ -0,0 +1,18 @@
+{
+  "parent": "minecraft:item/handheld",
+  "loader": "forge:separate_transforms",
+  "base": {
+    "parent": "enhancedexplosives:item/dynamite_3d"
+  },
+  "perspectives": {
+    "gui": {
+      "parent": "enhancedexplosives:item/dynamite_3d"
+    },
+    "ground": {
+      "parent": "enhancedexplosives:item/dynamite_3d"
+    },
+    "fixed": {
+      "parent": "enhancedexplosives:item/dynamite_3d"
+    }
+  }
+}

src/main/resources/assets/enhancedexplosives/models/item/dynamite_3d.json

@@ -0,0 +1,829 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [48, 48],
+	"textures": {
+		"0": "enhancedexplosives:item/dynamite",
+		"particle": "enhancedexplosives:item/dynamite"
+	},
+	"elements": [
+		{
+			"from": [6.048, -0.129, 8.976],
+			"to": [7.024, 10.119, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 3.775, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, -0.129, 7.512],
+			"to": [7.024, 10.119, 8.488],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 3.775, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, -0.129, 6.048],
+			"to": [7.024, 10.119, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 3.775, 6.048]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 16], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 16], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 16], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 16], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.512, -0.129, 6.048],
+			"to": [8.488, 10.119, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.512, 3.775, 6.048]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, -0.129, 6.048],
+			"to": [9.952, 10.119, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 3.775, 6.048]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 0.115, 6.536],
+			"to": [8.976, 9.875, 6.78],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 4.019, 6.536]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 0.115, 6.536],
+			"to": [7.512, 9.875, 6.78],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 4.019, 6.536]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 0.115, 9.22],
+			"to": [7.512, 9.875, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 4.019, 9.22]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 0.115, 9.22],
+			"to": [8.976, 9.875, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 4.019, 9.22]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.22, 0.115, 8.488],
+			"to": [9.464, 9.875, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.22, 4.019, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.22, 0.115, 7.024],
+			"to": [9.464, 9.875, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.22, 4.019, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, 9.875, 7.024],
+			"to": [9.464, 10.119, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 13.779, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [3.33333, 0, 4, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, -0.129, 8.488],
+			"to": [9.464, 0.115, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 3.775, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [2.66667, 15, 3.33333, 15.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [2.66667, 15.33333, 3.33333, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, -0.129, 8.976],
+			"to": [8.976, 0.115, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 3.775, 9.464]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [2, 15, 2.66667, 15.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [2, 15.33333, 2.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, -0.129, 8.976],
+			"to": [7.512, 0.115, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 3.775, 9.464]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [1.33333, 15, 2, 15.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [1.33333, 15.33333, 2, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, -0.129, 8.488],
+			"to": [7.024, 0.115, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 3.775, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0.66667, 15, 1.33333, 15.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0.66667, 15.33333, 1.33333, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, -0.129, 7.024],
+			"to": [7.024, 0.115, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 3.775, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 15, 0.66667, 15.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 15.33333, 0.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, -0.129, 6.536],
+			"to": [7.512, 0.115, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 3.775, 7.024]},
+			"faces": {
+				"north": {"uv": [4.66667, 15, 5.33333, 15.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [4.66667, 15.33333, 5.33333, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, -0.129, 6.536],
+			"to": [8.976, 0.115, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 3.775, 7.024]},
+			"faces": {
+				"north": {"uv": [4, 15, 4.66667, 15.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [4, 15.33333, 4.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, -0.129, 7.024],
+			"to": [9.464, 0.115, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 3.775, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [3.33333, 15, 4, 15.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [3.33333, 15.33333, 4, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 9.875, 6.536],
+			"to": [8.976, 10.119, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 13.779, 7.024]},
+			"faces": {
+				"north": {"uv": [4, 0.66667, 4.66667, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [4, 0, 4.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 9.875, 6.536],
+			"to": [7.512, 10.119, 7.024],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 13.779, 7.024]},
+			"faces": {
+				"north": {"uv": [4.66667, 0.66667, 5.33333, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [4.66667, 0, 5.33333, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, 9.875, 7.024],
+			"to": [7.024, 10.119, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 13.779, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0.66667, 0.66667, 1], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 8.899, 7.024],
+			"to": [6.536, 9.143, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 12.803, 7.512]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 8.899, 8.488],
+			"to": [6.536, 9.143, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 12.803, 8.976]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [5.804, 8.899, 6.048],
+			"to": [6.048, 9.143, 10.196],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.804, 12.803, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 8.899, 9.952],
+			"to": [10.196, 9.143, 10.196],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 12.803, 10.196]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.952, 8.899, 5.804],
+			"to": [10.196, 9.143, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [10.196, 12.803, 9.464]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"from": [5.804, 8.899, 5.804],
+			"to": [9.952, 9.143, 6.048],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 12.803, 5.804]},
+			"faces": {
+				"north": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.952, 0.847, 5.804],
+			"to": [10.196, 1.091, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [10.196, 4.751, 9.464]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 0.847, 9.952],
+			"to": [10.196, 1.091, 10.196],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 4.751, 10.196]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"from": [5.804, 0.847, 6.048],
+			"to": [6.048, 1.091, 10.196],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5.804, 4.751, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [5.804, 0.847, 5.804],
+			"to": [9.952, 1.091, 6.048],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 4.751, 5.804]},
+			"faces": {
+				"north": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 8.899, 9.464],
+			"to": [7.512, 9.143, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 12.803, 9.952]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 8.899, 9.464],
+			"to": [8.976, 9.143, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 12.803, 9.952]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.464, 8.899, 8.488],
+			"to": [9.952, 9.143, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 12.803, 8.976]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.464, 8.899, 7.024],
+			"to": [9.952, 9.143, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 12.803, 7.512]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 8.899, 6.048],
+			"to": [8.976, 9.143, 6.536],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 12.803, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 8.899, 6.048],
+			"to": [7.512, 9.143, 6.536],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 12.803, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 0.847, 7.024],
+			"to": [6.536, 1.091, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 4.751, 7.512]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.048, 0.847, 8.488],
+			"to": [6.536, 1.091, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.048, 4.751, 8.976]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 0.847, 9.464],
+			"to": [7.512, 1.091, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 4.751, 9.952]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 0.847, 9.464],
+			"to": [8.976, 1.091, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 4.751, 9.952]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.464, 0.847, 8.488],
+			"to": [9.952, 1.091, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 4.751, 8.976]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.464, 0.847, 7.024],
+			"to": [9.952, 1.091, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9.464, 4.751, 7.512]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 0.847, 6.048],
+			"to": [8.976, 1.091, 6.536],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 4.751, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 0.847, 6.048],
+			"to": [7.512, 1.091, 6.536],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 4.751, 6.536]},
+			"faces": {
+				"north": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [8, 0, 8.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [8, 0.33333, 8.66667, 0.66667], "texture": "#0"},
+				"up": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 0, 8.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, 9.875, 8.488],
+			"to": [7.024, 10.119, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 13.779, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0.66667, 0.66667, 1.33333, 1], "texture": "#0"},
+				"up": {"uv": [0.66667, 0, 1.33333, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 9.875, 8.976],
+			"to": [7.512, 10.119, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 13.779, 9.464]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [1.33333, 0.66667, 2, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [1.33333, 0, 2, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.488, 9.875, 8.976],
+			"to": [8.976, 10.119, 9.464],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.488, 13.779, 9.464]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [2, 0.66667, 2.66667, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [2, 0, 2.66667, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, 9.875, 8.488],
+			"to": [9.464, 10.119, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 13.779, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [2.66667, 0.66667, 3.33333, 1], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [2.66667, 0, 3.33333, 0.66667], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.66667], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, 9.875, 7.024],
+			"to": [8.976, 10.119, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 13.779, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [5.33333, 13.33333, 8, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [5.33333, 10.66667, 8, 13.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.512, 10.058, 7.512],
+			"to": [8.488, 10.302, 8.488],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.512, 13.962, 8]},
+			"faces": {
+				"north": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"east": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"south": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"west": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"up": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.756, 10.18, 7.756],
+			"to": [8.244, 10.424, 8.244],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.756, 14.084, 8.244]},
+			"faces": {
+				"north": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"east": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"south": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"west": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"up": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.878, 9.936, 7.878],
+			"to": [8.122, 10.851, 8.122],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.878, 13.84, 8.366]},
+			"faces": {
+				"north": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"east": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"south": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"west": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"up": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.878, 10.424, 9.342],
+			"to": [8.122, 10.912, 9.586],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [7.878, 14.328, 9.83]},
+			"faces": {
+				"north": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"east": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"south": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"west": {"uv": [8, 13.33333, 10.66667, 13.66667], "texture": "#0"},
+				"up": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [8, 13.33333, 10.66667, 16], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.878, 10.851, 9.525],
+			"to": [8.122, 11.095, 9.769],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [7.878, 14.755, 10.013]},
+			"faces": {
+				"north": {"uv": [13.33333, 10.66667, 16, 11], "texture": "#0"},
+				"east": {"uv": [13.33333, 10.66667, 16, 11], "texture": "#0"},
+				"south": {"uv": [13.33333, 10.66667, 16, 11], "texture": "#0"},
+				"west": {"uv": [13.33333, 10.66667, 16, 11], "texture": "#0"},
+				"up": {"uv": [13.33333, 10.66667, 16, 13.33333], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [13.33333, 10.66667, 16, 13.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.024, -0.129, 7.024],
+			"to": [8.976, 0.115, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.024, 3.775, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 2.66667, 0.33333], "texture": "#0"},
+				"up": {"uv": [5.33333, 13.33333, 8, 16], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [5.33333, 10.66667, 8, 13.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, 0.115, 7.024],
+			"to": [6.78, 9.875, 7.512],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 4.019, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.536, 0.115, 8.488],
+			"to": [6.78, 9.875, 8.976],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6.536, 4.019, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.33333, 13.33333], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.66667, 13.33333], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.66667, 0.33333], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, -0.129, 7.512],
+			"to": [9.952, 10.119, 8.488],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 3.775, 7.512]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.976, -0.129, 8.976],
+			"to": [9.952, 10.119, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.976, 3.775, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.512, -0.129, 8.976],
+			"to": [8.488, 10.119, 9.952],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.512, 3.775, 8.976]},
+			"faces": {
+				"north": {"uv": [0, 0, 1.33333, 14], "texture": "#0"},
+				"east": {"uv": [1.33333, 0, 2.66667, 14], "texture": "#0"},
+				"south": {"uv": [2.66667, 0, 4, 14], "texture": "#0"},
+				"west": {"uv": [4, 0, 5.33333, 14], "texture": "#0"},
+				"up": {"uv": [5.33333, 0, 6.66667, 1.33333], "texture": "#0"},
+				"down": {"uv": [5.33333, 1.33333, 6.66667, 2.66667], "texture": "#0"}
+			}
+		}
+	]
+}

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_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_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_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/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/assets/enhancedexplosives/textures/block/tnt_black_hole_top.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": {
+    "frametime": 1,
+    "interpolate": true,
+    "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+  }
+}

src/main/resources/assets/enhancedexplosives/textures/block/tnt_repulsive_side.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": {
+    "frametime": 1,
+    "interpolate": true,
+    "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+  }
+}

src/main/resources/assets/enhancedexplosives/textures/block/tnt_repulsive_top.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": {
+    "frametime": 1,
+    "interpolate": true,
+    "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+  }
+}