v1.6.0
This commit is contained in:
1 parent
72fcf86056
commit
20f662075a
20 files changed
+204
-17
No files matched your search
@@ -37,10 +37,20 @@ public class ModKeyBindings {
|
||||
"key.categories.lzxnoneterraria"
|
||||
);
|
||||
|
||||
public static final KeyMapping TOGGLE_SUMMON_FREE_TARGETING = new KeyMapping(
|
||||
"key.lzxnoneterraria.toggle_summon_free_targeting",
|
||||
KeyConflictContext.IN_GAME,
|
||||
KeyModifier.NONE,
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_V,
|
||||
"key.categories.lzxnoneterraria"
|
||||
);
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerKeys(RegisterKeyMappingsEvent event) {
|
||||
event.register(KILL_MODE);
|
||||
event.register(CLEAR_SUMMON);
|
||||
event.register(CLEAR_ALL_SUMMONS);
|
||||
event.register(TOGGLE_SUMMON_FREE_TARGETING);
|
||||
}
|
||||
}
|
||||
@@ -27,4 +27,7 @@ public class ModAttachments {
|
||||
public static final Supplier<AttachmentType<List<UUID>>> SUMMON_WEAPON_SUMMONS =
|
||||
ATTACHMENT_TYPES.register("summon_weapon_summons", () -> AttachmentType.<List<UUID>>builder((Supplier<List<UUID>>) ArrayList::new).serialize(Codec.list(Codec.STRING.xmap(UUID::fromString, UUID::toString))).build());
|
||||
|
||||
public static final Supplier<AttachmentType<Boolean>> SUMMON_FREE_TARGETING =
|
||||
ATTACHMENT_TYPES.register("summon_free_targeting", () -> AttachmentType.builder(() -> true).serialize(Codec.BOOL).build());
|
||||
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import com.lzxnone.terraria.item.weapon.melee.Zenith;
|
||||
import com.lzxnone.terraria.network.payload.ClearSummonPayload;
|
||||
import com.lzxnone.terraria.network.payload.DevilsDevastationKillModePayload;
|
||||
import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload;
|
||||
import com.lzxnone.terraria.network.payload.ToggleSummonFreeTargetingPayload;
|
||||
import com.lzxnone.terraria.network.payload.ZenithScrollPayload;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -125,5 +126,8 @@ public class InputHandler {
|
||||
while(ModKeyBindings.CLEAR_ALL_SUMMONS.consumeClick()) {
|
||||
PacketDistributor.sendToServer(new ClearSummonPayload(""));
|
||||
}
|
||||
while(ModKeyBindings.TOGGLE_SUMMON_FREE_TARGETING.consumeClick()) {
|
||||
PacketDistributor.sendToServer(new ToggleSummonFreeTargetingPayload(true));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -58,7 +58,8 @@ public class MEntityLuminance implements EntityLuminance {
|
||||
StaticSummonBehaviors.DEVILS_DEVASTATION_MARK,
|
||||
StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING,
|
||||
StaticSummonBehaviors.LAST_PRISM_TRI,
|
||||
StaticSummonBehaviors.LAST_PRISM_BEAM -> {
|
||||
StaticSummonBehaviors.LAST_PRISM_BEAM,
|
||||
StaticSummonBehaviors.TERRAPRISMA -> {
|
||||
return 15;
|
||||
}
|
||||
default -> {
|
||||
|
||||
@@ -13,6 +13,7 @@ public class ModEnchantments {
|
||||
public static final ResourceKey<Enchantment> MANA_GATHERING_CURSE = create("mana_gathering_curse");
|
||||
public static final ResourceKey<Enchantment> ARCANE_AMPLIFICATION = create("arcane_amplification");
|
||||
public static final ResourceKey<Enchantment> SUMMON_AMPLIFICATION = create("summon_amplification");
|
||||
public static final ResourceKey<Enchantment> BARREN_LAND = create("barren_land");
|
||||
|
||||
private static ResourceKey<Enchantment> create(String name) {
|
||||
return ResourceKey.create(
|
||||
|
||||
@@ -16,20 +16,20 @@ public class BrewingRecipeHandler {
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_0);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_0);
|
||||
|
||||
event.getBuilder().addMix(ModPotions.LONG_SUMMON_0, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_1);
|
||||
event.getBuilder().addMix(ModPotions.LONG_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.SHORT_SUMMON_1);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_1);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_1);
|
||||
|
||||
event.getBuilder().addMix(ModPotions.LONG_SUMMON_1, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_2);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_2, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_2);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_2, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_2);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_2);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_2);
|
||||
|
||||
event.getBuilder().addMix(ModPotions.LONG_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_3);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_3, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_3);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_3, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_3);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_3);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_3);
|
||||
|
||||
event.getBuilder().addMix(ModPotions.LONG_SUMMON_3, Items.NETHERITE_BLOCK, ModPotions.SHORT_SUMMON_4);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_4, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_4);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_4, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_4);
|
||||
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.MEDIUM_SUMMON_4);
|
||||
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.LONG_SUMMON_4);
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import com.lzxnone.terraria.effect.SummonEffect;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
@@ -76,7 +77,8 @@ public class SummonWeapon extends Weapon {
|
||||
summons.add(summon.getUUID());
|
||||
player.setData(ModAttachments.SUMMON_WEAPON_SUMMONS, summons);
|
||||
player.displayClientMessage(
|
||||
Component.translatable("message.lzxnoneterraria.current_summons", summons.size(), maxSummonCount),
|
||||
Component.translatable("message.lzxnoneterraria.current_summons", summons.size(), maxSummonCount)
|
||||
.withStyle(summons.size() < maxSummonCount ? ChatFormatting.GREEN : ChatFormatting.RED),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.lzxnone.terraria.item.weapon.summon;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
||||
import com.lzxnone.terraria.entity.ModEntities;
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
@@ -14,9 +15,9 @@ import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import com.lzxnone.terraria.utils.MathUtil;
|
||||
import com.mojang.math.Axis;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.Mth;
|
||||
@@ -28,7 +29,10 @@ import net.minecraft.world.entity.monster.Monster;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.ClipContext;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Quaternionf;
|
||||
import org.joml.Vector3f;
|
||||
@@ -478,10 +482,16 @@ public class Terraprisma extends SummonWeapon {
|
||||
return playerAttacker;
|
||||
}
|
||||
|
||||
if(!player.getData(ModAttachments.SUMMON_FREE_TARGETING)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
boolean ignoreBlockOcclusion = hasBarrenLand(summon, player);
|
||||
List<Monster> monsters = summon.level().getEntitiesOfClass(
|
||||
Monster.class,
|
||||
AABB.ofSize(summon.position(), getTargetRange() * 2.0D, getTargetRange() * 2.0D, getTargetRange() * 2.0D),
|
||||
FilterUtil.createMonsterFilter(player)
|
||||
monster -> FilterUtil.createMonsterFilter(player).test(monster)
|
||||
&& (ignoreBlockOcclusion || hasFreeTargetLineOfSight(player, monster))
|
||||
);
|
||||
monsters.sort(Comparator.comparingDouble(monster -> monster.distanceToSqr(summon.position())));
|
||||
if(!monsters.isEmpty()) {
|
||||
@@ -498,6 +508,29 @@ public class Terraprisma extends SummonWeapon {
|
||||
&& FilterUtil.createLivingTargetFilter(summon, player).test(target);
|
||||
}
|
||||
|
||||
private static boolean hasFreeTargetLineOfSight(Player player, LivingEntity target) {
|
||||
BlockHitResult hitResult = player.level().clip(new ClipContext(
|
||||
player.getEyePosition(),
|
||||
target.getEyePosition(),
|
||||
ClipContext.Block.COLLIDER,
|
||||
ClipContext.Fluid.NONE,
|
||||
player
|
||||
));
|
||||
return hitResult.getType() == HitResult.Type.MISS;
|
||||
}
|
||||
|
||||
private static boolean hasBarrenLand(StaticSummon summon, Player player) {
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
if(sourceStack.isEmpty()) sourceStack = player.getWeaponItem();
|
||||
if(sourceStack.isEmpty()) return false;
|
||||
|
||||
return player.registryAccess()
|
||||
.lookupOrThrow(Registries.ENCHANTMENT)
|
||||
.get(ModEnchantments.BARREN_LAND)
|
||||
.map(sourceStack::getEnchantmentLevel)
|
||||
.orElse(0) > 0;
|
||||
}
|
||||
|
||||
private static Entity getTarget(StaticSummon summon) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
if(customData.contains("target") && summon.level() instanceof ServerLevel serverLevel) {
|
||||
|
||||
@@ -43,6 +43,11 @@ public class ModNetwork {
|
||||
ClearSummonPayload.CODEC,
|
||||
ClearSummonHandler::handle
|
||||
);
|
||||
registrar.playToServer(
|
||||
ToggleSummonFreeTargetingPayload.TYPE,
|
||||
ToggleSummonFreeTargetingPayload.CODEC,
|
||||
ToggleSummonFreeTargetingHandler::handle
|
||||
);
|
||||
registrar.playToClient(
|
||||
ScreenShakePayload.TYPE,
|
||||
ScreenShakePayload.CODEC,
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors;
|
||||
import com.lzxnone.terraria.item.weapon.SummonWeapon;
|
||||
import com.lzxnone.terraria.network.payload.ClearSummonPayload;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
@@ -40,14 +41,21 @@ public class ClearSummonHandler {
|
||||
|
||||
player.setData(ModAttachments.SUMMON_WEAPON_SUMMONS, remainingSummons);
|
||||
player.displayClientMessage(
|
||||
clearAll
|
||||
? Component.translatable("message.lzxnoneterraria.clear_all_summons")
|
||||
: Component.translatable("message.lzxnoneterraria.clear_summon", getSummonName(id)),
|
||||
getClearMessage(clearAll, id),
|
||||
true
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
private static Component getClearMessage(boolean clearAll, String id) {
|
||||
if(clearAll) {
|
||||
return Component.translatable("message.lzxnoneterraria.clear_all_summons")
|
||||
.withStyle(ChatFormatting.GREEN);
|
||||
}
|
||||
return Component.translatable("message.lzxnoneterraria.clear_summon", getSummonName(id).copy().withStyle(ChatFormatting.RED))
|
||||
.withStyle(ChatFormatting.GREEN);
|
||||
}
|
||||
|
||||
private static Component getSummonName(String id) {
|
||||
if(StaticSummonBehaviors.TERRAPRISMA.equals(id)) {
|
||||
return Component.translatable("item.lzxnoneterraria.terraprisma");
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.lzxnone.terraria.network.handler;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.network.payload.ToggleSummonFreeTargetingPayload;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
|
||||
public class ToggleSummonFreeTargetingHandler {
|
||||
public static void handle(final ToggleSummonFreeTargetingPayload payload, final IPayloadContext context) {
|
||||
context.enqueueWork(() -> {
|
||||
Player player = context.player();
|
||||
if(player.level().isClientSide()) return;
|
||||
|
||||
boolean enabled = !player.getData(ModAttachments.SUMMON_FREE_TARGETING);
|
||||
player.setData(ModAttachments.SUMMON_FREE_TARGETING, enabled);
|
||||
player.displayClientMessage(
|
||||
Component.translatable(enabled
|
||||
? "message.lzxnoneterraria.summon_free_targeting_enabled"
|
||||
: "message.lzxnoneterraria.summon_free_targeting_disabled"),
|
||||
true
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.lzxnone.terraria.network.payload;
|
||||
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.network.codec.ByteBufCodecs;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
public record ToggleSummonFreeTargetingPayload(boolean ignored) implements CustomPacketPayload {
|
||||
public static final CustomPacketPayload.Type<ToggleSummonFreeTargetingPayload> TYPE = new CustomPacketPayload.Type<>(
|
||||
ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "toggle_summon_free_targeting_payload")
|
||||
);
|
||||
|
||||
public static final StreamCodec<FriendlyByteBuf, ToggleSummonFreeTargetingPayload> CODEC = StreamCodec.composite(
|
||||
ByteBufCodecs.BOOL, ToggleSummonFreeTargetingPayload::ignored,
|
||||
ToggleSummonFreeTargetingPayload::new
|
||||
);
|
||||
|
||||
@Override
|
||||
public CustomPacketPayload.Type<? extends CustomPacketPayload> type() {
|
||||
return TYPE;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user