v1.6.0
This commit is contained in:
1 parent
87428f10b7
commit
bab35652d4
8 files changed
+145
-625
No files matched your search
@@ -9,17 +9,20 @@ import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||
import com.lzxnone.terraria.item.weapon.melee.FirstFractal;
|
||||
import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword;
|
||||
import com.lzxnone.terraria.item.weapon.melee.Zenith;
|
||||
import com.lzxnone.terraria.item.weapon.ranged.SniperRifle;
|
||||
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 com.lzxnone.terraria.utils.SoundUtil;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
@@ -67,6 +70,26 @@ public class InputHandler {
|
||||
PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta));
|
||||
}
|
||||
}
|
||||
}else if(player.getUseItem().getItem() instanceof SniperRifle) {
|
||||
if(player.isUsingItem()) {
|
||||
double scrollDelta = event.getScrollDeltaY();
|
||||
if(scrollDelta != 0) {
|
||||
event.setCanceled(true);
|
||||
ItemStack useStack = player.getUseItem();
|
||||
double zoom = useStack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getDouble("zoom") + scrollDelta * SniperRifle.getZoomScrollSpeed();
|
||||
if(zoom > SniperRifle.MAX_ZOOM) zoom = SniperRifle.MAX_ZOOM;
|
||||
else if(zoom < 1) zoom = 1;
|
||||
double finalZoom = zoom;
|
||||
CustomData.update(DataComponents.CUSTOM_DATA, useStack, tag -> tag.putDouble("zoom", finalZoom));
|
||||
|
||||
MutableComponent displayText = Component.empty();
|
||||
displayText.append(Component.translatable("tooltip.lzxnoneterraria.zoom").withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD))
|
||||
.append(Component.literal(": ").withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD))
|
||||
.append(Component.literal(String.format("x%.1f", finalZoom)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD));
|
||||
player.displayClientMessage(displayText, true);
|
||||
SoundUtil.playClientSound(player, SoundEvents.SPYGLASS_USE, 1.0f, 1.0f);
|
||||
}
|
||||
}
|
||||
}else if(mainHand.getItem() instanceof FirstFractal) {
|
||||
if(player.isUsingItem() && (player.getUseItem().is(ModItems.FIRST_FRACTAL.get()))) {
|
||||
double scrollDelta = event.getScrollDeltaY();
|
||||
|
||||
@@ -88,6 +88,7 @@ public class RangedWeaponGuiHandler {
|
||||
guiGraphics.pose().scale(0.25F, 0.25F, 1.0F);
|
||||
guiGraphics.renderItem(ammoStack, 0, 0);
|
||||
guiGraphics.pose().popPose();
|
||||
guiGraphics.flush();
|
||||
|
||||
if(player != null) {
|
||||
renderAmmoCount(guiGraphics, rangedWeapon, weaponStack, player, x, y);
|
||||
@@ -100,15 +101,16 @@ public class RangedWeaponGuiHandler {
|
||||
String text = Integer.toString(count);
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
Font font = minecraft.font;
|
||||
float scale = 0.75F;
|
||||
float scale = 0.5F;
|
||||
int textWidth = font.width(text);
|
||||
float textX = (iconX - 2) / scale - textWidth;
|
||||
float textY = (iconY - 3) / scale;
|
||||
float textX = iconX - textWidth * scale;
|
||||
float textY = iconY;
|
||||
|
||||
guiGraphics.pose().pushPose();
|
||||
guiGraphics.pose().translate(0.0F, 0.0F, 300.0F);
|
||||
guiGraphics.pose().translate(textX, textY, 500.0F);
|
||||
guiGraphics.pose().scale(scale, scale, 1.0F);
|
||||
guiGraphics.drawString(font, text, (int) textX, (int) textY, 0xFFFFFF, true);
|
||||
guiGraphics.drawString(font, text, 0, 0, 0xFFFFFF, true);
|
||||
guiGraphics.pose().popPose();
|
||||
guiGraphics.flush();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package com.lzxnone.terraria.client.event;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import com.lzxnone.terraria.item.weapon.ranged.SniperRifle;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.component.CustomData;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.client.event.ComputeFovModifierEvent;
|
||||
import net.neoforged.neoforge.client.event.RenderGuiEvent;
|
||||
|
||||
@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT)
|
||||
public class SniperScopeHandler {
|
||||
@SubscribeEvent
|
||||
public static void onComputeFov(ComputeFovModifierEvent event) {
|
||||
ItemStack stack = getActiveSniperStack();
|
||||
if(stack.isEmpty()) return;
|
||||
|
||||
double zoom = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getDouble("zoom");
|
||||
if(zoom <= 1) return;
|
||||
event.setNewFovModifier((float)(event.getNewFovModifier() / zoom));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onRenderGui(RenderGuiEvent.Post event) {
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
if(minecraft.options.hideGui) return;
|
||||
|
||||
ItemStack stack = getActiveSniperStack();
|
||||
if(stack.isEmpty()) return;
|
||||
double zoom = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getDouble("zoom");
|
||||
if(zoom <= 1) return;
|
||||
renderSpyglassOverlay(event.getGuiGraphics(), 1.0F);
|
||||
}
|
||||
|
||||
private static ItemStack getActiveSniperStack() {
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
LocalPlayer player = minecraft.player;
|
||||
if(player == null || !player.isUsingItem()) return ItemStack.EMPTY;
|
||||
|
||||
ItemStack stack = player.getUseItem();
|
||||
if(stack.is(ModItems.SNIPER_RIFLE)) return stack;
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
private static void renderSpyglassOverlay(GuiGraphics guiGraphics, float scopeScale) {
|
||||
float minSize = (float)Math.min(guiGraphics.guiWidth(), guiGraphics.guiHeight());
|
||||
float scale = Math.min((float)guiGraphics.guiWidth() / minSize, (float)guiGraphics.guiHeight() / minSize) * scopeScale;
|
||||
int width = Mth.floor(minSize * scale);
|
||||
int height = Mth.floor(minSize * scale);
|
||||
int x = (guiGraphics.guiWidth() - width) / 2;
|
||||
int y = (guiGraphics.guiHeight() - height) / 2;
|
||||
int right = x + width;
|
||||
int bottom = y + height;
|
||||
|
||||
RenderSystem.enableBlend();
|
||||
guiGraphics.blit(Gui.SPYGLASS_SCOPE_LOCATION, x, y, -90, 0.0F, 0.0F, width, height, width, height);
|
||||
RenderSystem.disableBlend();
|
||||
guiGraphics.fill(RenderType.guiOverlay(), 0, bottom, guiGraphics.guiWidth(), guiGraphics.guiHeight(), -90, 0xFF000000);
|
||||
guiGraphics.fill(RenderType.guiOverlay(), 0, 0, guiGraphics.guiWidth(), y, -90, 0xFF000000);
|
||||
guiGraphics.fill(RenderType.guiOverlay(), 0, y, x, bottom, -90, 0xFF000000);
|
||||
guiGraphics.fill(RenderType.guiOverlay(), right, y, guiGraphics.guiWidth(), bottom, -90, 0xFF000000);
|
||||
}
|
||||
}
|
||||
@@ -4,17 +4,23 @@ import com.lzxnone.terraria.ModSounds;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import com.lzxnone.terraria.item.weapon.RangedWeapon;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.AmmoUtil;
|
||||
import com.lzxnone.terraria.utils.SoundUtil;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
import net.minecraft.world.item.Tiers;
|
||||
import net.minecraft.world.item.component.CustomData;
|
||||
import net.minecraft.world.level.Level;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
@@ -22,13 +28,38 @@ public class SniperRifle extends BasicGun {
|
||||
public static final String ID = "sniper_rifle";
|
||||
public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f);
|
||||
public static final float DAMAGE_DEFAULT = 35.0f;
|
||||
public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT);
|
||||
public static final double MAX_ZOOM = 10.0D;
|
||||
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
public static final String ZOOM_SCROLL_SPEED_PATH = "weapon.sniper_rifle.zoom_scroll_speed";
|
||||
public static final double ZOOM_SCROLL_SPEED_DEFAULT = 0.5D;
|
||||
public static final double ZOOM_SCROLL_SPEED_MIN = 0.0D;
|
||||
public static final double ZOOM_SCROLL_SPEED_MAX = 10.0D;
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
createConfigData(ID, DAMAGE_DEFAULT).onConfigLoad();
|
||||
ConfigFactory.loadDoubleConfig(
|
||||
ZOOM_SCROLL_SPEED_PATH,
|
||||
Component.translatable(CONFIG_TRANSLATION_PREFIX + "sniper_rifle_zoom_scroll_speed"),
|
||||
Component.translatable(CONFIG_TRANSLATION_PREFIX + "sniper_rifle_zoom_scroll_speed.tooltip"),
|
||||
ZOOM_SCROLL_SPEED_DEFAULT,
|
||||
ZOOM_SCROLL_SPEED_MIN,
|
||||
ZOOM_SCROLL_SPEED_MAX
|
||||
);
|
||||
}
|
||||
};
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA);
|
||||
|
||||
public SniperRifle() {
|
||||
super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC), ID, OFFSET, DAMAGE_DEFAULT, 36, ModSounds.SHOT, 2.0f, 10);
|
||||
}
|
||||
|
||||
public static double getZoomScrollSpeed() {
|
||||
return Math.clamp(ConfigUtil.readDouble(ZOOM_SCROLL_SPEED_PATH, ZOOM_SCROLL_SPEED_DEFAULT), ZOOM_SCROLL_SPEED_MIN, ZOOM_SCROLL_SPEED_MAX);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) {
|
||||
SoundUtil.playClientSound(player, ModSounds.SHOT.get());
|
||||
|
||||
+3
-1
@@ -2,6 +2,7 @@ package com.lzxnone.terraria.network.handler;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.network.payload.ToggleSummonFreeTargetingPayload;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
@@ -17,7 +18,8 @@ public class ToggleSummonFreeTargetingHandler {
|
||||
player.displayClientMessage(
|
||||
Component.translatable(enabled
|
||||
? "message.lzxnoneterraria.summon_free_targeting_enabled"
|
||||
: "message.lzxnoneterraria.summon_free_targeting_disabled"),
|
||||
: "message.lzxnoneterraria.summon_free_targeting_disabled")
|
||||
.withStyle(enabled ? ChatFormatting.GREEN : ChatFormatting.RED),
|
||||
true
|
||||
);
|
||||
});
|
||||
|
||||
@@ -89,6 +89,7 @@
|
||||
|
||||
"tooltip.lzxnoneterraria.relative_distance": "Relative Distance",
|
||||
"tooltip.lzxnoneterraria.absolute_distance": "Absolute Distance",
|
||||
"tooltip.lzxnoneterraria.zoom": "Zoom",
|
||||
"tooltip.lzxnoneterraria.ammo": "Ammo: %s",
|
||||
"tooltip.lzxnoneterraria.devils_devastation_kill_mode": "Kill Mode",
|
||||
"tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.",
|
||||
@@ -625,6 +626,8 @@
|
||||
"lzxnoneterraria.configuration.sniper_rifle_settings": "Sniper Rifle Settings",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_damage": "Damage",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_damage.tooltip": "Damage per hit",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed": "Zoom Scroll Speed",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed.tooltip": "Mouse wheel speed for adjusting sniper scope zoom",
|
||||
"lzxnoneterraria.configuration.chain_gun_settings": "Chain Gun Settings",
|
||||
"lzxnoneterraria.configuration.chain_gun_damage": "Damage",
|
||||
"lzxnoneterraria.configuration.chain_gun_damage.tooltip": "Damage per hit",
|
||||
|
||||
@@ -89,6 +89,7 @@
|
||||
|
||||
"tooltip.lzxnoneterraria.relative_distance": "相对距离",
|
||||
"tooltip.lzxnoneterraria.absolute_distance": "绝对距离",
|
||||
"tooltip.lzxnoneterraria.zoom": "倍率",
|
||||
"tooltip.lzxnoneterraria.ammo": "弹药: %s",
|
||||
"tooltip.lzxnoneterraria.devils_devastation_kill_mode": "杀戮模式",
|
||||
"tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。",
|
||||
@@ -624,6 +625,8 @@
|
||||
"lzxnoneterraria.configuration.sniper_rifle_settings": "狙击步枪 设置",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_damage": "伤害",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_damage.tooltip": "每次命中伤害",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed": "滚轮调节系数",
|
||||
"lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed.tooltip": "鼠标滚轮调节狙击镜倍率的速度",
|
||||
"lzxnoneterraria.configuration.chain_gun_settings": "链式机枪 设置",
|
||||
"lzxnoneterraria.configuration.chain_gun_damage": "伤害",
|
||||
"lzxnoneterraria.configuration.chain_gun_damage.tooltip": "每次命中伤害",
|
||||
|
||||
Reference in new issue
Block a user