Compare commits

..

1 Commits

Author SHA1 Message Date
1417563435
1.19.2 port (missing DataGen) 2025-06-14 13:44:16 +02:00
68 changed files with 248 additions and 735 deletions

View File

@ -88,17 +88,11 @@ 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.
@ -122,18 +116,39 @@ minecraft {
sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
maven {
url "https://cursemaven.com"
content {
includeGroup "curse.maven"
}
}
// 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'
// }
}
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}"
implementation fg.deobf("curse.maven:guidebook-253874:4593765")
implementation fg.deobf("curse.maven:patchouli-306770:4633797")
// 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
}
// This block of code expands all declared replace properties in the specified resource targets.

View File

@ -1,19 +1,17 @@
# CreateCoredumpOnCrash only works on jdk9+
org.gradle.jvmargs=-Xmx3G -XX:-CreateCoredumpOnCrash
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
minecraft_version=1.20.1
minecraft_version_range=[1.20.1,1.20.2]
forge_version=47.3.22
forge_version_range=[47,)
loader_version_range=[47,)
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
mapping_version=2023.09.03-1.20.1
mapping_version=2022.11.27-1.19.2
mod_id=enhancedexplosives
mod_name=Enhanced Explosives
mod_license=All Rights Reserved
mod_version=0.15.0
mod_version=0.14
mod_group_id=com.jenny
mod_authors=xJenny69
mod_authors=Jenny
mod_description=strong & throwable explosives

View File

@ -7,6 +7,7 @@ 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,6 +15,7 @@ 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;
@ -34,7 +36,6 @@ 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
@ -52,4 +53,14 @@ 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();
}
}
}

View File

@ -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);
}
}

View File

@ -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);

View File

@ -5,61 +5,62 @@ 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().mapColor(MapColor.FIRE).instabreak().sound(SoundType.GRASS).ignitedByLava();
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(DEFAULT_PROPS, 8.0f, 80));
public static final RegistryObject<Item> TNT_8_ITEM = ITEMS.register("tnt_8", () -> new BlockItemTooltip(TNT_8.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 16.0f, 80));
public static final RegistryObject<Item> TNT_16_ITEM = ITEMS.register("tnt_16", () -> new BlockItemTooltip(TNT_16.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 32.0f, 80));
public static final RegistryObject<Item> TNT_32_ITEM = ITEMS.register("tnt_32", () -> new BlockItemTooltip(TNT_32.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 64.0f, 80));
public static final RegistryObject<Item> TNT_64_ITEM = ITEMS.register("tnt_64", () -> new BlockItemTooltip(TNT_64.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 128.0f, 80));
public static final RegistryObject<Item> TNT_128_ITEM = ITEMS.register("tnt_128", () -> new BlockItemTooltip(TNT_128.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80, 2, 10));
public static final RegistryObject<Item> TNT_CLUSTER_2_ITEM = ITEMS.register("tnt_cluster_2", () -> new BlockItemTooltip(TNT_CLUSTER_2.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80, 4, 10));
public static final RegistryObject<Item> TNT_CLUSTER_4_ITEM = ITEMS.register("tnt_cluster_4", () -> new BlockItemTooltip(TNT_CLUSTER_4.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80, 8, 10));
public static final RegistryObject<Item> TNT_CLUSTER_8_ITEM = ITEMS.register("tnt_cluster_8", () -> new BlockItemTooltip(TNT_CLUSTER_8.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80, 1));
public static final RegistryObject<Item> TNT_HOMING_ITEM = ITEMS.register("tnt_homing", () -> new BlockItemTooltip(TNT_HOMING.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80, 1));
public static final RegistryObject<Item> TNT_BLACK_HOLE_ITEM = ITEMS.register("tnt_black_hole", () -> new BlockItemTooltip(TNT_BLACK_HOLE.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 2.0f, 20, 256));
public static final RegistryObject<Item> TNT_CLAYMORE_ITEM = ITEMS.register("tnt_claymore", () -> new BlockItemTooltip(TNT_CLAYMORE.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 32.0f, 80));
public static final RegistryObject<Item> TNT_SELECTIVE_ITEM = ITEMS.register("tnt_selective", () -> new BlockItemTooltip(TNT_SELECTIVE.get(), new Item.Properties()));
public static final RegistryObject<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(DEFAULT_PROPS, 4.0f, 80));
public static final RegistryObject<Item> TNT_ENDER_ITEM = ITEMS.register("tnt_ender", () -> new BlockItemTooltip(TNT_ENDER.get(), new Item.Properties()));
public static final RegistryObject<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()));
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 void register(IEventBus bus) {

View File

@ -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);
}
}

