-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- GUI 按钮重新调整优化 - 增加女仆配置界面，现在配置界面功能全面，设置仅用于当前女仆
- Loading branch information
1 parent
4786d32
commit 5829bc3
Showing
47 changed files
with
920 additions
and
518 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
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
92 changes: 0 additions & 92 deletions
92
...m/github/tartaricacid/touhoulittlemaid/client/gui/entity/maid/MaidConfigContainerGui.java
This file was deleted.
Oops, something went wrong.
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
137 changes: 137 additions & 0 deletions
137
...b/tartaricacid/touhoulittlemaid/client/gui/entity/maid/config/MaidConfigContainerGui.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,137 @@ | ||
| package com.github.tartaricacid.touhoulittlemaid.client.gui.entity.maid.config; | ||
|
|
||
| import com.github.tartaricacid.touhoulittlemaid.TouhouLittleMaid; | ||
| import com.github.tartaricacid.touhoulittlemaid.client.gui.entity.maid.AbstractMaidContainerGui; | ||
| import com.github.tartaricacid.touhoulittlemaid.client.gui.widget.button.MaidConfigButton; | ||
| import com.github.tartaricacid.touhoulittlemaid.entity.passive.MaidConfigManager; | ||
| import com.github.tartaricacid.touhoulittlemaid.entity.passive.PickType; | ||
| import com.github.tartaricacid.touhoulittlemaid.inventory.container.config.MaidConfigContainer; | ||
| import com.github.tartaricacid.touhoulittlemaid.network.NetworkHandler; | ||
| import com.github.tartaricacid.touhoulittlemaid.network.message.MaidSubConfigMessage; | ||
| import net.minecraft.ChatFormatting; | ||
| import net.minecraft.client.gui.GuiGraphics; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.entity.player.Inventory; | ||
| import org.anti_ad.mc.ipn.api.IPNButton; | ||
| import org.anti_ad.mc.ipn.api.IPNGuiHint; | ||
| import org.anti_ad.mc.ipn.api.IPNPlayerSideOnly; | ||
|
|
||
| @IPNPlayerSideOnly | ||
| @IPNGuiHint(button = IPNButton.SORT, horizontalOffset = -36, bottom = -12) | ||
| @IPNGuiHint(button = IPNButton.SORT_COLUMNS, horizontalOffset = -24, bottom = -24) | ||
| @IPNGuiHint(button = IPNButton.SORT_ROWS, horizontalOffset = -12, bottom = -36) | ||
| @IPNGuiHint(button = IPNButton.SHOW_EDITOR, horizontalOffset = -5) | ||
| @IPNGuiHint(button = IPNButton.SETTINGS, horizontalOffset = -5) | ||
| public class MaidConfigContainerGui extends AbstractMaidContainerGui<MaidConfigContainer> { | ||
| private static final ResourceLocation ICON = new ResourceLocation(TouhouLittleMaid.MOD_ID, "textures/gui/maid_gui_config.png"); | ||
| private final MaidConfigManager.SyncNetwork syncNetwork; | ||
|
|
||
| public MaidConfigContainerGui(MaidConfigContainer screenContainer, Inventory inv, Component titleIn) { | ||
| super(screenContainer, inv, titleIn); | ||
| this.syncNetwork = getMaid().getConfigManager().getSyncNetwork(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void renderBg(GuiGraphics graphics, float partialTicks, int x, int y) { | ||
| super.renderBg(graphics, partialTicks, x, y); | ||
| graphics.blit(ICON, leftPos + 80, topPos + 28, 0, 0, imageWidth, imageHeight); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initAdditionWidgets() { | ||
| int buttonLeft = leftPos + 86; | ||
| int buttonTop = topPos + 52; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.show_backpack"), | ||
| Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showBackpack()), | ||
| button -> { | ||
| this.syncNetwork.setShowBackpack(!this.syncNetwork.showBackpack()); | ||
| button.setValue(Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showBackpack())); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.show_back_item"), | ||
| Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showBackItem()), | ||
| button -> { | ||
| this.syncNetwork.setShowBackItem(!this.syncNetwork.showBackItem()); | ||
| button.setValue(Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showBackItem())); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.show_chat_bubble"), | ||
| Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showChatBubble()), | ||
| button -> { | ||
| this.syncNetwork.setShowChatBubble(!this.syncNetwork.showChatBubble()); | ||
| button.setValue(Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.showChatBubble())); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.sound_frequency"), | ||
| Component.literal(Math.round(this.syncNetwork.soundFreq() * 100) + "%").withStyle(ChatFormatting.YELLOW), | ||
| button -> { | ||
| this.syncNetwork.setSoundFreq(this.syncNetwork.soundFreq() - 0.1f); | ||
| button.setValue(Component.literal(Math.round(this.syncNetwork.soundFreq() * 100) + "%").withStyle(ChatFormatting.YELLOW)); | ||
| }, | ||
| button -> { | ||
| this.syncNetwork.setSoundFreq(this.syncNetwork.soundFreq() + 0.1f); | ||
| button.setValue(Component.literal(Math.round(this.syncNetwork.soundFreq() * 100) + "%").withStyle(ChatFormatting.YELLOW)); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.pick_type"), | ||
| Component.translatable(PickType.getTransKey(this.syncNetwork.pickType())).withStyle(ChatFormatting.DARK_RED), | ||
| button -> { | ||
| this.syncNetwork.setPickType(PickType.getPreviousPickType(this.syncNetwork.pickType())); | ||
| button.setValue(Component.translatable(PickType.getTransKey(this.syncNetwork.pickType())).withStyle(ChatFormatting.DARK_RED)); | ||
| }, | ||
| button -> { | ||
| this.syncNetwork.setPickType(PickType.getNextPickType(this.syncNetwork.pickType())); | ||
| button.setValue(Component.translatable(PickType.getTransKey(this.syncNetwork.pickType())).withStyle(ChatFormatting.DARK_RED)); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.open_door"), | ||
| Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.openDoor()), | ||
| button -> { | ||
| this.syncNetwork.setOpenDoor(!this.syncNetwork.openDoor()); | ||
| button.setValue(Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.openDoor())); | ||
| } | ||
| )); | ||
| buttonTop += 13; | ||
|
|
||
| this.addRenderableWidget(new MaidConfigButton(buttonLeft, buttonTop, | ||
| Component.translatable("gui.touhou_little_maid.maid_config.open_fence_gate"), | ||
| Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.openFenceGate()), | ||
| button -> { | ||
| this.syncNetwork.setOpenFenceGate(!this.syncNetwork.openFenceGate()); | ||
| button.setValue(Component.translatable("gui.touhou_little_maid.maid_config.value." + this.syncNetwork.openFenceGate())); | ||
| } | ||
| )); | ||
| } | ||
|
|
||
| @Override | ||
| protected void renderAddition(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { | ||
| graphics.drawString(font, Component.translatable("gui.touhou_little_maid.button.maid_config"), leftPos + 140, topPos + 41, 0xFFFFFF, false); | ||
| } | ||
|
|
||
| @Override | ||
| public void onClose() { | ||
| if (this.maid != null) { | ||
| NetworkHandler.CHANNEL.sendToServer(new MaidSubConfigMessage(this.maid.getId(), this.syncNetwork)); | ||
| } | ||
| super.onClose(); | ||
| } | ||
| } |
3 changes: 2 additions & 1 deletion
3
.../gui/entity/maid/CheckSchedulePosGui.java → ...ntity/maid/other/CheckSchedulePosGui.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
Oops, something went wrong.