diff --git a/gradle.properties b/gradle.properties index 4d4fa1f..98bd826 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ mod_name=Enhanced Explosives # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.8.4 +mod_version=0.8.5 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/jenny/enhancedexplosives/config/ConfigClient.java b/src/main/java/com/jenny/enhancedexplosives/config/ConfigClient.java index bafef92..2c59d0f 100644 --- a/src/main/java/com/jenny/enhancedexplosives/config/ConfigClient.java +++ b/src/main/java/com/jenny/enhancedexplosives/config/ConfigClient.java @@ -12,7 +12,7 @@ public class ConfigClient { private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); private static final ForgeConfigSpec.ConfigValue C_ARROW_PARTICLES = - BUILDER.comment("weather to spawn client-side particles for arrows") + BUILDER.comment("whether to spawn client-side particles for arrows") .define("arrowParticles", true); private static final ForgeConfigSpec.ConfigValue C_TNT_PARTICLES = diff --git a/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java b/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java index b3afe0c..519dc1d 100644 --- a/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/jenny/enhancedexplosives/datagen/ModBlockStateProvider.java @@ -27,6 +27,8 @@ public class ModBlockStateProvider extends BlockStateProvider { sideTopBottom(blocks.TNT_64.get()); sideTopBottom(blocks.TNT_128.get()); sideTopBottom(blocks.TNT_ENDER.get()); + sideTopBottom(blocks.TNT_CLAYMORE.get()); + blockWithItem(blocks.TNT_BLACK_HOLE); } private void blockWithItem(RegistryObject blockRegistryObject) { diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java index f89f74d..c475c77 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java @@ -1,5 +1,6 @@ package com.jenny.enhancedexplosives.entities.tnt; +import com.jenny.enhancedexplosives.blocks.blocks; import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -7,6 +8,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.world.entity.*; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -85,4 +87,9 @@ public class blackHolePrimedTNT extends basePrimedTNT { this.entityData.define(DATA_SPEED_ID, 4.0f); super.defineSynchedData(); } + + @Override + public Block renderBlock() { + return blocks.TNT_BLACK_HOLE.get(); + } } diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java index f8a7085..4a92153 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java @@ -1,5 +1,6 @@ package com.jenny.enhancedexplosives.entities.tnt; +import com.jenny.enhancedexplosives.blocks.blocks; import com.jenny.enhancedexplosives.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -11,6 +12,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.Arrow; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.Vec3; import javax.annotation.Nullable; @@ -73,4 +75,9 @@ public class claymorePrimedTNT extends basePrimedTNT { this.entityData.define(DATA_PCOUNT_ID, 16); super.defineSynchedData(); } + + @Override + public Block renderBlock() { + return blocks.TNT_CLAYMORE.get(); + } } diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png new file mode 100644 index 0000000..4943dab Binary files /dev/null and b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png differ diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png.mcmeta b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png.mcmeta new file mode 100644 index 0000000..e769231 --- /dev/null +++ b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_black_hole.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 1, + "interpolate": true, + "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_bottom.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_bottom.png new file mode 100644 index 0000000..a0194de Binary files /dev/null and b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_bottom.png differ diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_side.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_side.png new file mode 100644 index 0000000..0773bcb Binary files /dev/null and b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_side.png differ diff --git a/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_top.png b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_top.png new file mode 100644 index 0000000..9e21a85 Binary files /dev/null and b/src/main/resources/assets/enhancedexplosives/textures/block/tnt_claymore_top.png differ diff --git a/src/main/resources/assets/enhancedexplosives/textures/item/arrow_carpet.png b/src/main/resources/assets/enhancedexplosives/textures/item/arrow_carpet.png new file mode 100644 index 0000000..54b5544 Binary files /dev/null and b/src/main/resources/assets/enhancedexplosives/textures/item/arrow_carpet.png differ