From 80458093d5b4bcefb5ba40f10250269af0bbcfe8 Mon Sep 17 00:00:00 2001 From: Jenny Date: Sat, 16 Aug 2025 17:24:57 +0200 Subject: [PATCH] 0.15.0 --- README.md | 13 +- build.gradle | 47 ++--- gradle.properties | 7 +- ...{eventBusEvents.java => ClientEvents.java} | 12 +- .../EnhancedExplosives.java | 12 -- .../blocks/bedrockTNTBlock.java | 59 +++++++ .../enhancedexplosives/blocks/blocks.java | 6 + .../blocks/entityTNTBlock.java | 59 +++++++ .../entities/arrows/tntArrow.java | 1 - .../enhancedexplosives/entities/entities.java | 11 ++ .../entities/tnt/EntityPrimedTNT.java | 54 ++++++ .../entities/tnt/bedrockPrimedTNT.java | 62 +++++++ src/main/resources/META-INF/mods.toml | 78 +++------ .../assets/enhancedexplosives/books.json | 3 + .../books/guide_enhanced_explosives.xml | 160 ++++++++++++++++++ .../assets/enhancedexplosives/lang/en_us.json | 2 + .../en_us/categories/arrows.json | 5 + .../en_us/categories/other.json | 5 + .../en_us/categories/tnts.json | 5 + .../en_us/entries/arrow/arrow_carpet.json | 12 ++ .../en_us/entries/arrow/arrow_concussive.json | 12 ++ .../en_us/entries/arrow/arrow_tnt.json | 12 ++ .../en_us/entries/arrow/arrow_tunnel.json | 12 ++ .../en_us/entries/other/dynamite.json | 12 ++ .../en_us/entries/tnt/tnt_128.json | 12 ++ .../en_us/entries/tnt/tnt_16.json | 12 ++ .../en_us/entries/tnt/tnt_32.json | 12 ++ .../en_us/entries/tnt/tnt_64.json | 12 ++ .../en_us/entries/tnt/tnt_8.json | 12 ++ .../en_us/entries/tnt/tnt_bedrock.json | 12 ++ .../en_us/entries/tnt/tnt_black_hole.json | 12 ++ .../en_us/entries/tnt/tnt_claymore.json | 12 ++ .../en_us/entries/tnt/tnt_cluster_2.json | 12 ++ .../en_us/entries/tnt/tnt_cluster_4.json | 12 ++ .../en_us/entries/tnt/tnt_cluster_8.json | 12 ++ .../en_us/entries/tnt/tnt_ender.json | 12 ++ .../en_us/entries/tnt/tnt_entity.json | 12 ++ .../en_us/entries/tnt/tnt_homing.json | 12 ++ .../en_us/entries/tnt/tnt_repulsive.json | 12 ++ .../en_us/entries/tnt/tnt_selective.json | 12 ++ .../textures/block/tnt_bedrock_bottom.png | Bin 0 -> 459 bytes .../textures/block/tnt_bedrock_side.png | Bin 0 -> 563 bytes .../textures/block/tnt_bedrock_top.png | Bin 0 -> 459 bytes .../textures/block/tnt_entity_bottom.png | Bin 0 -> 151 bytes .../textures/block/tnt_entity_side.png | Bin 0 -> 1016 bytes .../textures/block/tnt_entity_top.png | Bin 0 -> 515 bytes .../loot_tables/tnt_bedrock.json | 14 ++ .../loot_tables/tnt_entity.json | 14 ++ .../enhancedexplosives_guide/book.json | 7 + .../recipes/tnt_bedrock.json | 17 ++ .../recipes/tnt_entity.json | 15 ++ .../recipes/tnt_repulsive.json | 2 +- .../recipes/tnt_selective.json | 15 ++ 53 files changed, 832 insertions(+), 105 deletions(-) rename src/main/java/com/jenny/enhancedexplosives/{eventBusEvents.java => ClientEvents.java} (76%) create mode 100644 src/main/java/com/jenny/enhancedexplosives/blocks/bedrockTNTBlock.java create mode 100644 src/main/java/com/jenny/enhancedexplosives/blocks/entityTNTBlock.java create mode 100644 src/main/java/com/jenny/enhancedexplosives/entities/tnt/EntityPrimedTNT.java create mode 100644 src/main/java/com/jenny/enhancedexplosives/entities/tnt/bedrockPrimedTNT.java create mode 100644 src/main/resources/assets/enhancedexplosives/books.json create mode 100644 src/main/resources/assets/enhancedexplosives/books/guide_enhanced_explosives.xml create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/arrows.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/other.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/tnts.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_carpet.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_concussive.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tnt.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tunnel.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/other/dynamite.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_128.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_16.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_32.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_64.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_8.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_bedrock.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_black_hole.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_claymore.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_2.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_4.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_8.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_ender.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_entity.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_homing.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_repulsive.json create mode 100644 src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_selective.json create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_bottom.png create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_side.png create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_top.png create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_bottom.png create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_side.png create mode 100644 src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_top.png create mode 100644 src/main/resources/data/enhancedexplosives/loot_tables/tnt_bedrock.json create mode 100644 src/main/resources/data/enhancedexplosives/loot_tables/tnt_entity.json create mode 100644 src/main/resources/data/enhancedexplosives/patchouli_books/enhancedexplosives_guide/book.json create mode 100644 src/main/resources/data/enhancedexplosives/recipes/tnt_bedrock.json create mode 100644 src/main/resources/data/enhancedexplosives/recipes/tnt_entity.json create mode 100644 src/main/resources/data/enhancedexplosives/recipes/tnt_selective.json diff --git a/README.md b/README.md index 30ea701..3634a48 100644 --- a/README.md +++ b/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_) \ No newline at end of file diff --git a/build.gradle b/build.gradle index e8a8db2..4d887ba 100644 --- a/build.gradle +++ b/build.gradle @@ -88,11 +88,17 @@ minecraft { client { // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. property 'forge.enabledGameTestNamespaces', mod_id + // fixes patchouli mixin error + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" } server { property 'forge.enabledGameTestNamespaces', mod_id args '--nogui' + // fixes patchouli mixin error + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" } // This run config launches GameTestServer and runs all registered gametests, then exits. @@ -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. diff --git a/gradle.properties b/gradle.properties index 19e3090..bddf290 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ -org.gradle.jvmargs=-Xmx3G +# CreateCoredumpOnCrash only works on jdk9+ +org.gradle.jvmargs=-Xmx3G -XX:-CreateCoredumpOnCrash org.gradle.daemon=false minecraft_version=1.19.2 minecraft_version_range=[1.19.2] @@ -11,7 +12,7 @@ mapping_version=2022.11.27-1.19.2 mod_id=enhancedexplosives mod_name=Enhanced Explosives mod_license=All Rights Reserved -mod_version=0.14 +mod_version=0.15.0 mod_group_id=com.jenny -mod_authors=Jenny +mod_authors=xJenny69 mod_description=strong & throwable explosives diff --git a/src/main/java/com/jenny/enhancedexplosives/eventBusEvents.java b/src/main/java/com/jenny/enhancedexplosives/ClientEvents.java similarity index 76% rename from src/main/java/com/jenny/enhancedexplosives/eventBusEvents.java rename to src/main/java/com/jenny/enhancedexplosives/ClientEvents.java index b0548dd..7139b98 100644 --- a/src/main/java/com/jenny/enhancedexplosives/eventBusEvents.java +++ b/src/main/java/com/jenny/enhancedexplosives/ClientEvents.java @@ -1,16 +1,19 @@ package com.jenny.enhancedexplosives; +import com.jenny.enhancedexplosives.entities.entities; import com.jenny.enhancedexplosives.particles.ArrowParticle; import com.jenny.enhancedexplosives.particles.particles; import net.minecraft.client.Minecraft; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; -@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class eventBusEvents { +@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +public class ClientEvents { @SubscribeEvent public static void registerParticleFactories(final RegisterParticleProvidersEvent event) { Minecraft.getInstance().particleEngine.register(particles.CONCUSSIVE_ARROW_PARTICLE.get(), @@ -22,4 +25,9 @@ public class eventBusEvents { Minecraft.getInstance().particleEngine.register(particles.TUNNEL_ARROW_PARTICLE.get(), ArrowParticle.Provider::new); } + + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + entities.registerRenderers(); + } } diff --git a/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java b/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java index 2e9f9c1..bcd6be7 100644 --- a/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java +++ b/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java @@ -7,7 +7,6 @@ import com.jenny.enhancedexplosives.entities.entities; import com.jenny.enhancedexplosives.items.items; import com.jenny.enhancedexplosives.particles.particles; import com.mojang.logging.LogUtils; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.eventbus.api.IEventBus; @@ -15,7 +14,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; @@ -53,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(); - } - } } \ No newline at end of file diff --git a/src/main/java/com/jenny/enhancedexplosives/blocks/bedrockTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/bedrockTNTBlock.java new file mode 100644 index 0000000..02a0515 --- /dev/null +++ b/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); + } + } +} diff --git a/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java b/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java index 3b3579f..b204abd 100644 --- a/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java @@ -62,6 +62,12 @@ public class blocks { public static final RegistryObject TNT_REPULSIVE = BLOCKS.register("tnt_repulsive", () -> new repulsiveTNTBlock(DEFAULT_PROPS, 4.0f, 80, 1)); public static final RegistryObject TNT_REPULSIVE_ITEM = ITEMS.register("tnt_repulsive", () -> new BlockItemTooltip(TNT_REPULSIVE.get(), new Item.Properties().tab(CREATIVE_MODE_TAB))); + public static final RegistryObject TNT_BEDROCK = BLOCKS.register("tnt_bedrock", () -> new bedrockTNTBlock(DEFAULT_PROPS, 4.0f, 80)); + public static final RegistryObject TNT_BEDROCK_ITEM = ITEMS.register("tnt_bedrock", () -> new BlockItemTooltip(TNT_BEDROCK.get(), new Item.Properties().tab(CREATIVE_MODE_TAB))); + + public static final RegistryObject TNT_ENTITY = BLOCKS.register("tnt_entity", () -> new entityTNTBlock(DEFAULT_PROPS, 4.0f, 80)); + public static final RegistryObject 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) { BLOCKS.register(bus); diff --git a/src/main/java/com/jenny/enhancedexplosives/blocks/entityTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/entityTNTBlock.java new file mode 100644 index 0000000..cbf17bb --- /dev/null +++ b/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); + } + } +} diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java index b3d4967..cca076d 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java @@ -44,7 +44,6 @@ public class tntArrow extends baseArrow { @Override public void spawnParticles(float partialTicks) { for (int i = 1; i <= ConfigClient.calcPCount(5); i++) { - double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100; Vec3 DeltaMovement = getDeltaMovement(); Vec3 pos = particlePos(0.5); level().addParticle(particles.TNT_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z); diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/entities.java b/src/main/java/com/jenny/enhancedexplosives/entities/entities.java index eff768f..fdbceb2 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/entities.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/entities.java @@ -50,6 +50,15 @@ public class entities { ENTITY_TYPES.register("tnt_repulsive", () -> EntityType.Builder.of(repulsivePrimedTNT::new, MobCategory.MISC) .fireImmune().sized(0.98F, 0.98F).clientTrackingRange(10).updateInterval(10).build("tnt_repulsive")); + public static final RegistryObject> TNT_BEDROCK = + ENTITY_TYPES.register("tnt_bedrock", () -> EntityType.Builder.of(bedrockPrimedTNT::new, MobCategory.MISC) + .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_bedrock")); + + public static final RegistryObject> TNT_ENTITY = + ENTITY_TYPES.register("tnt_entity", () -> EntityType.Builder.of(EntityPrimedTNT::new, MobCategory.MISC) + .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_entity")); + + public static final RegistryObject> ARROW_TNT = ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.of(tntArrow::new, MobCategory.MISC) .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_tnt")); @@ -89,6 +98,8 @@ public class entities { EntityRenderers.register(TNT_CLAYMORE.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); diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/EntityPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/EntityPrimedTNT.java new file mode 100644 index 0000000..b9d5349 --- /dev/null +++ b/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 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(); + } +} diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/bedrockPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/bedrockPrimedTNT.java new file mode 100644 index 0000000..3685bc7 --- /dev/null +++ b/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 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(); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7a1d678..4525624 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/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" \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/books.json b/src/main/resources/assets/enhancedexplosives/books.json new file mode 100644 index 0000000..ad91204 --- /dev/null +++ b/src/main/resources/assets/enhancedexplosives/books.json @@ -0,0 +1,3 @@ +[ + "enhancedexplosives:books/guide_enhanced_explosives.xml" +] \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/books/guide_enhanced_explosives.xml b/src/main/resources/assets/enhancedexplosives/books/guide_enhanced_explosives.xml new file mode 100644 index 0000000..3c98a2b --- /dev/null +++ b/src/main/resources/assets/enhancedexplosives/books/guide_enhanced_explosives.xml @@ -0,0 +1,160 @@ + + + Template files are bugged till gbook 3.7.2 <--> + + + +
+ + Content + + TNTs + Compressed TNT + Cluster TNT + Homing TNT + Black Hole TNT + Claymore TNT + Selective + Ender TNT + Repulsive TNT + Bedrock TNT + Entity TNT + Arrows + TNT Arrow + Concussive Arrow + Carpet Bombing Arrow + Tunnel Arrow + Other + Dynamite +
+ + +
+ + Compressed TNT + +

These TNTs are stronger than vanilla TNT. They are crafted from 4 TNTs of the previous stage and offer + double the explosion strength. +

+
+ + +
+ + Cluster TNT + +

These TNTs spawn multiple smaller TNTs when primed. Each spawned TNT is as strong as vanilla TNT.

+
+ + +
+ + Homing TNT + +

This TNT targets the closest mob and moves towards it.

+
+ + +
+ + Black Hole TNT + +

This TNT attracts close entities towards itself before exploding.

+
+ + +
+ + Claymore TNT + +

This TNT shoots many arrows in a circle around the TNT, instead of exploding.

+
+ + +
+ + Selective TNT + +

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. +

+
+ + +
+ + Ender TNT + +

This TNT will teleport randomly teleport when primed.

+
+ + +
+ + Repulsive TNT + +

This TNT will push entities away when primed.

+
+ + +
+ + Bedrock TNT + +

This TNT will destroy the one bedrock block below it.

+
+ + +
+ + Entity TNT + +

This TNT won't destroy blocks but hurt entities.

+
+ + +
+ + TNT Arrow + +

This arrow explodes on impact with half the strength of TNT.

+
+ + +
+ + TNT Arrow + +

This arrow explodes on impact without damaging blocks.

+
+ + +
+ + Carpet Bombing Arrow + +

This arrow splits into many Concussive Arrows as soon as it starts falling.

+
+ + +
+ + Tunnel Arrow + +

This arrow spawns multiple explosions in a line equivalent to its direction on hit.

+
+ + +
+ + Dynamite + +

Dynamite can be thrown like a potion and explodes with the strength of vanilla TNT.

+
+ + \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/lang/en_us.json b/src/main/resources/assets/enhancedexplosives/lang/en_us.json index c60dede..b1039a0 100644 --- a/src/main/resources/assets/enhancedexplosives/lang/en_us.json +++ b/src/main/resources/assets/enhancedexplosives/lang/en_us.json @@ -15,6 +15,8 @@ "block.enhancedexplosives.tnt_selective": "Selective TNT", "block.enhancedexplosives.tnt_ender": "Ender TNT", "block.enhancedexplosives.tnt_repulsive": "Repulsive TNT", + "block.enhancedexplosives.tnt_bedrock": "Bedrock TNT", + "block.enhancedexplosives.tnt_entity": "Entity TNT", "tooltip.enhancedexplosives.tnt_cluster_2": "splits into 2 small TNTs", "tooltip.enhancedexplosives.tnt_cluster_4": "splits into 4 small TNTs", diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/arrows.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/arrows.json new file mode 100644 index 0000000..ada12e6 --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/other.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/other.json new file mode 100644 index 0000000..1b5b2e8 --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/tnts.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/categories/tnts.json new file mode 100644 index 0000000..65bf3c5 --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_carpet.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_carpet.json new file mode 100644 index 0000000..945d8a9 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_concussive.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_concussive.json new file mode 100644 index 0000000..213f643 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tnt.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tnt.json new file mode 100644 index 0000000..68af89e --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tunnel.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/arrow/arrow_tunnel.json new file mode 100644 index 0000000..b70b8e7 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/other/dynamite.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/other/dynamite.json new file mode 100644 index 0000000..03eb7ff --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_128.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_128.json new file mode 100644 index 0000000..b9118d8 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_16.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_16.json new file mode 100644 index 0000000..0fcbd11 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_32.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_32.json new file mode 100644 index 0000000..cd2a738 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_64.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_64.json new file mode 100644 index 0000000..86db97d --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_8.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_8.json new file mode 100644 index 0000000..00c2b15 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_bedrock.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_bedrock.json new file mode 100644 index 0000000..3f4bb96 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_black_hole.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_black_hole.json new file mode 100644 index 0000000..ff14718 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_claymore.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_claymore.json new file mode 100644 index 0000000..b28f08f --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_2.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_2.json new file mode 100644 index 0000000..135e8cf --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_4.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_4.json new file mode 100644 index 0000000..cffbd45 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_8.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_cluster_8.json new file mode 100644 index 0000000..46f7cee --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_ender.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_ender.json new file mode 100644 index 0000000..918fe2a --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_entity.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_entity.json new file mode 100644 index 0000000..1116e94 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_homing.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_homing.json new file mode 100644 index 0000000..9749e07 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_repulsive.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_repulsive.json new file mode 100644 index 0000000..8155d0d --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_selective.json b/src/main/resources/assets/enhancedexplosives/patchouli_books/enhancedexplosives_guide/en_us/entries/tnt/tnt_selective.json new file mode 100644 index 0000000..aa61006 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2e8f3ba5cb7815c093b3c70c6bcf50f65ead0fd9 GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~R5*=olOeK$Fcd`({K^ETA4yNfz>bw}9;~D)5a!wT2~h z29udO_@a|c=r0PAmv`>Hd1P(dF2gX8K2l1IF*xV&-eZiR?|a5^jQis_BBkUf&-34^ zs@QI~9FIrldFF69;G9D##r1lnu4{I?9rHZ%cszK$Ua?8G-|v@cnkb3_fb<=}T1(e; zNGao5P$YyPYno;Wasj;e+-^6t*0B(X@;|L+WmzsoQAE;bK{!}d6-p_92pfjsZ6TEx z!bz#qG@-Trw^kGd8*6Rs>b+l)gb;Y|5kjoilu~qE$23jv48GC7(NbGgRpGs7lXg!J zNhy(1uIS-vjWMx4Yno>HB&CCr($br-*5aHaYuk1KqOUZA;4|D(c${;D>CMWrTtdR1 z7E<|PZ~_eAd_J?$TCb#ildF_keFwVM`fWie6$9$~K2BnKD9tBT7Bfhx=>&eWlJ5QF zdHx&zus}MUPSkbHJkQ+kcZ3i;pHD8AORNix{{ZzR5BcreK@|W1002ovPDHLkV1f-} B(c}OC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_side.png new file mode 100644 index 0000000000000000000000000000000000000000..16711a18d2020ae3ab5fc6d4ba0ed209b42cb010 GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR5*>5lfR4FU>L_g$=#NKbrVmhgpjU5lRJ(UN(I=nxi*HK#OszfJ6u?GcvlVF7ew>({%muR`6&-6au=hye){XSY4hBBQ_$(wE4 z1VO-fJSL7~f*@cx9I{%iRD88sVcRw*x~^Zju1l#@qS9U0 z4tlm*KA11anB}ct7(A(*VL1-k*UxwI&;R^~X_jS)@B0eK%hfbZ^>vwW0EKnCT~2-9 zKM;xQy2NpOfO(#G;Agkv`#xG2hT?gi(*AHbR7%VjWfDJTriEcB{FU(WwLP{GBf>^#|6>3E002ovPDHLkV1kI} B2@(JR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_bedrock_top.png new file mode 100644 index 0000000000000000000000000000000000000000..2e8f3ba5cb7815c093b3c70c6bcf50f65ead0fd9 GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~R5*=olOeK$Fcd`({K^ETA4yNfz>bw}9;~D)5a!wT2~h z29udO_@a|c=r0PAmv`>Hd1P(dF2gX8K2l1IF*xV&-eZiR?|a5^jQis_BBkUf&-34^ zs@QI~9FIrldFF69;G9D##r1lnu4{I?9rHZ%cszK$Ua?8G-|v@cnkb3_fb<=}T1(e; zNGao5P$YyPYno;Wasj;e+-^6t*0B(X@;|L+WmzsoQAE;bK{!}d6-p_92pfjsZ6TEx z!bz#qG@-Trw^kGd8*6Rs>b+l)gb;Y|5kjoilu~qE$23jv48GC7(NbGgRpGs7lXg!J zNhy(1uIS-vjWMx4Yno>HB&CCr($br-*5aHaYuk1KqOUZA;4|D(c${;D>CMWrTtdR1 z7E<|PZ~_eAd_J?$TCb#ildF_keFwVM`fWie6$9$~K2BnKD9tBT7Bfhx=>&eWlJ5QF zdHx&zus}MUPSkbHJkQ+kcZ3i;pHD8AORNix{{ZzR5BcreK@|W1002ovPDHLkV1f-} B(c}OC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..6b18c071e8f9fa04487b37bba00e4788bdaa0610 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|0zF+ELo9le zMMCfYh<~+Nj2Q?H8{f<30f8kSBA3`@8y=aSla>GkGwz=`bKuBJSE>1pP6t+KTYR)v sW!tbvAXwq#`4@jK8c6UqCknAKY^f+PusFbX7HBwwr>mdKI;Vst0O#m3TL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_entity_side.png new file mode 100644 index 0000000000000000000000000000000000000000..8703c2cc7cfe40a94217a3011418bfd6c8283cdc GIT binary patch literal 1016 zcmVPx&vPnciRCt{2TTM?IQ4~ExQM9I&(iDwJ6WSO}P1CUL!WDZZ1jM9W*rYD(e_`uK zswE9g5HP0w0j}J+aaI})r0oV9V-RW(K}Nbzi0?VPc^I3E;hojoH*?P%PVT+)GJxhA zJgh;0BU^!qvyXO|_)X!hD823TZNlshfHHtu05$AX1Lm5CVfEvmGY5~+x22cy2hBAO!05y~W)B>oX)oL~7o#6KNHgiFLU!Rbm zP%H}1Tjl?6J{~VeMwqzcD?k}QEr1$Y{`i=g0j1LtbHUkJiO*rcjS%o(GCZ)c9&4J$ z#1|JAOl)v`?A1Vz!@=eohLF$R)y2eJTx^E~rlzM&*ORNOGU+!EoSM2*zCb8sy1tf3 zSmp{1nD9>m0DL|l0Knt%Fz4&WB;s)?p`mbCiZ3q7=MMyge8H>xeP3U1%F(n1Cj67| z`Fu$22GQ5+fP27=eE#wkdZk#d9a^3fP27=)NT+iY@n;V+f*=a$=7|w2f>VK zh0mx~0RRR!GlVVR%FdyX1%3`K;ED4woX&nYo&DI)9N;+r7uwD{xI_f^fKO;ZEEa>V z>xe|=fGkk|4oL&x0x&*4j^W{9M59qD!R^Rr`4sSay@o+*LLby;N9N(BI*Sv>b;`Hb^(z+|6c1{uEkU<9W}xD%{9 zdRJ&iKA{0yTU(X{xm-^AX6?w=)PVI=3Y(jo0MN9&>H{Vzv2j^TCgu4gc7%y|T$(R_ zH6zSmubh>cg%URtbX|wn>utnlj+Tn2jbpy$ZQM+d;XBFa8^=~NK!&e)a?&_<^z^X$ zMC7qAQA8q<8@-lJryK5mU0x9iypC^CYrd7mMQOg}g#}B#<@tFbhxR+2VYk9u1sFyZ zGqba%$r^cLF;8jgT^cS^zb)XQMxaQ-l9q9gjb5kMMlE=XZPs zCH(lz5oX44@W34P^ke0BR@$s0C0%89*(78g~AF mb*Px$y-7qtR5*>5lCf)3Q51*2w2zb`G()09DW#(D2oxh7!j(!&3U|sM(4m8GbIH&t zOL-7@h`42NsZ+q@59lBccL<1qONT&Ou%s>_lLU>Ff=|jbb?Li(X3+kxob#Pu zBLC?7WoD8B;OE>K0JE@_nWQLJn*hAsf5Nk~7c=o3SEaQkI~ow>z<1~-ZM4<^WJd$K zNgJ>38BW}{4=zK<$qwz_4uS8md|m_K$AeV>0^b3^T5OnRfJD?mH)#W~e$kKJxtp|E z2@daeaJ1hrJ9>2wYq3Eo-$Dq1)*7qVVCWZkwd=+^DCJwEixuM`@Ew#^cy$jU1liF5 zDdgP_!ktU`7D_AgkrdLrZ#qic%z^!KZ>l+3E5RW{t1#urIM7;?29#E~yRI2CIzhYl z4SeEr0C1uIBla25~zrMUT4(8YHxwUe&$$0()?cNTL|30N$ZL+`u$G;!){LeeqHu`LB zkNNm%lcm$wq>B}{w#R%v{&(#lymK52A*RNTa%>J};s1D91-}rj2hIQh002ovPDHLk FV1jx==_~*M literal 0 HcmV?d00001 diff --git a/src/main/resources/data/enhancedexplosives/loot_tables/tnt_bedrock.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_bedrock.json new file mode 100644 index 0000000..4681e24 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_bedrock.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "enhancedexplosives:tnt_bedrock" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/loot_tables/tnt_entity.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_entity.json new file mode 100644 index 0000000..1c3dd38 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_entity.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "enhancedexplosives:tnt_entity" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/patchouli_books/enhancedexplosives_guide/book.json b/src/main/resources/data/enhancedexplosives/patchouli_books/enhancedexplosives_guide/book.json new file mode 100644 index 0000000..a639689 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/patchouli_books/enhancedexplosives_guide/book.json @@ -0,0 +1,7 @@ +{ + "name": "EE Manual", + "landing_text": "If you find bugs or have suggestions for improving this mod, please message me on curseforge, my discord, or gitea (link in mod info).", + "version": 1, + "creative_tab": "enhancedexplosives:enhancedexplosives", + "use_resource_pack": true +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_bedrock.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_bedrock.json new file mode 100644 index 0000000..7fc4c0c --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_bedrock.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "pattern": [ + "AA ", + "AA ", + " " + ], + "key": { + "A": { + "item": "enhancedexplosives:tnt_128" + } + }, + "result": { + "item": "enhancedexplosives:tnt_bedrock" + } +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_entity.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_entity.json new file mode 100644 index 0000000..8282267 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_entity.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "ingredients":[ + { + "item": "minecraft:tnt" + }, + { + "item": "minecraft:water_bucket" + } + ], + "result": { + "item": "enhancedexplosives:tnt_entity" + } +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_repulsive.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_repulsive.json index 86abb4c..b0932b1 100644 --- a/src/main/resources/data/enhancedexplosives/recipes/tnt_repulsive.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_repulsive.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "enhancedexplosives:tnt_black_hole" + "item": "enhancedexplosives:tnt_repulsive" } } \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_selective.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_selective.json new file mode 100644 index 0000000..3283480 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_selective.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "combat", + "ingredients":[ + { + "item": "minecraft:tnt" + }, + { + "item": "minecraft:obsidian" + } + ], + "result": { + "item": "enhancedexplosives:tnt_selective" + } +} \ No newline at end of file