1.2.3

Insane96 · Sep 3, 2022 · 23f0542 · 23f0542
1 parent 35d0601
commit 23f0542
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3
+* Increased projectile speed and knockback with Recoil
+* Ablaze now sets blocked projectiles on fire
+
 ## 1.2.2
 * Reduced shield bash bounding box
 * Fixed Shield Bash working without the enchantment

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mc_version=1.18.2
-mod_version=1.2.2
+mod_version=1.2.3
 lib_version=1.5.1
 mixin_version=0.8.5
 forge_version=40.1.60
diff --git a/...main/java/com/insane96mcp/shieldsplus/world/item/enchantment/ShieldAblazeEnchantment.java b/...main/java/com/insane96mcp/shieldsplus/world/item/enchantment/ShieldAblazeEnchantment.java
@@ -2,6 +2,7 @@
 
 import com.insane96mcp.shieldsplus.setup.SPEnchantments;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
@@ -36,12 +37,12 @@ public boolean canApplyAtEnchantingTable(ItemStack stack) {
 	}
 
 	public static void onBlocked(LivingEntity blockingEntity, DamageSource source) {
-		if (!(source.getDirectEntity() instanceof LivingEntity livingEntity))
-			return;
-		apply(blockingEntity, livingEntity);
+		if (source.getDirectEntity() instanceof LivingEntity livingEntity)
+			apply(blockingEntity, livingEntity);
+		apply(blockingEntity, source.getDirectEntity());
 	}
 
-	public static void apply(LivingEntity attacker, LivingEntity other) {
+	public static void apply(LivingEntity attacker, Entity other) {
 		ItemStack shield = attacker.getUseItem();
 		int ablaze = EnchantmentHelper.getItemEnchantmentLevel(SPEnchantments.ABLAZE.get(), shield);
 		if (ablaze > 0)

diff --git a/...main/java/com/insane96mcp/shieldsplus/world/item/enchantment/ShieldRecoilEnchantment.java b/...main/java/com/insane96mcp/shieldsplus/world/item/enchantment/ShieldRecoilEnchantment.java
@@ -13,8 +13,8 @@
 
 public class ShieldRecoilEnchantment extends Enchantment {
 
-	public static final double KNOCKBACK = 0.4d;
-	public static final double PROJECTILE_KNOCKBACK = 3.5d;
+	public static final double KNOCKBACK = 0.5d;
+	public static final double PROJECTILE_KNOCKBACK = 5d;
 
 	public ShieldRecoilEnchantment() {
 		super(Rarity.UNCOMMON, EnchantmentCategory.BREAKABLE, new EquipmentSlot[]{EquipmentSlot.MAINHAND, EquipmentSlot.OFFHAND});