View File

@ -81,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);

View File

@ -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);

View File

@ -50,7 +50,7 @@ public class repulsiveTNTBlock extends TntBlock {
@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.getIndirectSourceEntity(), pRadius, fuseTime, speed);
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);

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -1,50 +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.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryObject;
import java.util.Arrays;
import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID;
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.SPAWN_EGGS).icon(() -> blocks.TNT_8_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> {
output.acceptAll(Arrays.stream(getBlocks()).toList());
output.acceptAll(Arrays.stream(getItems()).toList());
}).title(Component.literal("Enhanced Explosives")).build());
public static void register(IEventBus bus) {
CREATIVE_MODE_TABS.register(bus);
}
public static ItemStack[] getBlocks() {
ItemStack[] ret = new ItemStack[blocks.ITEMS.getEntries().size()];
int i = 0;
for (RegistryObject<Item> item : blocks.ITEMS.getEntries()) {
ret[i] = item.get().getDefaultInstance();
i++;
public static final CreativeModeTab CREATIVE_MODE_TAB = new CreativeModeTab("enhancedexplosives") {
@Override
public ItemStack makeIcon() {
return new ItemStack(blocks.TNT_8_ITEM.get());
}
return ret;
}
public static ItemStack[] getItems() {
ItemStack[] ret = new ItemStack[items.ITEMS.getEntries().size()];
int i = 0;
for (RegistryObject<Item> item : items.ITEMS.getEntries()) {
ret[i] = item.get().getDefaultInstance();
i++;
}
return ret;
}
};
}

View File

@ -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));
}
}

View File

@ -1,97 +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.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
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);
SideTop(blocks.TNT_BLACK_HOLE);
SideTop(blocks.TNT_REPULSIVE);
SideOnlyTNT(blocks.TNT_CLUSTER_2);
SideOnlyTNT(blocks.TNT_CLUSTER_4);
SideOnlyTNT(blocks.TNT_CLUSTER_8);
SideOnlyTNT(blocks.TNT_SELECTIVE);
SideOnlyTNT(blocks.TNT_HOMING);
}
private void blockWithItem(@NotNull RegistryObject<Block> blockRegistryObject) {
simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
}
private void SideTop(@NotNull RegistryObject<Block> blockRegistryObject) {
simpleBlockWithItem(blockRegistryObject.get(), topSide(blockRegistryObject.get()));
}
private void blockItem(@NotNull RegistryObject<Block> blockRegistryObject) {
simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(MODID +
":block/" + Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(blockRegistryObject.get())).getPath()));
}
private void topBottom2Sides(@NotNull RegistryObject<Block> blockRegistryObject) {
simpleBlockWithItem(blockRegistryObject.get(), northEastTopBottom(blockRegistryObject.get()));
}
private ResourceLocation key(Block block) {
return ForgeRegistries.BLOCKS.getKey(block);
}
private @NotNull String name(Block block) {
return key(block).getPath();
}
private ResourceLocation extend(@NotNull ResourceLocation rl, String suffix) {
return new ResourceLocation(rl.getNamespace(), rl.getPath() + suffix);
}
public void sideTopBottom(@NotNull 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 void SideOnlyTNT(@NotNull RegistryObject<Block> blockRegistryObject) {
Block block = blockRegistryObject.get();
ModelFile model = models().cubeBottomTop(name(block), extend(blockTexture(block), "_side"), extend(blockTexture(Blocks.TNT), "_bottom"), extend(blockTexture(Blocks.TNT), "_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), "_side"), extend(blockTexture(block), "_top"));
}
}

View File

@ -1,31 +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.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 void simpleItem(RegistryObject<Item> item) {
withExistingParent(item.getId().getPath(),
new ResourceLocation("item/generated")).texture("layer0",
new ResourceLocation(MODID,"item/" + item.getId().getPath()));
}
}

View File

@ -55,4 +55,8 @@ public class baseArrow extends AbstractArrow {
public int getTick() {
return this.tick;
}
public Level level() {
return level;
}
}

View File

@ -5,11 +5,10 @@ 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.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageTypes;
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;
@ -38,16 +37,11 @@ public class carpetArrowPart extends baseArrow {
public void explode() {
if (!level().isClientSide) {
level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE);
level().explode(this, getX(), getY(), getZ(), 8.0f, Explosion.BlockInteraction.BREAK);
}
discard();
}
@Override
public boolean hurt(@NotNull DamageSource pSource, float pAmount) {
return super.hurt(pSource, pAmount) || pSource.is(DamageTypes.EXPLOSION);
}
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.CONCUSSIVE_ARROW.get());

