diff --git a/gradle.properties b/gradle.properties index f647263..f0219d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,9 +32,9 @@ mapping_channel=parchment mapping_version=1.20.1 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. -mod_id=compressedtnt +mod_id=enhancedexplosives # The human-readable display name for the mod. -mod_name=Compressed TNT +mod_name=Enhanced Explosives # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ diff --git a/settings.gradle b/settings.gradle index a8eaa67..4e2cabf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,4 +13,4 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } -rootProject.name = 'compressedtnt' +rootProject.name = 'enhancedexplosives' diff --git a/src/main/java/com/jenny/compressedtnt/Compressedtnt.java b/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java similarity index 84% rename from src/main/java/com/jenny/compressedtnt/Compressedtnt.java rename to src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java index 327e0c9..a8350a1 100644 --- a/src/main/java/com/jenny/compressedtnt/Compressedtnt.java +++ b/src/main/java/com/jenny/enhancedexplosives/EnhancedExplosives.java @@ -1,8 +1,8 @@ -package com.jenny.compressedtnt; +package com.jenny.enhancedexplosives; -import com.jenny.compressedtnt.blocks.blocks; -import com.jenny.compressedtnt.entities.entities; -import com.jenny.compressedtnt.items.items; +import com.jenny.enhancedexplosives.blocks.blocks; +import com.jenny.enhancedexplosives.entities.entities; +import com.jenny.enhancedexplosives.items.items; import com.mojang.logging.LogUtils; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; @@ -16,15 +16,15 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; // The value here should match an entry in the META-INF/mods.toml file -@Mod(Compressedtnt.MODID) -public class Compressedtnt { +@Mod(EnhancedExplosives.MODID) +public class EnhancedExplosives { // Define mod id in a common place for everything to reference - public static final String MODID = "compressedtnt"; + public static final String MODID = "enhancedexplosives"; // Directly reference a slf4j logger private static final Logger LOGGER = LogUtils.getLogger(); - public Compressedtnt() { + public EnhancedExplosives() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(this::commonSetup); diff --git a/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/ClusterTNTBlock.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/ClusterTNTBlock.java index 81a6f7e..d94a575 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/ClusterTNTBlock.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.ClusterPrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.ClusterPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/blackHoleTNTBlock.java similarity index 95% rename from src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/blackHoleTNTBlock.java index b3bc771..9be0bed 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/blackHoleTNTBlock.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.blackHolePrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.blackHolePrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/blocks.java b/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/blocks/blocks.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java index 0e53ca1..788b1a1 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/blocks.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/blocks.java @@ -1,8 +1,7 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.items.BlockItemTooltip; +import com.jenny.enhancedexplosives.items.BlockItemTooltip; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; @@ -12,7 +11,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class blocks { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); diff --git a/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/claymoreTNTBlock.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/claymoreTNTBlock.java index 37c053a..2e6cfe4 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/claymoreTNTBlock.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.claymorePrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.claymorePrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/homingTNTBlock.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/homingTNTBlock.java index f97a173..88da7fa 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/homingTNTBlock.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.homingPrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.homingPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/selectiveTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/selectiveTNTBlock.java similarity index 93% rename from src/main/java/com/jenny/compressedtnt/blocks/selectiveTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/selectiveTNTBlock.java index daf853c..2cfe66a 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/selectiveTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/selectiveTNTBlock.java @@ -1,7 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.selectivePrimedTNT; -import com.jenny.compressedtnt.entities.tnt.StrongerPrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.selectivePrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java b/src/main/java/com/jenny/enhancedexplosives/blocks/strongerTNTBlock.java similarity index 95% rename from src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java rename to src/main/java/com/jenny/enhancedexplosives/blocks/strongerTNTBlock.java index b742df4..6d28eb4 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java +++ b/src/main/java/com/jenny/enhancedexplosives/blocks/strongerTNTBlock.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.blocks; +package com.jenny.enhancedexplosives.blocks; -import com.jenny.compressedtnt.entities.tnt.StrongerPrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.StrongerPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/creativeTab.java b/src/main/java/com/jenny/enhancedexplosives/creativeTab.java similarity index 74% rename from src/main/java/com/jenny/compressedtnt/creativeTab.java rename to src/main/java/com/jenny/enhancedexplosives/creativeTab.java index b5f897f..cec9fd7 100644 --- a/src/main/java/com/jenny/compressedtnt/creativeTab.java +++ b/src/main/java/com/jenny/enhancedexplosives/creativeTab.java @@ -1,7 +1,7 @@ -package com.jenny.compressedtnt; +package com.jenny.enhancedexplosives; -import com.jenny.compressedtnt.blocks.blocks; -import com.jenny.compressedtnt.items.items; +import com.jenny.enhancedexplosives.blocks.blocks; +import com.jenny.enhancedexplosives.items.items; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; @@ -11,11 +11,11 @@ import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class creativeTab { public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); - public static final RegistryObject CREATIVE_TAB = CREATIVE_MODE_TABS.register("compressedtnt", () -> CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> blocks.TNT_8_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> { + public static final RegistryObject CREATIVE_TAB = CREATIVE_MODE_TABS.register("enhancedexplosives", () -> CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> blocks.TNT_8_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> { output.accept(blocks.TNT_8.get()); output.accept(blocks.TNT_16.get()); output.accept(blocks.TNT_32.get()); @@ -32,7 +32,7 @@ public class creativeTab { output.accept(items.CONCUSSIVE_ARROW.get()); output.accept(items.CARPET_ARROW.get()); output.accept(items.DYNAMITE.get()); - }).title(Component.literal("Compressed TNT")).build()); + }).title(Component.literal("Enhanced Explosives")).build()); public static void register(IEventBus bus) { CREATIVE_MODE_TABS.register(bus); diff --git a/src/main/java/com/jenny/compressedtnt/datagen/DataGenerators.java b/src/main/java/com/jenny/enhancedexplosives/datagen/DataGenerators.java similarity index 90% rename from src/main/java/com/jenny/compressedtnt/datagen/DataGenerators.java rename to src/main/java/com/jenny/enhancedexplosives/datagen/DataGenerators.java index 1bc0aea..2f572cc 100644 --- a/src/main/java/com/jenny/compressedtnt/datagen/DataGenerators.java +++ b/src/main/java/com/jenny/enhancedexplosives/datagen/DataGenerators.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.datagen; +package com.jenny.enhancedexplosives.datagen; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.Mod; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class DataGenerators { diff --git a/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java b/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java rename to src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java index 0fb13db..db90a00 100644 --- a/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.datagen; +package com.jenny.enhancedexplosives.datagen; -import com.jenny.compressedtnt.blocks.blocks; +import com.jenny.enhancedexplosives.blocks.blocks; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -11,9 +11,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.client.model.generators.ModelFile; -import org.jetbrains.annotations.NotNull; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class ModBlockStateProvider extends BlockStateProvider { public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { diff --git a/src/main/java/com/jenny/compressedtnt/datagen/ModItemModelProvider.java b/src/main/java/com/jenny/enhancedexplosives/datagen/ModItemModelProvider.java similarity index 86% rename from src/main/java/com/jenny/compressedtnt/datagen/ModItemModelProvider.java rename to src/main/java/com/jenny/enhancedexplosives/datagen/ModItemModelProvider.java index 5c84faf..aa2c0b5 100644 --- a/src/main/java/com/jenny/compressedtnt/datagen/ModItemModelProvider.java +++ b/src/main/java/com/jenny/enhancedexplosives/datagen/ModItemModelProvider.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.datagen; +package com.jenny.enhancedexplosives.datagen; -import com.jenny.compressedtnt.items.items; +import com.jenny.enhancedexplosives.items.items; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -10,7 +10,7 @@ import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.RegistryObject; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class ModItemModelProvider extends ItemModelProvider { public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { diff --git a/src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java similarity index 99% rename from src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java rename to src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java index acf7601..6b56e2a 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.entities.arrows; +package com.jenny.enhancedexplosives.entities.arrows; import com.google.common.collect.Sets; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/jenny/compressedtnt/entities/arrows/carpetArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java similarity index 91% rename from src/main/java/com/jenny/compressedtnt/entities/arrows/carpetArrow.java rename to src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java index a7593c0..da86380 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/arrows/carpetArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java @@ -1,7 +1,7 @@ -package com.jenny.compressedtnt.entities.arrows; +package com.jenny.enhancedexplosives.entities.arrows; -import com.jenny.compressedtnt.entities.entities; -import com.jenny.compressedtnt.items.items; +import com.jenny.enhancedexplosives.entities.entities; +import com.jenny.enhancedexplosives.items.items; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/jenny/compressedtnt/entities/arrows/concussiveArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java similarity index 84% rename from src/main/java/com/jenny/compressedtnt/entities/arrows/concussiveArrow.java rename to src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java index 7f261e3..aeb0fd0 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/arrows/concussiveArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java @@ -1,10 +1,7 @@ -package com.jenny.compressedtnt.entities.arrows; +package com.jenny.enhancedexplosives.entities.arrows; -import com.jenny.compressedtnt.entities.entities; -import com.jenny.compressedtnt.items.items; -import net.minecraft.client.particle.Particle; -import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.core.particles.ParticleType; +import com.jenny.enhancedexplosives.entities.entities; +import com.jenny.enhancedexplosives.items.items; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java similarity index 89% rename from src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java rename to src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java index 33c852b..6e9a22f 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java @@ -1,7 +1,7 @@ -package com.jenny.compressedtnt.entities.arrows; +package com.jenny.enhancedexplosives.entities.arrows; -import com.jenny.compressedtnt.items.items; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.items.items; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java b/src/main/java/com/jenny/enhancedexplosives/entities/client/BaseTNTRenderer.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java rename to src/main/java/com/jenny/enhancedexplosives/entities/client/BaseTNTRenderer.java index 685115a..7342ff7 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/client/BaseTNTRenderer.java @@ -1,7 +1,7 @@ -package com.jenny.compressedtnt.entities.client; +package com.jenny.enhancedexplosives.entities.client; -import com.jenny.compressedtnt.blocks.blocks; -import com.jenny.compressedtnt.entities.tnt.basePrimedTNT; +import com.jenny.enhancedexplosives.blocks.blocks; +import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java b/src/main/java/com/jenny/enhancedexplosives/entities/client/TNTArrowRenderer.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java rename to src/main/java/com/jenny/enhancedexplosives/entities/client/TNTArrowRenderer.java index 5dd0b83..eba020b 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/client/TNTArrowRenderer.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.client; +package com.jenny.enhancedexplosives.entities.client; -import com.jenny.compressedtnt.entities.arrows.baseArrow; +import com.jenny.enhancedexplosives.entities.arrows.baseArrow; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java b/src/main/java/com/jenny/enhancedexplosives/entities/client/clusterTNTRenderer.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java rename to src/main/java/com/jenny/enhancedexplosives/entities/client/clusterTNTRenderer.java index 63c9b80..8142a92 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/client/clusterTNTRenderer.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.client; +package com.jenny.enhancedexplosives.entities.client; -import com.jenny.compressedtnt.entities.tnt.basePrimedTNT; +import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/jenny/compressedtnt/entities/entities.java b/src/main/java/com/jenny/enhancedexplosives/entities/entities.java similarity index 90% rename from src/main/java/com/jenny/compressedtnt/entities/entities.java rename to src/main/java/com/jenny/enhancedexplosives/entities/entities.java index 04d4eea..a770a2f 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/entities.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/entities.java @@ -1,11 +1,11 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.enhancedexplosives.entities; -import com.jenny.compressedtnt.entities.arrows.*; -import com.jenny.compressedtnt.entities.client.BaseTNTRenderer; -import com.jenny.compressedtnt.entities.client.TNTArrowRenderer; -import com.jenny.compressedtnt.entities.client.clusterTNTRenderer; -import com.jenny.compressedtnt.entities.throwable.dynamite; -import com.jenny.compressedtnt.entities.tnt.*; +import com.jenny.enhancedexplosives.entities.arrows.*; +import com.jenny.enhancedexplosives.entities.client.BaseTNTRenderer; +import com.jenny.enhancedexplosives.entities.client.TNTArrowRenderer; +import com.jenny.enhancedexplosives.entities.client.clusterTNTRenderer; +import com.jenny.enhancedexplosives.entities.throwable.dynamite; +import com.jenny.enhancedexplosives.entities.tnt.*; import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.world.entity.EntityType; @@ -15,7 +15,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class entities { public static final DeferredRegister> ENTITY_TYPES = diff --git a/src/main/java/com/jenny/compressedtnt/entities/throwable/dynamite.java b/src/main/java/com/jenny/enhancedexplosives/entities/throwable/dynamite.java similarity index 93% rename from src/main/java/com/jenny/compressedtnt/entities/throwable/dynamite.java rename to src/main/java/com/jenny/enhancedexplosives/entities/throwable/dynamite.java index fa41d26..9441665 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/throwable/dynamite.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/throwable/dynamite.java @@ -1,7 +1,7 @@ -package com.jenny.compressedtnt.entities.throwable; +package com.jenny.enhancedexplosives.entities.throwable; -import com.jenny.compressedtnt.entities.entities; -import com.jenny.compressedtnt.entities.tnt.basePrimedTNT; +import com.jenny.enhancedexplosives.entities.entities; +import com.jenny.enhancedexplosives.entities.tnt.basePrimedTNT; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java similarity index 87% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java index dd5bfc7..5279070 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/StrongerPrimedTNT.java similarity index 91% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/StrongerPrimedTNT.java index 18673be..8d92e50 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/StrongerPrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java similarity index 98% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java index 177e332..734e7ca 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java index 9717443..417d6ae 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java index c69db15..ada7a15 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java index 4595c1e..dbe74de 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/entities/tnt/selectivePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/selectivePrimedTNT.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/entities/tnt/selectivePrimedTNT.java rename to src/main/java/com/jenny/enhancedexplosives/entities/tnt/selectivePrimedTNT.java index 26b4e42..7a9ee02 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/tnt/selectivePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/selectivePrimedTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.entities.tnt; +package com.jenny.enhancedexplosives.entities.tnt; -import com.jenny.compressedtnt.entities.entities; +import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/jenny/compressedtnt/items/ArrowAbstract.java b/src/main/java/com/jenny/enhancedexplosives/items/ArrowAbstract.java similarity index 92% rename from src/main/java/com/jenny/compressedtnt/items/ArrowAbstract.java rename to src/main/java/com/jenny/enhancedexplosives/items/ArrowAbstract.java index 8798c32..9483b73 100644 --- a/src/main/java/com/jenny/compressedtnt/items/ArrowAbstract.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/ArrowAbstract.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public abstract class ArrowAbstract extends ArrowItem { public ArrowAbstract(Item.Properties properties){ diff --git a/src/main/java/com/jenny/compressedtnt/items/ArrowCarpet.java b/src/main/java/com/jenny/enhancedexplosives/items/ArrowCarpet.java similarity index 83% rename from src/main/java/com/jenny/compressedtnt/items/ArrowCarpet.java rename to src/main/java/com/jenny/enhancedexplosives/items/ArrowCarpet.java index 1e57a1d..3168060 100644 --- a/src/main/java/com/jenny/compressedtnt/items/ArrowCarpet.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/ArrowCarpet.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; -import com.jenny.compressedtnt.entities.arrows.carpetArrow; +import com.jenny.enhancedexplosives.entities.arrows.carpetArrow; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/jenny/compressedtnt/items/ArrowConcussive.java b/src/main/java/com/jenny/enhancedexplosives/items/ArrowConcussive.java similarity index 84% rename from src/main/java/com/jenny/compressedtnt/items/ArrowConcussive.java rename to src/main/java/com/jenny/enhancedexplosives/items/ArrowConcussive.java index de11396..ab55b73 100644 --- a/src/main/java/com/jenny/compressedtnt/items/ArrowConcussive.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/ArrowConcussive.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; -import com.jenny.compressedtnt.entities.arrows.concussiveArrow; +import com.jenny.enhancedexplosives.entities.arrows.concussiveArrow; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java b/src/main/java/com/jenny/enhancedexplosives/items/ArrowTNT.java similarity index 85% rename from src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java rename to src/main/java/com/jenny/enhancedexplosives/items/ArrowTNT.java index 1e6fef1..1a74bbd 100644 --- a/src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/ArrowTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; -import com.jenny.compressedtnt.entities.arrows.tntArrow; +import com.jenny.enhancedexplosives.entities.arrows.tntArrow; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/jenny/compressedtnt/items/BlockItemTooltip.java b/src/main/java/com/jenny/enhancedexplosives/items/BlockItemTooltip.java similarity index 91% rename from src/main/java/com/jenny/compressedtnt/items/BlockItemTooltip.java rename to src/main/java/com/jenny/enhancedexplosives/items/BlockItemTooltip.java index aeab272..9e36358 100644 --- a/src/main/java/com/jenny/compressedtnt/items/BlockItemTooltip.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/BlockItemTooltip.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class BlockItemTooltip extends BlockItem { public BlockItemTooltip(Block pBlock, Item.Properties pProperties){ diff --git a/src/main/java/com/jenny/compressedtnt/items/Dynamite.java b/src/main/java/com/jenny/enhancedexplosives/items/Dynamite.java similarity index 91% rename from src/main/java/com/jenny/compressedtnt/items/Dynamite.java rename to src/main/java/com/jenny/enhancedexplosives/items/Dynamite.java index ca26688..3347067 100644 --- a/src/main/java/com/jenny/compressedtnt/items/Dynamite.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/Dynamite.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; -import com.jenny.compressedtnt.entities.throwable.dynamite; +import com.jenny.enhancedexplosives.entities.throwable.dynamite; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class Dynamite extends Item { public Dynamite(Item.Properties pProperties) { diff --git a/src/main/java/com/jenny/compressedtnt/items/items.java b/src/main/java/com/jenny/enhancedexplosives/items/items.java similarity index 89% rename from src/main/java/com/jenny/compressedtnt/items/items.java rename to src/main/java/com/jenny/enhancedexplosives/items/items.java index 3a280d2..908b759 100644 --- a/src/main/java/com/jenny/compressedtnt/items/items.java +++ b/src/main/java/com/jenny/enhancedexplosives/items/items.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.items; +package com.jenny.enhancedexplosives.items; import net.minecraft.world.item.Item; import net.minecraftforge.eventbus.api.IEventBus; @@ -6,7 +6,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import static com.jenny.compressedtnt.Compressedtnt.MODID; +import static com.jenny.enhancedexplosives.EnhancedExplosives.MODID; public class items { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7885f3b..7a1d678 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -26,7 +26,7 @@ displayName = "${mod_name}" #mandatory # 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="compressedtnt.png" #optional +#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 diff --git a/src/main/resources/assets/compressedtnt/lang/en_us.json b/src/main/resources/assets/compressedtnt/lang/en_us.json deleted file mode 100644 index 8d133b3..0000000 --- a/src/main/resources/assets/compressedtnt/lang/en_us.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "block.compressedtnt.tnt_8": "Compressed TNT", - "block.compressedtnt.tnt_16": "Double Compressed TNT", - "block.compressedtnt.tnt_32": "Triple Compressed TNT", - "block.compressedtnt.tnt_64": "Quadruple Compressed TNT", - "block.compressedtnt.tnt_128": "Quintuple Compressed TNT", - "block.compressedtnt.tnt_cluster_2": "2× TNT Cluster", - "block.compressedtnt.tnt_cluster_4": "4× TNT Cluster", - "block.compressedtnt.tnt_cluster_8": "8× TNT Cluster", - "block.compressedtnt.tnt_homing": "Homing TNT", - "block.compressedtnt.tnt_black_hole": "Black Hole TNT", - "block.compressedtnt.tnt_claymore": "Claymore TNT", - "block.compressedtnt.tnt_selective": "Selective TNT", - - "item.compressedtnt.arrow_tnt": "TNT Arrow", - "item.compressedtnt.arrow_concussive": "Concussive Arrow", - "item.compressedtnt.arrow_carpet": "Carpet Bombing Arrow", - "item.compressedtnt.dynamite": "Dynamite", - - "tooltip.compressedtnt.tnt_cluster_2": "splits into 2 small TNTs", - "tooltip.compressedtnt.tnt_cluster_4": "splits into 4 small TNTs", - "tooltip.compressedtnt.tnt_cluster_8": "splits into 8 small TNTs", - "tooltip.compressedtnt.tnt_homing": "follows the closest entity", - "tooltip.compressedtnt.tnt_black_hole": "pulls all entities towards itself", - "tooltip.compressedtnt.tnt_claymore": "throws arrows into all direcctions upon explosion", - "tooltip.compressedtnt.tnt_selective": "only destroys the type of block it explodes on", - - "tooltip.compressedtnt.arrow_tnt": "explodes on impact", - "tooltip.compressedtnt.arrow_concussive": "explodes on impact without block damage", - "tooltip.compressedtnt.arrow_carpet": "splits into multiple TNT arrows when it starts falling", - "tooltip.compressedtnt.dynamite": "TNT, but throwable" -} \ 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 new file mode 100644 index 0000000..1d69fce --- /dev/null +++ b/src/main/resources/assets/enhancedexplosives/lang/en_us.json @@ -0,0 +1,32 @@ +{ + "block.enhancedexplosives.tnt_8": "Compressed TNT", + "block.enhancedexplosives.tnt_16": "Double Compressed TNT", + "block.enhancedexplosives.tnt_32": "Triple Compressed TNT", + "block.enhancedexplosives.tnt_64": "Quadruple Compressed TNT", + "block.enhancedexplosives.tnt_128": "Quintuple Compressed TNT", + "block.enhancedexplosives.tnt_cluster_2": "2× TNT Cluster", + "block.enhancedexplosives.tnt_cluster_4": "4× TNT Cluster", + "block.enhancedexplosives.tnt_cluster_8": "8× TNT Cluster", + "block.enhancedexplosives.tnt_homing": "Homing TNT", + "block.enhancedexplosives.tnt_black_hole": "Black Hole TNT", + "block.enhancedexplosives.tnt_claymore": "Claymore TNT", + "block.enhancedexplosives.tnt_selective": "Selective TNT", + + "item.enhancedexplosives.arrow_tnt": "TNT Arrow", + "item.enhancedexplosives.arrow_concussive": "Concussive Arrow", + "item.enhancedexplosives.arrow_carpet": "Carpet Bombing Arrow", + "item.enhancedexplosives.dynamite": "Dynamite", + + "tooltip.enhancedexplosives.tnt_cluster_2": "splits into 2 small TNTs", + "tooltip.enhancedexplosives.tnt_cluster_4": "splits into 4 small TNTs", + "tooltip.enhancedexplosives.tnt_cluster_8": "splits into 8 small TNTs", + "tooltip.enhancedexplosives.tnt_homing": "follows the closest entity", + "tooltip.enhancedexplosives.tnt_black_hole": "pulls all entities towards itself", + "tooltip.enhancedexplosives.tnt_claymore": "throws arrows into all direcctions upon explosion", + "tooltip.enhancedexplosives.tnt_selective": "only destroys the type of block it explodes on", + + "tooltip.enhancedexplosives.arrow_tnt": "explodes on impact", + "tooltip.enhancedexplosives.arrow_concussive": "explodes on impact without block damage", + "tooltip.enhancedexplosives.arrow_carpet": "splits into multiple TNT arrows when it starts falling", + "tooltip.enhancedexplosives.dynamite": "TNT, but throwable" +} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_128_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_bottom.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_128_bottom.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_bottom.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_128_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_side.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_128_side.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_side.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_128_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_top.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_128_top.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_128_top.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_16_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_bottom.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_16_bottom.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_bottom.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_16_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_side.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_16_side.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_side.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_16_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_top.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_16_top.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_16_top.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_32_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_bottom.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_32_bottom.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_bottom.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_32_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_side.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_32_side.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_side.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_32_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_top.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_32_top.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_32_top.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_64_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_bottom.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_64_bottom.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_bottom.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_64_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_side.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_64_side.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_side.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_64_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_top.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_64_top.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_64_top.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_8_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_bottom.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_8_bottom.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_bottom.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_8_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_side.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_8_side.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_side.png diff --git a/src/main/resources/assets/compressedtnt/textures/block/tnt_8_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_top.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/block/tnt_8_top.png rename to src/main/resources/assets/enhancedexplosives/textures/block/tnt_8_top.png diff --git a/src/main/resources/assets/compressedtnt/textures/item/arrow_concussive.png b/src/main/resources/assets/enhancedexplosives/textures/item/arrow_concussive.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/item/arrow_concussive.png rename to src/main/resources/assets/enhancedexplosives/textures/item/arrow_concussive.png diff --git a/src/main/resources/assets/compressedtnt/textures/item/arrow_tnt.png b/src/main/resources/assets/enhancedexplosives/textures/item/arrow_tnt.png similarity index 100% rename from src/main/resources/assets/compressedtnt/textures/item/arrow_tnt.png rename to src/main/resources/assets/enhancedexplosives/textures/item/arrow_tnt.png diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_4_from_c2.json b/src/main/resources/data/compressedtnt/recipes/tnt_cluster_4_from_c2.json deleted file mode 100644 index 4a7b6e6..0000000 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_4_from_c2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "redstone", - "ingredients":[ - { - "item": "compressedtnt:tnt_cluster_2" - }, - { - "item": "compressedtnt:tnt_cluster_2" - } - ], - "result": { - "item": "compressedtnt:tnt_cluster_4" - } -} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c2.json b/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c2.json deleted file mode 100644 index 33e21c3..0000000 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "redstone", - "ingredients":[ - { - "item": "compressedtnt:tnt_cluster_2" - }, - { - "item": "compressedtnt:tnt_cluster_2" - }, - { - "item": "compressedtnt:tnt_cluster_2" - }, - { - "item": "compressedtnt:tnt_cluster_2" - } - ], - "result": { - "item": "compressedtnt:tnt_cluster_8" - } -} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c4.json b/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c4.json deleted file mode 100644 index 36be2eb..0000000 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8_from_c4.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "redstone", - "ingredients":[ - { - "item": "compressedtnt:tnt_cluster_4" - }, - { - "item": "compressedtnt:tnt_cluster_4" - } - ], - "result": { - "item": "compressedtnt:tnt_cluster_8" - } -} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_128.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_128.json similarity index 77% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_128.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_128.json index 9a43c0b..84a4529 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_128.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_128.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_128" + "name": "enhancedexplosives:tnt_128" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_16.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_16.json similarity index 77% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_16.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_16.json index e154dbb..a502e6d 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_16.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_16.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_16" + "name": "enhancedexplosives:tnt_16" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_32.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_32.json similarity index 77% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_32.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_32.json index f9e55f8..56338c6 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_32.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_32.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_32" + "name": "enhancedexplosives:tnt_32" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_64.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_64.json similarity index 77% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_64.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_64.json index ec60da5..be6c0e3 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_64.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_64.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_64" + "name": "enhancedexplosives:tnt_64" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_8.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_8.json similarity index 78% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_8.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_8.json index a285316..5e54bb8 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_8.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_8.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_8" + "name": "enhancedexplosives:tnt_8" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_black_hole.json similarity index 75% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_black_hole.json index 4106567..7b5e206 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_black_hole.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_black_hole" + "name": "enhancedexplosives:tnt_black_hole" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_2.json similarity index 75% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_2.json index d403915..e595517 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_2.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_cluster_2" + "name": "enhancedexplosives:tnt_cluster_2" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_4.json similarity index 75% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_4.json index 4c37d9d..f9644d4 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_4.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_cluster_4" + "name": "enhancedexplosives:tnt_cluster_4" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_8.json similarity index 75% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_8.json index f4ce1c4..e719235 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_cluster_8.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_cluster_8" + "name": "enhancedexplosives:tnt_cluster_8" } ] } diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_homing.json similarity index 76% rename from src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json rename to src/main/resources/data/enhancedexplosives/loot_tables/tnt_homing.json index 4031710..a34b0d8 100644 --- a/src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json +++ b/src/main/resources/data/enhancedexplosives/loot_tables/tnt_homing.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "compressedtnt:tnt_homing" + "name": "enhancedexplosives:tnt_homing" } ] } diff --git a/src/main/resources/data/compressedtnt/recipes/arrow_concussive.json b/src/main/resources/data/enhancedexplosives/recipes/arrow_concussive.json similarity index 66% rename from src/main/resources/data/compressedtnt/recipes/arrow_concussive.json rename to src/main/resources/data/enhancedexplosives/recipes/arrow_concussive.json index 893c6d1..984de32 100644 --- a/src/main/resources/data/compressedtnt/recipes/arrow_concussive.json +++ b/src/main/resources/data/enhancedexplosives/recipes/arrow_concussive.json @@ -3,13 +3,13 @@ "category": "redstone", "ingredients":[ { - "item": "compressedtnt:arrow_tnt" + "item": "enhancedexplosives:arrow_tnt" }, { "item": "minecraft:water_bucket" } ], "result": { - "item": "compressedtnt:arrow_tnt" + "item": "enhancedexplosives:arrow_tnt" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/arrow_tnt.json b/src/main/resources/data/enhancedexplosives/recipes/arrow_tnt.json similarity index 82% rename from src/main/resources/data/compressedtnt/recipes/arrow_tnt.json rename to src/main/resources/data/enhancedexplosives/recipes/arrow_tnt.json index 88e7e17..aa73b51 100644 --- a/src/main/resources/data/compressedtnt/recipes/arrow_tnt.json +++ b/src/main/resources/data/enhancedexplosives/recipes/arrow_tnt.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "compressedtnt:arrow_tnt" + "item": "enhancedexplosives:arrow_tnt" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_128.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_128.json similarity index 67% rename from src/main/resources/data/compressedtnt/recipes/tnt_128.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_128.json index 3dcc141..bcbeac1 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_128.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_128.json @@ -8,10 +8,10 @@ ], "key": { "A": { - "item": "compressedtnt:tnt_64" + "item": "enhancedexplosives:tnt_64" } }, "result": { - "item": "compressedtnt:tnt_128" + "item": "enhancedexplosives:tnt_128" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_16.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_16.json similarity index 67% rename from src/main/resources/data/compressedtnt/recipes/tnt_16.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_16.json index c3ffb98..dde40b9 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_16.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_16.json @@ -8,10 +8,10 @@ ], "key": { "A": { - "item": "compressedtnt:tnt_8" + "item": "enhancedexplosives:tnt_8" } }, "result": { - "item": "compressedtnt:tnt_16" + "item": "enhancedexplosives:tnt_16" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_32.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_32.json similarity index 67% rename from src/main/resources/data/compressedtnt/recipes/tnt_32.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_32.json index 5e9853c..c439353 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_32.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_32.json @@ -8,10 +8,10 @@ ], "key": { "A": { - "item": "compressedtnt:tnt_16" + "item": "enhancedexplosives:tnt_16" } }, "result": { - "item": "compressedtnt:tnt_32" + "item": "enhancedexplosives:tnt_32" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_64.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_64.json similarity index 67% rename from src/main/resources/data/compressedtnt/recipes/tnt_64.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_64.json index 1c61728..c39c6de 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_64.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_64.json @@ -8,10 +8,10 @@ ], "key": { "A": { - "item": "compressedtnt:tnt_32" + "item": "enhancedexplosives:tnt_32" } }, "result": { - "item": "compressedtnt:tnt_64" + "item": "enhancedexplosives:tnt_64" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_8.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_8.json similarity index 83% rename from src/main/resources/data/compressedtnt/recipes/tnt_8.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_8.json index d6205b6..55668c9 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_8.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_8.json @@ -12,6 +12,6 @@ } }, "result": { - "item": "compressedtnt:tnt_8" + "item": "enhancedexplosives:tnt_8" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_black_hole.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_black_hole.json similarity index 81% rename from src/main/resources/data/compressedtnt/recipes/tnt_black_hole.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_black_hole.json index 23dd4ca..cc4c127 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_black_hole.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_black_hole.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "compressedtnt:tnt_black_hole" + "item": "enhancedexplosives:tnt_black_hole" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_claymore.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_claymore.json similarity index 91% rename from src/main/resources/data/compressedtnt/recipes/tnt_claymore.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_claymore.json index 261b132..b36aa68 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_claymore.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_claymore.json @@ -31,6 +31,6 @@ } ], "result": { - "item": "compressedtnt:tnt_claymore" + "item": "enhancedexplosives:tnt_claymore" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_2.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_2.json similarity index 80% rename from src/main/resources/data/compressedtnt/recipes/tnt_cluster_2.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_2.json index dd54182..30f8b38 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_2.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_2.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "compressedtnt:tnt_cluster_2" + "item": "enhancedexplosives:tnt_cluster_2" } } \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_4.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4.json similarity index 85% rename from src/main/resources/data/compressedtnt/recipes/tnt_cluster_4.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4.json index 94e3946..2573f0c 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_4.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4.json @@ -16,6 +16,6 @@ } ], "result": { - "item": "compressedtnt:tnt_cluster_4" + "item": "enhancedexplosives:tnt_cluster_4" } } \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4_from_c2.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4_from_c2.json new file mode 100644 index 0000000..cb3446c --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_4_from_c2.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "ingredients":[ + { + "item": "enhancedexplosives:tnt_cluster_2" + }, + { + "item": "enhancedexplosives:tnt_cluster_2" + } + ], + "result": { + "item": "enhancedexplosives:tnt_cluster_4" + } +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8.json similarity index 90% rename from src/main/resources/data/compressedtnt/recipes/tnt_cluster_8.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8.json index 4867bb7..546085c 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_cluster_8.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8.json @@ -28,6 +28,6 @@ } ], "result": { - "item": "compressedtnt:tnt_cluster_8" + "item": "enhancedexplosives:tnt_cluster_8" } } \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c2.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c2.json new file mode 100644 index 0000000..2147ab4 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c2.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "ingredients":[ + { + "item": "enhancedexplosives:tnt_cluster_2" + }, + { + "item": "enhancedexplosives:tnt_cluster_2" + }, + { + "item": "enhancedexplosives:tnt_cluster_2" + }, + { + "item": "enhancedexplosives:tnt_cluster_2" + } + ], + "result": { + "item": "enhancedexplosives:tnt_cluster_8" + } +} \ No newline at end of file diff --git a/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c4.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c4.json new file mode 100644 index 0000000..09359e4 --- /dev/null +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_cluster_8_from_c4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "ingredients":[ + { + "item": "enhancedexplosives:tnt_cluster_4" + }, + { + "item": "enhancedexplosives:tnt_cluster_4" + } + ], + "result": { + "item": "enhancedexplosives:tnt_cluster_8" + } +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/recipes/tnt_homing.json b/src/main/resources/data/enhancedexplosives/recipes/tnt_homing.json similarity index 82% rename from src/main/resources/data/compressedtnt/recipes/tnt_homing.json rename to src/main/resources/data/enhancedexplosives/recipes/tnt_homing.json index f06d4b5..a35b080 100644 --- a/src/main/resources/data/compressedtnt/recipes/tnt_homing.json +++ b/src/main/resources/data/enhancedexplosives/recipes/tnt_homing.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "compressedtnt:tnt_homing" + "item": "enhancedexplosives:tnt_homing" } } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/arrows.json b/src/main/resources/data/minecraft/tags/items/arrows.json index d8bd5cb..4e18218 100644 --- a/src/main/resources/data/minecraft/tags/items/arrows.json +++ b/src/main/resources/data/minecraft/tags/items/arrows.json @@ -1,7 +1,7 @@ { "values": [ - "compressedtnt:arrow_tnt", - "compressedtnt:arrow_concussive", - "compressedtnt:arrow_carpet" + "enhancedexplosives:arrow_tnt", + "enhancedexplosives:arrow_concussive", + "enhancedexplosives:arrow_carpet" ] } \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 554b712..42545b2 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "compressedtnt resources", + "description": "enhancedexplosives resources", "pack_format": 15 } }