1.20.6 port

build.gradle

@@ -14,7 +14,7 @@ base {
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
 }
 
 minecraft {
@@ -77,12 +77,6 @@ minecraft {
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
         }
 
         client {
@@ -149,6 +143,7 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -188,3 +183,9 @@ 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
+}

gradle.properties

@@ -1,13 +1,12 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-
+minecraft_version=1.20.6
-minecraft_version=1.20.1
+minecraft_version_range=[1.20.6]
-minecraft_version_range=[1.20.1,1.20.2]
+forge_version=50.1.0
-forge_version=47.3.22
+forge_version_range=[50,)
-forge_version_range=[47,)
+loader_version_range=[50,)
-loader_version_range=[47,)
 mapping_channel=parchment
-mapping_version=2023.09.03-1.20.1
+mapping_version=2024.06.16-1.20.6
 
 mod_id=enhancedexplosives
 mod_name=Enhanced Explosives

src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java

@@ -5,7 +5,6 @@ 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;
@@ -14,15 +13,15 @@ public class baseArrow extends AbstractArrow {
     private int tick = 0;
 
     public baseArrow(EntityType<? extends baseArrow> pEntityType, Level pLevel) {
-        super(pEntityType, pLevel);
+        super(pEntityType, pLevel, ItemStack.EMPTY);
     }
 
     public baseArrow(Level pLevel, LivingEntity pShooter, EntityType<? extends baseArrow> pEntityType) {
-        super(pEntityType, pShooter, pLevel);
+        super(pEntityType, pShooter, pLevel, ItemStack.EMPTY);
     }
 
     public baseArrow(Level pLevel, EntityType<? extends baseArrow> pEntityType) {
-        super(pEntityType, pLevel);
+        super(pEntityType, pLevel, ItemStack.EMPTY);
     }
 
     public void tick() {
@@ -37,7 +36,12 @@ public class baseArrow extends AbstractArrow {
 
     @NotNull
     protected ItemStack getPickupItem() {
-        return new ItemStack(Items.ARROW);
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    protected ItemStack getDefaultPickupItem() {
+        return ItemStack.EMPTY;
     }
 
     protected Vec3 particlePos(double dist) {

src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java

@@ -2,15 +2,12 @@ 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;
@@ -47,11 +44,6 @@ 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++) {

src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrowPart.java

@@ -3,13 +3,11 @@ 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;
@@ -48,11 +46,6 @@ 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++) {

src/main/java/com/jenny/enhancedexplosives/entities/arrows/claymoreArrow.java

@@ -2,10 +2,8 @@ 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;
 
@@ -33,10 +31,4 @@ public class claymoreArrow extends baseArrow{
             discard();
         }
     }
-
-    @Override
-    @NotNull
-    protected ItemStack getPickupItem() {
-        return new ItemStack(items.CONCUSSIVE_ARROW.get(), 0);
-    }
 }

src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java

@@ -2,11 +2,9 @@ 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;
@@ -35,11 +33,6 @@ 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++) {

src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java

@@ -2,11 +2,9 @@ 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;
@@ -35,11 +33,6 @@ 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++) {

src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java

@@ -102,9 +102,10 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
         return MovementEmission.NONE;
     }
 
-    protected void defineSynchedData() {
+    @Override
-        this.entityData.define(DATA_FUSE_ID, 80);
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {
-        this.entityData.define(DATA_POWER_ID, 4.0f);
+        builder.define(DATA_FUSE_ID, 80);
+        builder.define(DATA_POWER_ID, 4.0f);
     }
 
     protected void addAdditionalSaveData(CompoundTag pCompound) {

src/main/java/com/jenny/enhancedexplosives/entities/tnt/blackHolePrimedTNT.java

@@ -6,11 +6,14 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -83,9 +86,9 @@ public class blackHolePrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    protected void defineSynchedData() {
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {
-        this.entityData.define(DATA_SPEED_ID, 4.0f);
+        builder.define(DATA_SPEED_ID, 4.0f);
-        super.defineSynchedData();
+        super.defineSynchedData(builder);
     }
 
     @Override

src/main/java/com/jenny/enhancedexplosives/entities/tnt/claymorePrimedTNT.java

@@ -14,6 +14,7 @@ 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 org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 
@@ -72,9 +73,9 @@ public class claymorePrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    protected void defineSynchedData() {
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {
-        this.entityData.define(DATA_PCOUNT_ID, 16);
+        builder.define(DATA_PCOUNT_ID, 16);
-        super.defineSynchedData();
+        super.defineSynchedData(builder);
     }
 
     @Override

src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java

@@ -16,6 +16,7 @@ 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;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -116,9 +117,9 @@ public class homingPrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    protected void defineSynchedData() {
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {
-        this.entityData.define(DATA_SPEED_ID, 4.0f);
+        builder.define(DATA_SPEED_ID, 4.0f);
-        super.defineSynchedData();
+        super.defineSynchedData(builder);
     }
 
     @Override

src/main/java/com/jenny/enhancedexplosives/entities/tnt/repulsivePrimedTNT.java

@@ -13,6 +13,7 @@ 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;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -86,9 +87,9 @@ public class repulsivePrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    protected void defineSynchedData() {
+    protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {
-        this.entityData.define(DATA_SPEED_ID, 4.0f);
+        builder.define(DATA_SPEED_ID, 4.0f);
-        super.defineSynchedData();
+        super.defineSynchedData(builder);
     }
 
     @Override

src/main/java/com/jenny/enhancedexplosives/items/ArrowAbstract.java

@@ -11,7 +11,6 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -23,12 +22,12 @@ public abstract class ArrowAbstract extends ArrowItem {
     }
 
     @Override
-    public void appendHoverText(@NotNull ItemStack pStack, @Nullable Level pLevel, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pIsAdvanced) {
+    public void appendHoverText(@NotNull ItemStack pStack, @NotNull TooltipContext pContext, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pTooltipFlag) {
         String key = String.format("tooltip.%s.%s", MODID, this);
         MutableComponent toolTip = Component.translatable(key);
         if (!toolTip.getString().equals(key)) {
             pTooltipComponents.add(toolTip.withStyle(ChatFormatting.DARK_BLUE));
-            super.appendHoverText(pStack, pLevel, pTooltipComponents, pIsAdvanced);
+            super.appendHoverText(pStack, pContext, pTooltipComponents, pTooltipFlag);
         }
     }
 

src/main/java/com/jenny/enhancedexplosives/items/BlockItemTooltip.java

@@ -7,10 +7,8 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -22,12 +20,12 @@ public class BlockItemTooltip extends BlockItem {
     }
 
     @Override
-    public void appendHoverText(@NotNull ItemStack pStack, @Nullable Level pLevel, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pIsAdvanced) {
+    public void appendHoverText(@NotNull ItemStack pStack, @NotNull TooltipContext pContext, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pTooltipFlag) {
         String key = String.format("tooltip.%s.%s", MODID, this);
         MutableComponent toolTip = Component.translatable(key);
         if (!toolTip.getString().equals(key)) {
             pTooltipComponents.add(toolTip.withStyle(ChatFormatting.DARK_BLUE));
-            super.appendHoverText(pStack, pLevel, pTooltipComponents, pIsAdvanced);
+            super.appendHoverText(pStack, pContext, pTooltipComponents, pTooltipFlag);
         }
     }
 }

src/main/java/com/jenny/enhancedexplosives/items/Dynamite.java

@@ -13,7 +13,6 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -43,12 +42,12 @@ public class Dynamite extends Item {
     }
 
     @Override
-    public void appendHoverText(@NotNull ItemStack pStack, @Nullable Level pLevel, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pIsAdvanced) {
+    public void appendHoverText(@NotNull ItemStack pStack, @NotNull TooltipContext pContext, @NotNull List<Component> pTooltipComponents, @NotNull TooltipFlag pTooltipFlag) {
         String key = String.format("tooltip.%s.%s", MODID, this);
         MutableComponent toolTip = Component.translatable(key);
         if (!toolTip.getString().equals(key)) {
             pTooltipComponents.add(toolTip.withStyle(ChatFormatting.DARK_BLUE));
-            super.appendHoverText(pStack, pLevel, pTooltipComponents, pIsAdvanced);
+            super.appendHoverText(pStack, pContext, pTooltipComponents, pTooltipFlag);
         }
     }
 }

src/main/java/com/jenny/enhancedexplosives/items/items.java

@@ -1,16 +1,18 @@
 package com.jenny.enhancedexplosives.items;
 
-import com.jenny.enhancedexplosives.entities.arrows.baseArrow;
 import com.jenny.enhancedexplosives.entities.entities;
+import net.minecraft.core.Direction;
 import net.minecraft.core.Position;
-import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior;
+import net.minecraft.core.dispenser.BlockSource;
+import net.minecraft.core.dispenser.DefaultDispenseItemBehavior;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.entity.projectile.Projectile;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ProjectileItem;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.DispenserBlock;
+import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -33,26 +35,38 @@ public class items {
     }
 
     public static void registerDispenser() {
-        class ArrowDispenseBehaviour extends AbstractProjectileDispenseBehavior {
+        class ArrowDispenseBehaviour extends DefaultDispenseItemBehavior {
-            private final EntityType<? extends baseArrow> arrowType;
+            private final ArrowAbstract.DispenseConfig dispenseConfig;
+            private final EntityType<? extends Entity> arrowType;
 
-            public ArrowDispenseBehaviour(EntityType<? extends baseArrow> arrow) {
+            public ArrowDispenseBehaviour(@NotNull ProjectileItem arrowItem, EntityType<? extends Entity> arrow) {
+                this.dispenseConfig = arrowItem.createDispenseConfig();
                 this.arrowType = arrow;
             }
 
             @Override
-            protected @NotNull Projectile getProjectile(@NotNull Level pLevel, @NotNull Position pPosition, @NotNull ItemStack pStack) {
+            public @NotNull ItemStack execute(@NotNull BlockSource pBlockSource, @NotNull ItemStack pItem) {
-                baseArrow arrow = arrowType.create(pLevel);
+                Level level = pBlockSource.level();
-                assert arrow != null;
+                Direction dir = pBlockSource.state().getValue(DispenserBlock.FACING);
-                arrow.setPos(pPosition.x(), pPosition.y(), pPosition.z());
+                Position pos = this.dispenseConfig.positionFunction().getDispensePosition(pBlockSource, dir);
-                arrow.pickup = AbstractArrow.Pickup.ALLOWED;
+
-                return arrow;
+                Entity arrowEntity = arrowType.create(level);
+                assert arrowEntity != null;
+                arrowEntity.setPos(new Vec3(pos.x(), pos.y(), pos.z()));
+                arrowEntity.setDeltaMovement(dir.getStepX(), dir.getStepY(), dir.getStepZ());
+                level.addFreshEntity(arrowEntity);
+                pItem.shrink(1);
+                return pItem;
             }
         }
 
-        DispenserBlock.registerBehavior(TNT_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_TNT.get()));
+        DispenserBlock.registerBehavior(TNT_ARROW.get(), new ArrowDispenseBehaviour(
-        DispenserBlock.registerBehavior(CONCUSSIVE_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_CONCUSSIVE.get()));
+                (ArrowAbstract) TNT_ARROW.get(), entities.ARROW_TNT.get()));
-        DispenserBlock.registerBehavior(CARPET_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_CARPET.get()));
+        DispenserBlock.registerBehavior(CONCUSSIVE_ARROW.get(), new ArrowDispenseBehaviour(
-        DispenserBlock.registerBehavior(TUNNEL_ARROW.get(), new ArrowDispenseBehaviour(entities.ARROW_TUNNEL.get()));
+                (ArrowAbstract) TNT_ARROW.get(), entities.ARROW_CONCUSSIVE.get()));
+        DispenserBlock.registerBehavior(CARPET_ARROW.get(), new ArrowDispenseBehaviour(
+                (ArrowAbstract) CARPET_ARROW.get(), entities.ARROW_CARPET.get()));
+        DispenserBlock.registerBehavior(TUNNEL_ARROW.get(), new ArrowDispenseBehaviour(
+                (ArrowAbstract) TUNNEL_ARROW.get(), entities.ARROW_TUNNEL.get()));
     }
 }