View File

@ -3,6 +3,7 @@ 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;
@ -17,13 +18,17 @@ public class claymoreArrow extends baseArrow{
}
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

View File

@ -7,6 +7,7 @@ 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;
@ -24,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();
}

View File

@ -7,6 +7,7 @@ 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;
@ -24,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,6 +44,7 @@ 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);

View File

@ -6,6 +6,7 @@ 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;
@ -47,7 +48,7 @@ public class tunnelArrow extends baseArrow{
for (int i = 0; i < explosionCount; i++) {
Vec3 pos = position().add(rot.multiply(i * spacing, i * spacing, i * spacing));
level().explode(this, pos.x, pos.y, pos.z,
power, Level.ExplosionInteraction.TNT);
power, Explosion.BlockInteraction.BREAK);
}
}

View File

@ -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;
@ -34,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);

View File

@ -2,7 +2,7 @@ package com.jenny.enhancedexplosives.entities.client;
import com.jenny.enhancedexplosives.entities.tnt.selectivePrimedTNT;
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 +35,9 @@ public class SelectiveTNTRenderer<T extends selectivePrimedTNT> extends EntityRe
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));
Block block = (i / 5 % 2 == 0) ? pEntity.renderBlockBeneath(): pEntity.renderBlock();
TntMinecartRenderer.renderWhiteSolidBlock(this.blockRenderer, block.defaultBlockState(), pPoseStack, pBuffer, pPackedLight, false);
pPoseStack.popPose();

View File

@ -2,7 +2,7 @@ package com.jenny.enhancedexplosives.entities.client;
import com.jenny.enhancedexplosives.entities.arrows.baseArrow;
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;
@ -28,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);

View File

@ -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;

View File

@ -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);

View File

@ -28,7 +28,7 @@ public class entities {
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(10).updateInterval(10).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)

View File

@ -20,7 +20,7 @@ public class dynamite extends basePrimedTNT {
}
public dynamite(EntityType<dynamite> entityType, Level level) {
super(entityType, level, null);
super(entityType, level);
}
@Override
@ -31,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));
}
@ -57,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() {

View File

@ -1,6 +1,7 @@
package com.jenny.enhancedexplosives.entities.tnt;
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;
@ -14,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

View File

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

View File

@ -3,10 +3,13 @@ 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;
@ -15,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);
@ -23,30 +26,26 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
private LivingEntity owner;
private int fuse = 0;
public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel, @Nullable LivingEntity owner) {
public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel) {
super(pEntityType, pLevel);
this.blocksBuilding = true;
this.setOwner(owner);
this.fuse = getFuse();
}
public basePrimedTNT(EntityType<? extends basePrimedTNT> pEntityType, @NotNull Level pLevel, @Nullable LivingEntity owner, Vec3 pos, int fuse, float power) {
super(pEntityType, pLevel);
this.blocksBuilding = true;
this.setOwner(owner);
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);
xo = pos.x;
yo = pos.y;
zo = pos.z;
setPos(pos);
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() {
@ -66,6 +65,13 @@ 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) {
if (ConfigClient.tntParticles.get()) {
spawnParticles();
@ -77,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));
}
@ -141,4 +147,12 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
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);
}
}

