Compare commits

..

5 Commits

Author SHA1 Message Date
17fe8bbdc6
0.15.0 2025-08-17 11:38:08 +02:00
b6b1dd464f
bedrock tnt & entity tnt 2025-07-10 23:37:37 +02:00
1b2908660a
tmp 2025-07-03 12:15:59 +02:00
2e2b7d0d22
fix crash on dedicated server 2025-06-21 16:54:01 +02:00
40eb6be20f
change map color & entity size of TNTs for vanilla parity 2025-06-13 17:55:49 +02:00
34 changed files with 477 additions and 16 deletions

View File

@ -136,6 +136,8 @@ repositories {
dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
implementation fg.deobf("curse.maven:guidebook-253874:4593765")
implementation fg.deobf("curse.maven:patchouli-306770:4633797")
}
// This block of code expands all declared replace properties in the specified resource targets.
@ -175,9 +177,3 @@ tasks.named('jar', Jar).configure {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}
sourceSets.each {
def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
it.output.resourcesDir = dir
it.java.destinationDirectory = dir
}

View File

@ -1,13 +1,14 @@
# CreateCoredumpOnCrash only works on jdk9+
org.gradle.jvmargs=-Xmx3G -XX:-CreateCoredumpOnCrash
org.gradle.daemon=false
minecraft_version=1.20.3
minecraft_version_range=[1.20.3,1.20.4]
forge_version=49.0.2
forge_version_range=[49,)
loader_version_range=[49,)
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,)
mapping_channel=parchment
mapping_version=2023.12.31-1.20.3
mapping_version=2023.09.03-1.20.1
mod_id=enhancedexplosives
mod_name=Enhanced Explosives

View File

@ -5,6 +5,7 @@ import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.projectile.AbstractArrow;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
@ -13,15 +14,15 @@ public class baseArrow extends AbstractArrow {
private int tick = 0;
public baseArrow(EntityType<? extends baseArrow> pEntityType, Level pLevel) {
super(pEntityType, pLevel, ItemStack.EMPTY);
super(pEntityType, pLevel);
}
public baseArrow(Level pLevel, LivingEntity pShooter, EntityType<? extends baseArrow> pEntityType) {
super(pEntityType, pShooter, pLevel, ItemStack.EMPTY);
super(pEntityType, pShooter, pLevel);
}
public baseArrow(Level pLevel, EntityType<? extends baseArrow> pEntityType) {
super(pEntityType, pLevel, ItemStack.EMPTY);
super(pEntityType, pLevel);
}
public void tick() {
@ -36,7 +37,7 @@ public class baseArrow extends AbstractArrow {
@NotNull
protected ItemStack getPickupItem() {
return ItemStack.EMPTY;
return new ItemStack(Items.ARROW);
}
protected Vec3 particlePos(double dist) {

View File

@ -2,12 +2,15 @@ package com.jenny.enhancedexplosives.entities.arrows;
import com.jenny.enhancedexplosives.config.ConfigClient;
import com.jenny.enhancedexplosives.entities.entities;
import com.jenny.enhancedexplosives.items.items;
import com.jenny.enhancedexplosives.particles.particles;
import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
public class carpetArrow extends baseArrow {
public final int childCount = 32;
@ -44,6 +47,11 @@ public class carpetArrow extends baseArrow {
}
}
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.CARPET_ARROW.get());
}
@Override
public void spawnParticles(float partialTicks) {
for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {

View File

@ -3,11 +3,13 @@ package com.jenny.enhancedexplosives.entities.arrows;
import com.jenny.enhancedexplosives.config.ConfigClient;
import com.jenny.enhancedexplosives.config.ConfigServer;
import com.jenny.enhancedexplosives.entities.entities;
import com.jenny.enhancedexplosives.items.items;
import com.jenny.enhancedexplosives.particles.particles;
import net.minecraft.world.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.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
@ -46,6 +48,11 @@ public class carpetArrowPart extends baseArrow {
return super.hurt(pSource, pAmount) || pSource.is(DamageTypes.EXPLOSION);
}
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.CONCUSSIVE_ARROW.get());
}
@Override
public void spawnParticles(float partialTicks) {
for (int i = 1; i <= ConfigClient.calcPCount(1); i++) {

View File

@ -2,8 +2,10 @@ 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.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.NotNull;
@ -31,4 +33,10 @@ public class claymoreArrow extends baseArrow{
discard();
}
}
@Override
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.CONCUSSIVE_ARROW.get(), 0);
}
}

View File

