-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ca9c557
commit 808c3ac
Showing
25 changed files
with
198 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
src/client/java/info/partonetrain/botaniacombat/network/StarcallerAttackHitHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package info.partonetrain.botaniacombat.network; | ||
|
||
import net.bettercombat.api.AttackHand; | ||
import net.bettercombat.api.client.BetterCombatClientEvents; | ||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; | ||
import net.minecraft.client.player.LocalPlayer; | ||
import net.minecraft.world.entity.Entity; | ||
import net.minecraft.world.item.Item; | ||
import net.minecraft.world.item.ItemStack; | ||
import org.jetbrains.annotations.Nullable; | ||
import vazkii.botania.common.item.equipment.tool.StarcallerItem; | ||
|
||
import java.util.List; | ||
|
||
public class StarcallerAttackHitHandler implements BetterCombatClientEvents.PlayerAttackHit { | ||
@Override | ||
public void onPlayerAttackStart(LocalPlayer player, AttackHand attackHand, List<Entity> list, @Nullable Entity entity) { | ||
ItemStack stack = attackHand.isOffHand() ? player.getOffhandItem() : player.getMainHandItem(); | ||
if (stack.isEmpty()) { | ||
return; | ||
} | ||
Item item = stack.getItem(); | ||
if (item instanceof StarcallerItem) { | ||
ClientPlayNetworking.send(new StarcallerHitPacket(attackHand.isOffHand())); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
src/main/java/info/partonetrain/botaniacombat/IStarcaller.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package info.partonetrain.botaniacombat; | ||
|
||
import net.minecraft.world.entity.player.Player; | ||
import net.minecraft.world.item.ItemStack; | ||
import net.minecraft.world.level.Level; | ||
|
||
public interface IStarcaller { | ||
void botaniacombat_summonStarBetterCombat(ItemStack stack, Level level, Player player); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/main/java/info/partonetrain/botaniacombat/mixin/bettercombat/StarcallerItemMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package info.partonetrain.botaniacombat.mixin.bettercombat; | ||
|
||
import info.partonetrain.botaniacombat.IStarcaller; | ||
import net.minecraft.world.entity.player.Player; | ||
import net.minecraft.world.item.ItemStack; | ||
import net.minecraft.world.level.Level; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import vazkii.botania.common.helper.ItemNBTHelper; | ||
import vazkii.botania.common.item.equipment.tool.StarcallerItem; | ||
|
||
@Mixin(StarcallerItem.class) | ||
public class StarcallerItemMixin implements IStarcaller { //StarcallerItem will implement IStarcaller | ||
@Shadow(remap = false) //summonFallingStar is private for some reason | ||
private void summonFallingStar(ItemStack stack, Level world, Player player) {} | ||
@Override | ||
public void botaniacombat_summonStarBetterCombat(ItemStack stack, Level level, Player player){ | ||
long timeSinceLast = level.getGameTime() - ItemNBTHelper.getLong(stack, "lastTriggerTime", level.getGameTime()); | ||
if (timeSinceLast > 12L && !level.isClientSide()) { //12L = StarcallerItem.INTERVAL | ||
ItemNBTHelper.setLong(stack, "lastTriggerTime", level.getGameTime()); | ||
this.summonFallingStar(stack, level, player); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/main/java/info/partonetrain/botaniacombat/mixin/nerf/FallingStarEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package info.partonetrain.botaniacombat.mixin.nerf; | ||
|
||
import info.partonetrain.botaniacombat.BotaniaNerfConfiguredValues; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.ModifyArg; | ||
import vazkii.botania.common.entity.FallingStarEntity; | ||
|
||
@Mixin(FallingStarEntity.class) | ||
public class FallingStarEntityMixin { | ||
@ModifyArg(method = "onHitEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hurt(Lnet/minecraft/world/damagesource/DamageSource;F)Z"), index = 1) | ||
public float botanaicombat_modifyFallingStarDamage(float amount){ | ||
return Math.random() < 0.25 ? BotaniaNerfConfiguredValues.fallingStarHighDamage : BotaniaNerfConfiguredValues.fallingStarNormalDamage; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.