From dc81f5e8da40f845995945cc826d3f5453e1bc12 Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 12 Feb 2025 14:07:21 +0100 Subject: [PATCH] 1.20.3 port --- build.gradle | 6 ++++++ gradle.properties | 13 ++++++------- .../entities/arrows/baseArrow.java | 9 ++++----- .../entities/arrows/carpetArrow.java | 8 -------- .../entities/arrows/carpetArrowPart.java | 7 ------- .../entities/arrows/claymoreArrow.java | 8 -------- .../entities/arrows/concussiveArrow.java | 7 ------- .../entities/arrows/tntArrow.java | 7 ------- 8 files changed, 16 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index e8a8db2..328f9d0 100644 --- a/build.gradle +++ b/build.gradle @@ -188,3 +188,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 +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9579818..3639828 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,12 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false - -minecraft_version=1.20.1 -minecraft_version_range=[1.20.1,1.20.2] -forge_version=47.3.22 -forge_version_range=[47,) -loader_version_range=[47,) +minecraft_version=1.20.3 +minecraft_version_range=[1.20.3,1.20.4] +forge_version=49.0.2 +forge_version_range=[49,) +loader_version_range=[49,) mapping_channel=parchment -mapping_version=2023.09.03-1.20.1 +mapping_version=2023.12.31-1.20.3 mod_id=enhancedexplosives mod_name=Enhanced Explosives diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java index f0af577..b575f57 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/baseArrow.java +++ b/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 pEntityType, Level pLevel) { - super(pEntityType, pLevel); + super(pEntityType, pLevel, ItemStack.EMPTY); } public baseArrow(Level pLevel, LivingEntity pShooter, EntityType pEntityType) { - super(pEntityType, pShooter, pLevel); + super(pEntityType, pShooter, pLevel, ItemStack.EMPTY); } public baseArrow(Level pLevel, EntityType pEntityType) { - super(pEntityType, pLevel); + super(pEntityType, pLevel, ItemStack.EMPTY); } public void tick() { @@ -37,7 +36,7 @@ public class baseArrow extends AbstractArrow { @NotNull protected ItemStack getPickupItem() { - return new ItemStack(Items.ARROW); + return ItemStack.EMPTY; } protected Vec3 particlePos(double dist) { diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java index 0042c47..2b1943b 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrow.java +++ b/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++) { diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrowPart.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrowPart.java index 32b58b5..f4d2d21 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/carpetArrowPart.java +++ b/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++) { diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/claymoreArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/claymoreArrow.java index edbaf85..5010904 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/claymoreArrow.java +++ b/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); - } } diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java index b829571..bf86b90 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java +++ b/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++) { diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java index e3838fb..f0c3f7c 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java +++ b/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++) {