@ -2,9 +2,11 @@ package com.jenny.enhancedexplosives.entities.arrows;
import com.jenny.enhancedexplosives.config.ConfigClient;
import com.jenny.enhancedexplosives.entities.entities;
import com.jenny.enhancedexplosives.items.items;
import com.jenny.enhancedexplosives.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.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
@ -33,6 +35,11 @@ public class concussiveArrow extends baseArrow{
this.discard();
}
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.CONCUSSIVE_ARROW.get());
}
@Override
public void spawnParticles(float partialTicks) {
for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {

View File

@ -2,9 +2,11 @@ package com.jenny.enhancedexplosives.entities.arrows;
import com.jenny.enhancedexplosives.config.ConfigClient;
import com.jenny.enhancedexplosives.entities.entities;
import com.jenny.enhancedexplosives.items.items;
import com.jenny.enhancedexplosives.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.Level;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
@ -33,6 +35,11 @@ public class tntArrow extends baseArrow {
this.discard();
}
@NotNull
protected ItemStack getPickupItem() {
return new ItemStack(items.TNT_ARROW.get());
}
@Override
public void spawnParticles(float partialTicks) {
for (int i = 1; i <= ConfigClient.calcPCount(5); i++) {

View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1,12 @@
{
"name": "Carpet Bombing Arrow",
"icon": "enhancedexplosives:arrow_carpet",
"category": "enhancedexplosives:arrows",
"pages": [
{
"type": "patchouli:crafting",
"text": "This arrow splits into many explosive arrows as soon as it starts falling. Whether the arrows are concussive or TNT Arrows depends on the config.",
"recipe": "enhancedexplosives:arrow_carpet"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Concussive Arrow",
"icon": "enhancedexplosives:arrow_concussive",
"category": "enhancedexplosives:arrows",
"pages": [
{
"type": "patchouli:crafting",
"text": "This arrow explodes like TNT on impact, but without damaging blocks.",
"recipe": "enhancedexplosives:arrow_concussive"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "TNT Arrow",
"icon": "enhancedexplosives:arrow_tnt",
"category": "enhancedexplosives:arrows",
"pages": [
{
"type": "patchouli:crafting",
"text": "This arrow explodes like TNT on impact.",
"recipe": "enhancedexplosives:arrow_tnt"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Tunnel Arrow",
"icon": "enhancedexplosives:arrow_tunnel",
"category": "enhancedexplosives:arrows",
"pages": [
{
"type": "patchouli:crafting",
"text": "This arrow summons multiple explosions in front of it, along it's direction on impact, forming a tunnel in front.",
"recipe": "enhancedexplosives:arrow_tunnel"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Dynamite",
"icon": "enhancedexplosives:dynamite",
"category": "enhancedexplosives:other",
"pages": [
{
"type": "patchouli:crafting",
"text": "Can be thrown like a splash potion, but bounces on the ground and explodes like a tnt.",
"recipe": "enhancedexplosives:dynamite"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Quintuple Compressed TNT",
"icon": "enhancedexplosives:tnt_128",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT behaves like vanilla TNT, but with 32x the explosion strength.",
"recipe": "enhancedexplosives:tnt_128"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Double Compressed TNT",
"icon": "enhancedexplosives:tnt_16",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT behaves like vanilla TNT, but with 4x the explosion strength.",
"recipe": "enhancedexplosives:tnt_16"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Triple Compressed TNT",
"icon": "enhancedexplosives:tnt_32",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT behaves like vanilla TNT, but with 8x the explosion strength.",
"recipe": "enhancedexplosives:tnt_32"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Quadruple Compressed TNT",
"icon": "enhancedexplosives:tnt_64",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT behaves like vanilla TNT, but with 16x the explosion strength.",
"recipe": "enhancedexplosives:tnt_64"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Compressed TNT",
"icon": "enhancedexplosives:tnt_8",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT behaves like vanilla TNT, but with 2x the explosion strength.",
"recipe": "enhancedexplosives:tnt_8"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Bedrock TNT",
"icon": "enhancedexplosives:tnt_bedrock",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT removes the block below it if it's bedrock.",
"recipe": "enhancedexplosives:tnt_bedrock"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Black Hole TNT",
"icon": "enhancedexplosives:tnt_black_hole",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT pulls entities towards itself.",
"recipe": "enhancedexplosives:tnt_black_hole"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Claymore TNT",
"icon": "enhancedexplosives:tnt_claymore",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT shoots many arrows in a circle around the TNT, instead of exploding.",
"recipe": "enhancedexplosives:tnt_claymore"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "2× TNT Cluster",
"icon": "enhancedexplosives:tnt_cluster_2",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT splits into 2 smaller TNTs when primed",
"recipe": "enhancedexplosives:tnt_cluster_2"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "4× TNT Cluster",
"icon": "enhancedexplosives:tnt_cluster_4",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT splits into 4 smaller TNTs when primed",
"recipe": "enhancedexplosives:tnt_cluster_4"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "8× TNT Cluster",
"icon": "enhancedexplosives:tnt_cluster_8",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT splits into 8 smaller TNTs when primed",
"recipe": "enhancedexplosives:tnt_cluster_8"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Ender TNT",
"icon": "enhancedexplosives:tnt_ender",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT teleports like an enderman when primed.",
"recipe": "enhancedexplosives:tnt_ender"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Entity TNT",
"icon": "enhancedexplosives:tnt_entity",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT does not damage blocks.",
"recipe": "enhancedexplosives:tnt_entity"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Homing TNT",
"icon": "enhancedexplosives:tnt_homing",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT follows the closest mob.",
"recipe": "enhancedexplosives:tnt_homing"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Repulsive TNT",
"icon": "enhancedexplosives:tnt_repulsive",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT pushes close entities away.",
"recipe": "enhancedexplosives:tnt_repulsive"
}
]
}

View File

@ -0,0 +1,12 @@
{
"name": "Selective TNT",
"icon": "enhancedexplosives:tnt_selective",
"category": "enhancedexplosives:tnts",
"pages": [
{
"type": "patchouli:crafting",
"text": "This TNT will only destroy the type of block it is sitting upon when exploding. It will still honour the blocks blast resistance, e.g. it won't destroy bedrock.",
"recipe": "enhancedexplosives:tnt_selective"
}
]
}

View File

@ -0,0 +1,7 @@
{
"name": "EE Manual",
"landing_text": "If you find bugs or have suggestions for improving this mod, please message me on curseforge, my discord, or gitea (link in mod info).",
"version": 1,
"creative_tab": "enhancedexplosives:enhancedexplosives",
"use_resource_pack": true
}