View File

@ -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();
}

View File

@ -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);
}

View File

@ -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() {

View File

@ -4,6 +4,7 @@ import com.jenny.enhancedexplosives.blocks.blocks;
import com.jenny.enhancedexplosives.config.ConfigClient;
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;
@ -32,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() {
@ -89,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();

View File

@ -2,6 +2,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.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
@ -26,7 +27,7 @@ public class repulsivePrimedTNT extends basePrimedTNT {
}
public repulsivePrimedTNT(EntityType<repulsivePrimedTNT> entityType, Level level) {
super(entityType, level, null);
super(entityType, level);
this.setSpeed(this.getSpeed());
}
@ -52,7 +53,7 @@ public class repulsivePrimedTNT extends basePrimedTNT {
@Override
public void tick() {
for (Entity e : findTargets()) {
e.addDeltaMovement(targetVector(e));
util.addDeltaMovement(e, targetVector(e));
}
super.tick();
}
@ -60,7 +61,7 @@ public class repulsivePrimedTNT extends basePrimedTNT {
@Override
public void explode() {
for (Entity e : findTargets()) {
e.addDeltaMovement(targetVector(e).scale(3));
util.addDeltaMovement(e, targetVector(e).scale(3));
}
super.explode();
}

View File

@ -3,6 +3,7 @@ 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;
@ -34,12 +35,12 @@ 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() {

View File

@ -1,19 +1,16 @@
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, value = Dist.CLIENT)
public class ClientEvents {
@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class eventBusEvents {
@SubscribeEvent
public static void registerParticleFactories(final RegisterParticleProvidersEvent event) {
Minecraft.getInstance().particleEngine.register(particles.CONCUSSIVE_ARROW_PARTICLE.get(),
@ -25,9 +22,4 @@ public class ClientEvents {
Minecraft.getInstance().particleEngine.register(particles.TUNNEL_ARROW_PARTICLE.get(),
ArrowParticle.Provider::new);
}
@SubscribeEvent
public static void onClientSetup(FMLClientSetupEvent event) {
entities.registerRenderers();
}
}

View File

@ -18,15 +18,16 @@ 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> TUNNEL_ARROW = ITEMS.register("arrow_tunnel", () -> new ArrowTunnel(new Item.Properties()));
public static final RegistryObject<Item> DYNAMITE = ITEMS.register("dynamite", () -> new Dynamite(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);

View File

@ -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()));
}
}

View File

@ -1,36 +1,64 @@
modLoader = "javafml"
# 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
logoFile = "logo.png"
loaderVersion = "${loader_version_range}"
# 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.
license = "${mod_license}"
issueTrackerURL = "https://git.smthng.de/Jenny/Enhanced-Explosives/issues" #optional
[[mods]]
modId = "${mod_id}"
version = "${mod_version}"
displayName = "${mod_name}"
authors = "${mod_authors}"
displayTest = "MATCH_VERSION"
# 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)
description = '''${mod_description}'''
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
[[dependencies."${mod_id}"]] #optional
modId = "forge"
mandatory = true
versionRange = "${forge_version_range}"
# 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
ordering = "NONE"
side = "BOTH"
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
side = "BOTH"# Here's another dependency
[[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"

View File

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

View File

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

View File

@ -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",

View File

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

View File

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

View File

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

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

@ -1,12 +0,0 @@
{
"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"
}
]
}

View File

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