diff --git a/.github/ISSUE_TEMPLATE/bug_report_cn.yml b/.github/ISSUE_TEMPLATE/bug_report_cn.yml
index 8999102c..62cef475 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_cn.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_cn.yml
@@ -7,42 +7,56 @@ body:
- type: markdown
attributes:
value: |
- 请确保您使用的是最新版的RC，您反馈的bug很可能已经在更新版本中修复
+ 请确保您使用的是最新版的RealCamera，您反馈的bug很可能已经在更新版本中修复
（查看尾缀是否与最新工件相同）
在反馈bug前，请先尝试搜索是否已有相似的问题，请不要重复打开相同的issue
所有有关YSM的问题，请您优先寻求他人的帮助，或者观看配置模型教程
- 而不是直接在issue中提问。
+ 而不是直接在issue中提问
- type: checkboxes
id: preliminary
attributes:
label: 我已确认 ...
options:
- - label: 我正在使用最新版的RC
+ - label: 我正在使用最新版的RealCamera
required: true
- - label: 无法在关闭主要功能时复现
+ - label: issues里没有相关的问题
required: true
- type: input
- id: minecraft-version-loader
+ id: minecraft-version
attributes:
- label: Minecraft版本和加载器
+ label: Minecraft版本
description: |
- 请填写游戏版本与所使用的加载器.
+ 你所使用的Minecraft的版本.
- 你可以在游戏主界面作下角或者游戏启动时的日志开头等地方找到.
+ 你可以在游戏主界面左下角或者游戏启动时的日志开头等地方找到.
validations:
required: true
+ - type: checkboxes
+ id: bug-type
+ attributes:
+ label: 问题类型
+ options:
+ - label: 开启主功能时出现bug
+ required: false
+ - label: 与其他模组的兼容问题
+ required: false
+ - label: 在fabric端出现
+ required: false
+ - label: 在（neo）forge端出现
+ required: false
+
- type: textarea
id: incompatible-mods
attributes:
label: 不兼容的mod
description: >-
和bug相关的模组
-
请在反馈问题前尝试尽可能移除不相干的模组的情况下复现bug
- placeholder: 'Mods list here'
+
请在反馈问题前移除所有不相干的模组的情况下复现bug
+ placeholder: '与问题有关的模组列表'
render: 'raw'
validations:
required: true
@@ -52,7 +66,8 @@ body:
attributes:
label: 错误描述
description: >-
- 请尽可能详细的描述遇到的问题.
+ 请尽可能详细的描述遇到的问题
+
同时也请务必携带复现时的视频或截图，这对于我们理解问题非常有帮助
越清晰和详尽的描述会使该bug的处理优先级更高
validations:
required: true
@@ -62,9 +77,9 @@ body:
attributes:
label: 复现步骤
placeholder: |
- 1. Join the game...
+ 1. 进入游戏...
- 2. Change some settings...
+ 2. 做出某些改变...
3. ...
@@ -73,7 +88,10 @@ body:
attributes:
label: 日志和崩溃报告
description: >-
- 你可以在/logs/lastest.log 和 /crash-report 中找到错误报告，或者使用启动器的导出功能
+ 如果为非崩溃问题，请不要上传日志，这样会不利于我们理解问题
+
你可以在/logs/lastest.log 和 /crash-report 中找到错误报告，或者使用启动器的导出功能
你可以日志上传到类似 https://paste.ubuntu.com/ 或者 https://mclo.gs/ 的网站并在此贴出链接
-
**请不要在此此处直接粘贴大段的日志文本!!**
- placeholder: '把日志文件往这丢或者使用外部链接'
+
**请不要在此处直接粘贴大段的日志文本!!!**
+
**请不要在此处直接粘贴大段的日志文本!!!**
+
**请不要在此处直接粘贴大段的日志文本!!!**
+ placeholder: '把日志文件往这丢或者使用外部链接'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report_en.yml b/.github/ISSUE_TEMPLATE/bug_report_en.yml
index 000632d0..92e716d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_en.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_en.yml
@@ -12,7 +12,7 @@ body:
Before reporting a bug, please search for similar issues first and avoid opening duplicate issues
For all YSM-related questions, please seek help from others or watch configuration model tutorials first
- instead of asking directly in the issue.
+ instead of asking directly in the issue
- type: checkboxes
id: preliminary
@@ -21,27 +21,41 @@ body:
options:
- label: I am using the latest version of RealCamera
required: true
- - label: Unable to reproduce when main feature is disabled
+ - label: No related issues found in the issue tracker.
required: true
+ - label: Appears on Fabric
+ required: false
+ - label: Appears on （Neo）Forge
+ required: false
- type: input
- id: minecraft-version-loader
+ id: minecraft-version
attributes:
- label: Minecraft Version and Loader
+ label: Minecraft Version
description: |
- Please specify the game version and your mod loader.
+ The Minecraft version you are using.
You can find them at the corner of main menu or in the log while startup.
validations:
required: true
+ - type: checkboxes
+ id: bug-type
+ attributes:
+ label: Question Type
+ options:
+ - label: Bug occurs when enabling main feature
+ required: false
+ - label: Incompatibility with other mods
+ required: false
+
- type: textarea
id: incompatible-mods
attributes:
label: Incompatible Mods
description: >-
- The mods related to the bug.
-
Try to remove unrelated plugins and mods before reporting
+ The mods related to the bug
+
Reproduce the bug with all unrelated mods removed before reporting
placeholder: 'Mods list here'
render: 'raw'
validations:
@@ -52,7 +66,8 @@ body:
attributes:
label: Bug Description
description: >-
- Please describe the issue you encountered in as much detail as possible.
+ Please describe the issue you encountered in as much detail as possible
+
Please also attach screenshots or reproduction videos, as they help us diagnose the problem effectively
Clearer and more detailed descriptions will receive higher processing priority
validations:
required: true
@@ -73,7 +88,10 @@ body:
attributes:
label: Logs & Crash Reports
description: >-
- You can find error reports in /logs/latest.log and /crash-reports, or use the launcher's export function
+ If your issue is not a crash, please do not upload log files, as they will hinder our understanding of the problem
+
You can find error reports in /logs/latest.log and /crash-reports, or use the launcher's export function
You can upload logs to sites like https://paste.ubuntu.com/ or https://mclo.gs/ and post the link here
-
**DO NOT PASTE LARGE LOGS DIRECTLY HERE!!**
- placeholder: 'Drag log file here or use external link'
+
**DO NOT PASTE LARGE LOGS DIRECTLY HERE!!!**
+
**DO NOT PASTE LARGE LOGS DIRECTLY HERE!!!**
+
**DO NOT PASTE LARGE LOGS DIRECTLY HERE!!!**
+ placeholder: 'Drag log file here or use external link'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request_cn.yml b/.github/ISSUE_TEMPLATE/feature_request_cn.yml
new file mode 100644
index 00000000..f960b8d0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request_cn.yml
@@ -0,0 +1,43 @@
+name: 新功能建议
+description: 为我们提供新的想法
+title: "[new feature]:"
+labels: [ "new feature" ]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ 感谢您花时间提出新的功能想法！
+ 请确保最新版本内没有这个功能！
+
+ - type: textarea
+ id: feature-description
+ attributes:
+ label: 这个功能是什么？
+ description: 请清晰地描述您希望添加的功能
+ placeholder: 我希望...
+ validations:
+ required: true
+
+ - type: textarea
+ id: problem-and-solution
+ attributes:
+ label: 这个功能可以解决什么问题？
+ description: 请详细说明其作用
+ placeholder: 这个功能可以帮助解决...
+ validations:
+ required: true
+
+ - type: textarea
+ id: ideal-solution
+ attributes:
+ label: 这个功能理想中的解决方案是什么样的？
+ description: 例如新的按钮应该在何处，哪里需要新的配置选项
+ placeholder: 我希望...
+ validations:
+ required: true
+
+ - type: textarea
+ id: additional-context
+ attributes:
+ label: 其他信息
+ description: 任何关于功能的上下文或截图
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request_en.yml b/.github/ISSUE_TEMPLATE/feature_request_en.yml
new file mode 100644
index 00000000..0ae65664
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request_en.yml
@@ -0,0 +1,43 @@
+name: New Feature Request
+description: Suggest an idea for this project
+title: "[new feature]: "
+labels: [ "new feature" ]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for taking the time to suggest a new feature!
+ Check the latest build to confirm the feature is missing.
+
+ - type: textarea
+ id: feature-description
+ attributes:
+ label: What is this feature about?
+ description: A clear and concise description of what the feature is.
+ placeholder: I would like to...
+ validations:
+ required: true
+
+ - type: textarea
+ id: problem-and-solution
+ attributes:
+ label: What problem does this feature solve?
+ description: Please elaborate on its purpose
+ placeholder: This feature helps resolve...
+ validations:
+ required: true
+
+ - type: textarea
+ id: ideal-solution
+ attributes:
+ label: What does your ideal solution look like?
+ description: For example, where new buttons or config options should be placed
+ placeholder: I would like...
+ validations:
+ required: true
+
+ - type: textarea
+ id: additional-context
+ attributes:
+ label: Additional context
+ description: Any relevant information or screenshots regarding the feature
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a55202b..2c1ce2a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ name: Build
on:
pull_request:
paths-ignore:
+ - '**/ISSUE_TEMPLATE/**'
- '**/lang/**'
- '**.md'
- 'LICENSE'
@@ -27,7 +28,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
- java-version: 17
+ java-version: 21
- name: Make Gradle Wrapper Executable
if: ${{ runner.os != 'Windows' }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f297d1ca..6096f2cd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
- java-version: 17
+ java-version: 21
- name: Make Gradle Wrapper Executable
if: ${{ runner.os != 'Windows' }}
diff --git a/README.md b/README.md
index 42992dad..cdd3d1ff 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
### [中文](README_ZH.md)
Make the camera more realistic in the first-person view.
-Supported versions: 1.18.2-1.20.4 Forge, 1.18.2-1.21.8 Fabric, 1.21-1.21.8 NeoForge.
+Supported versions: 1.18.2 - 1.20.4 Forge, 1.18.2 - 26.2 Fabric, 1.21 - 26.2 NeoForge.
Download the mod from [Releases](https://github.com/xTracr/RealCamera/releases), [Modrinth](https://modrinth.com/mod/real-camera) or [CurseForge](https://curseforge.com/minecraft/mc-mods/real-camera)
Snapshots are [here](https://github.com/xTracr/RealCamera/actions/workflows/build.yml)
@@ -12,86 +12,98 @@ Snapshots are [here](https://github.com/xTracr/RealCamera/actions/workflows/buil
* Bind the camera to a specific part of the body.
* Customize the position and rotation of the camera.
* Render player model in first-person perspective.
-* Use F6 to toggle the feature on or off and other hotkeys to adjust the camera.
+* Use 「F6」 to toggle the feature on or off and other hotkeys to adjust the camera.
* Configure these features in the Config Screen (Cloth Config required) and the Model View Screen (0.6+).
### Configuration (0.6+)
* Theoretically, most mod models are supported, but need to be configured manually:
* First, set the key binding for `Open Model View Screen`.
- * 
+ * 
* Open the model view screen and left click with left Alt held to select the corresponding face of the model, scroll with left Alt held to switch between the different layers of the model.
* By clicking the `Selecting` button on the left, switch between the three to select the `Forward Vector`, `Upward Vector`, and `Target Plane`.
* From the top right button, enter the `Preview` section, where you can see the relative relationship between the camera and the model and make certain adjustments (you can also adjust through key bindings).
- * 
+ * 
* Enter a name and save.
+* ~~If you have difficulty configuring the settings, you can also enable `Mod Settings > Binding Mode > Legacy Binding Mode`
+
Note: This setting is exclusive to vanilla Minecraft.~~
#### Tips
* Configs can have their priority adjusted - higher priority configs appear higher in the right-side list
+* In the mod settings, you can manually switch between available configurations by modifying the configuration selector
+* When the main feature is enabled, hover over the configuration entries. The one annotated with `Current Config` is the configuration currently in use
* Disable depth in `Preview` section to hide models blocking the view
-* About `Disable` section (current version still rough, complex operations):
- * When texture ID field is empty, use Left Alt+Left Click to select texture
- * Model parts contained by blue boxes won't be rendered
- * Left-click drag to select in texture view, other keys cancel selection
- * Left Alt+Left Click quickly selects hovered parts
- * In `All` mode, entire texture's model won't render (blue box containing the texture in left panel indicates this)
- * 
+* About `Disable` section:
+ * When texture ID field is empty, use 「Left Alt + Left Click」 to select a texture
+ * Selection modes:
+ * Single & Multiple selection: Press 「Left Alt + Left Click」 to select the faces to disable
+ * Range selection: Press 「Left Alt + Left Click」 to confirm the selection area, and use 「Alt + Scroll Wheel」 to adjust the size of the selection area
+ * In the left texture view of the player rendering area:
+ * Press 「Left Click」 to start/end drag selection, press any other key to cancel the selection
+ * Faces selected via drag selection have the same effect as faces disabled via Multiple selection
+ * Notably, disabling faces this way is generally more performance-efficient than other methods
+ * Disable modes:
+ * In `part` mode, selected faces will not be rendered (you can preview the effect by toggling off the visibility of the disable configuration on the right pane)
+ * In `All` mode, entire texture's model won't render (blue box containing the texture in left panel indicates this)
+ * 
## Dependencies
* Fabric:
- * [Fabric API](https://modrinth.com/mod/fabric-api)
+ * [Fabric API](https://modrinth.com/mod/fabric-api)
* Both:
- * (Optional but recommended) [Cloth Config API](https://modrinth.com/mod/cloth-config)
+ * (Optional but recommended) [Cloth Config API](https://modrinth.com/mod/cloth-config)
## FAQ
* A part of the model (e.g. hair) is always in the way, how to make it invisible?
- * Increasing this value may help, or use `Disable` section
- 
+ * Increasing this value may help, or use `Disable` section
+ 
* What key to press can open Model View Screen?
- * Set the key binding by yourself
-* Why can't i open the Config Screen?
- * Please downlowd [Cloth Config API](https://modrinth.com/mod/cloth-config)
+ * Set the key binding by yourself
+* Why can't I open the Config Screen?
+ * Please download [Cloth Config API](https://modrinth.com/mod/cloth-config)
* Why does it show binding failed when use YSM models?
- * On Minecraft 1.20.1, use a Real Camera build with the dedicated YSM projection sampler; the old side-face binding and roll workaround is no longer required
-* Why does the head of YSM model disappear when in the Model View Screen?
- * You downloaded Better Combat, just put it away
+ * Snapshot 0.6.15 "try" to fix problems, but it didn't fully fix completely
+ * When your model rotates to a specific angle, the position you bound may disappear due to YSM's `face culling feature`, resulting in binding failure
+ * You can alleviate this problem by increasing the `Bind Result Retention Frames`
+* Why does the disabled texture appear when I downloaded Better Combat and attack?
+ * Open settings of Better Combat and change Auto to False in First person player animation
### Compatibility
* Incompatible:
- * OptiFine
- * Armourer's Workshop (Mod version 0.6+)
- * Armors based on GeckoLib
- * Customizable Player Models
- * Epic Fight (Mod version 0.6-)
- * Timeless and Classics Zero,version 1.1.4+
+ * OptiFine
+ * Armourer's Workshop (Mod version 0.6+)
+ * Armors based on GeckoLib
+ * Customizable Player Models
+ * Epic Fight (Mod version 0.6-)
+ * Timeless and Classics Zero,version 1.1.4+
* Compatible:
- * most camera mods
- * most player model mods
- * Armourer's Workshop (Mod version 0.6-)
- * Epic Fight (Mod version 0.6+)
- * First-person Model
- * Not Enough Animations
- * ParCool!
- * Pehkui
- * Player Animation Lib
- * Timeless and Classics Zero,version 1.0.3-
- * Yes Steve Model (Not stably compatible)
- * Superb Warfare
+ * most camera mods
+ * most player model mods
+ * Armourer's Workshop (Mod version 0.6-)
+ * Epic Fight (Mod version 0.6+)
+ * First-person Model
+ * Not Enough Animations
+ * ParCool!
+ * Pehkui
+ * Player Animation Lib
+ * Timeless and Classics Zero,version 1.0.3-
+ * Yes Steve Model (Not stably compatible)
+ * Superb Warfare
* Model Mod Compatibility Requirements with `Real Camera` (Based on Official Mappings)：
* Vertex Data Acquisition
- * `Real Camera` obtains vertex data by overriding the `MultiBufferSource multiBufferSource` parameter of the public method `EntityRenderDispatcher.render`
- * The call timing is before the `Camera.setup` phase in the `GameRenderer.renderLevel` method
- * *Therefore*, the mod needs to meet the following technical conditions:
- * Use only the **provided** `multiBufferSource` parameter when rendering `Minecraft.getCameraEntity`, and avoid alternative approaches for obtaining or creating `MultiBufferSource` instances
- * The overall rendering behavior remains unaffected when rendering the player model at the adjusted timing
- * Ensure all vertex data ultimately passes through `VertexConsumer` gotten by `MultiBufferSource.getBuffer`
+ * `Real Camera` obtains vertex data by overriding the `MultiBufferSource multiBufferSource` parameter of the public method `EntityRenderDispatcher.render`
+ * The call timing is before the `Camera.setup` phase in the `GameRenderer.renderLevel` method
+ * *Therefore*, the mod needs to meet the following technical conditions:
+ * Use only the **provided** `multiBufferSource` parameter when rendering `Minecraft.getCameraEntity`, and avoid alternative approaches for obtaining or creating `MultiBufferSource` instances
+ * The overall rendering behavior remains unaffected when rendering the player model at the adjusted timing
+ * Ensure all vertex data ultimately passes through `VertexConsumer` gotten by `MultiBufferSource.getBuffer`
* Render Times Compatibility
- * `Real Camera` renders `Minecraft.getCameraEntity` by calling the public method `EntityRenderDispatcher.render`
- * This is the second call to the `EntityRenderDispatcher.render` method in a frame (the first call is to solve the camera parameters).
- * *Therefore*, the mod needs to meet the condition that the overall rendering behavior remains unaffected when rendering the player model **multiple times** in the same frame
+ * `Real Camera` renders `Minecraft.getCameraEntity` by calling the public method `EntityRenderDispatcher.render`
+ * This is the second call to the `EntityRenderDispatcher.render` method in a frame (the first call is to solve the camera parameters).
+ * *Therefore*, the mod needs to meet the condition that the overall rendering behavior remains unaffected when rendering the player model **multiple times** in the same frame
diff --git a/README_ZH.md b/README_ZH.md
index 58f7d15c..07557e6e 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -3,7 +3,7 @@
### [English](README.md)
使第一人称视角下的摄像头更加真实。
-支持的版本: 1.18.2 - 1.20.4 Forge，1.18.2 - 1.21.8 Fabric，1.21 - 1.21.8 NeoForge
+支持的版本: 1.18.2 - 1.20.4 Forge，1.18.2 - 26.2 Fabric，1.21 - 26.2 NeoForge
从[Releases](https://github.com/xTracr/RealCamera/releases)、[Modrinth](https://modrinth.com/mod/real-camera)或[CurseForge](https://curseforge.com/minecraft/mc-mods/real-camera)下载
快照版在[这里](https://github.com/xTracr/RealCamera/actions/workflows/build.yml)
@@ -12,85 +12,97 @@
* 将摄像头绑定到身体的特定部位
* 自定义摄像头的位置和旋转角度
* 在第一人称视角下渲染玩家模型
-* 按下F6来开关，另外一些键来调整摄像头
+* 按下「F6」来开关，另外一些键来调整摄像头
* 在配置界面（需要Cloth Config）和模型视图（0.6+）界面，配置以上特性
### 配置（0.6+）
* 理论上支持大多数模组模型，但需要手动进行配置：
* 首先设置`打开模型视图界面`的按键绑定
- * 
+ * 
* 打开模型视图界面，左Alt+左键选择模型的对应的面，左Alt+滚轮可以在模型的不同层间切换
* 通过点击左侧的`选择`按钮，在三者间切换，选好`向前矢量`、`向上矢量`和`目标平面`
* 从右上角的按钮进入`预览`界面，在这里可以看到摄像头与模型的相对关系，并进行一定的调整（也可以通过按键绑定调整）
- * 
+ * 
* 输入名称并保存
+* ~~如果实在不会配置，也可以将`模组设置 > 绑定模式 > 旧绑定模式`打开
+
注意：该设置仅限原版~~
#### Tips
* 可以更改配置的优先级，优先级越高的配置，在右侧排序越靠上
+* 在模组设置中，你可以通过修改配置选择器来主动切换允许的配置
+* 当开启主功能时，将鼠标放到配置上方，其中有注释`当前配置`的即为此时使用的配置
* 在`预览`界面可以更改禁用深度来禁用眼前的模型的渲染
-* 关于`禁用`界面（当前版本尚不完善，操作较为繁琐）：
- * 在左侧材质id输入框为空时，可以使用Alt+左键选择材质
- * 被蓝框包含的部分不会被渲染。
- * 在左侧材质视图中鼠标左键框选，其它键取消选择
- * Alt+左键可快速选中被鼠标指针指向的部分
- * `全部`模式下，整个材质所对应的模型都不会被渲染（左侧会有一个包含整个材质的蓝框来表示这一点）
- * 
+* 关于`禁用`界面：
+ * 在左侧材质id输入框为空时，使用「Alt+左键」选择材质
+ * 选择模式：
+ * 单选、多选：按下「Alt+左键」以选择需要禁用的面
+ * 范围：按下「Alt+左键」以确定被选择区域，使用「Alt+滚轮」以更改被选择区域的大小
+ * 在玩家渲染左侧材质视图中：
+ * 按下「鼠标左键」开始/结束框选，其它键取消选择
+ * 被框选中的面效果与多选禁用的面效果相同
+ * 值得一提的是，使用这种方式被禁用面，通常比使用其他方法更加节省性能
+ * 禁用模式：
+ * `部分`模式下，被选择的面不会渲染（可以通过关闭右侧禁用配置的可见性来预览）
+ * `全部`模式下，整个材质所对应的模型都不会渲染（会有一个包含整个材质的蓝框来表示这一点）
+ * 
## 依赖项目
* Fabric:
- * [Fabric API](https://modrinth.com/mod/fabric-api)
+ * [Fabric API](https://modrinth.com/mod/fabric-api)
* 所有平台:
- * (可选但建议)[Cloth Config API](https://modrinth.com/mod/cloth-config)
+ * (可选但建议)[Cloth Config API](https://modrinth.com/mod/cloth-config)
## 常见问题
* 模型的一部分（如头发）始终挡在面前，怎样隐藏它?
- * 增加这个值或许有所帮助，或者使用`禁用`功能
- 
+ * 增加这个值或许有所帮助，或者使用`禁用`功能
+ 
* 按什么键打开模组视图界面?
- * 在按键绑定里自己设置
+ * 在按键绑定里自己设置
* 为什么打不开配置界面（模组设置）?
- * 没有安装[Cloth Config API](https://modrinth.com/mod/cloth-config)
+ * 没有安装[Cloth Config API](https://modrinth.com/mod/cloth-config)
* 为什么ysm模型有时候会弹出绑定失败?
- * 在 Minecraft 1.20.1 中，请使用带有 YSM 专用投影采样器的 Real Camera 版本；无需再使用侧面绑定与翻滚角补偿
-* 为什么配置ysm时候，模型视图界面中ysm模型头部消失?
- * 安装了Better Combat模组，去掉就可以了
+ * 快照0.6.15“尝试”修复了ysm问题，但没有完全修复透彻
+ * 当你的模型旋转到特定角时，由于ysm的`面剔除功能`，你绑定的位置可能消失，导致绑定失败
+ * 可以通过增加`绑定结果保留帧数`来缓解这个问题
+* 为什么装了Better Combat模组后，禁用的材质在挥舞武器时会重新出现?
+ * 前往该模组的设置界面，把First person player animation 的Auto 改为False
### 兼容性
* 不兼容:
- * OptiFine
- * Armourer's Workshop（时装工坊）（真实相机0.6版本以上）
- * 基于GeckoLib的盔甲
- * Customizable Player Models（自定义玩家模型）
- * Epic Fight（史诗战斗）（真实相机0.6版本以下）
- * [TaCZ]永恒枪械工坊：零 1.1.4版本及以上
+ * OptiFine
+ * Armourer's Workshop（时装工坊）（真实相机0.6版本以上）
+ * 基于GeckoLib的盔甲
+ * Customizable Player Models（自定义玩家模型）
+ * Epic Fight（史诗战斗）（真实相机0.6版本以下）
+ * [TaCZ]永恒枪械工坊：零 1.1.4版本及以上
* 兼容:
- * 大多数修改玩家镜头的模组
- * 多数模型模组
- * Armourer's Workshop（时装工坊）（真实相机0.6版本以下）
- * Epic Fight（史诗战斗）（真实相机0.6版本以上）
- * First-person Model（更真实的第一人称模型）
- * Not Enough Animations（更多动画）
- * Player Animation Lib
- * Pehkui
- * ParCool！
- * [TaCZ]永恒枪械工坊：零 1.0.3版本及以下
- * Yes Steve Model（是，史蒂夫模型）（不能稳定兼容）
- * Superb Warfare（卓越前线）
+ * 大多数修改玩家镜头的模组
+ * 多数模型模组
+ * Armourer's Workshop（时装工坊）（真实相机0.6版本以下）
+ * Epic Fight（史诗战斗）（真实相机0.6版本以上）
+ * First-person Model（更真实的第一人称模型）
+ * Not Enough Animations（更多动画）
+ * Player Animation Lib
+ * Pehkui
+ * ParCool！
+ * [TaCZ]永恒枪械工坊：零 1.0.3版本及以下
+ * Yes Steve Model（是，史蒂夫模型）（不能稳定兼容）
+ * Superb Warfare（卓越前线）
* 模型模组与`Real Camera`兼容的必要条件（基于官方映射）：
* 顶点数据获取
- * `Real Camera`通过替换公共方法`EntityRenderDispatcher.render`的`MultiBufferSource multiBufferSource`参数实现顶点数据获取
- * 调用时机为`GameRenderer.renderLevel`流程中的`Camera.setup`阶段之前
- * *因此*，模组需要满足以下技术条件：
- * 渲染`Minecraft.getCameraEntity`时严格使用**传入的**`multiBufferSource`参数，没有通过其他途径获取或创建`MultiBufferSource`实例
- * 在调整后的时机渲染玩家模型，其整体表现不受影响
- * 所有顶点数据最终通过`MultiBufferSource.getBuffer`方法获取的`VertexConsumer`发送给GPU
+ * `Real Camera`通过替换公共方法`EntityRenderDispatcher.render`的`MultiBufferSource multiBufferSource`参数实现顶点数据获取
+ * 调用时机为`GameRenderer.renderLevel`流程中的`Camera.setup`阶段之前
+ * *因此*，模组需要满足以下技术条件：
+ * 渲染`Minecraft.getCameraEntity`时严格使用**传入的**`multiBufferSource`参数，没有通过其他途径获取或创建`MultiBufferSource`实例
+ * 在调整后的时机渲染玩家模型，其整体表现不受影响
+ * 所有顶点数据最终通过`MultiBufferSource.getBuffer`方法获取的`VertexConsumer`发送给GPU
* 渲染次数兼容
- * `Real Camera`通过调用`EntityRenderDispatcher.render`公共方法进行`Minecraft.getCameraEntity`的渲染
- * 这是在一帧中第二次调用`EntityRenderDispatcher.render`方法（第一次是为了解算摄像机参数）
- * *因此*，模组需要满足：同一帧内**多次**渲染玩家模型，其整体表现不受影响
+ * `Real Camera`通过调用`EntityRenderDispatcher.render`公共方法进行`Minecraft.getCameraEntity`的渲染
+ * 这是在一帧中第二次调用`EntityRenderDispatcher.render`方法（第一次是为了解算摄像机参数）
+ * *因此*，模组需要满足：同一帧内**多次**渲染玩家模型，其整体表现不受影响
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 4a6dc1fa..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-plugins {
- id "architectury-plugin" version "3.4-SNAPSHOT"
- id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
-}
-
-architectury {
- minecraft = rootProject.minecraft_version
-}
-
-subprojects {
- apply plugin: "dev.architectury.loom"
-
- loom {
- silentMojangMappingsLicense()
- accessWidenerPath = project(":common").file("src/main/resources/realcamera.accesswidener")
- }
-
- dependencies {
- minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
- mappings loom.officialMojangMappings()
- //mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
- }
-}
-
-allprojects {
- apply plugin: "java"
- apply plugin: "architectury-plugin"
- apply plugin: "maven-publish"
-
- base {
- archivesName = rootProject.archives_base_name
- }
-
- version = rootProject.mod_version + (findProperty("commitSHA") ? "-${(commitSHA as String).substring(0,7)}" : "")
- group = rootProject.maven_group
-
- repositories {
- maven { url "https://maven.shedaniel.me/" }
- maven { url "https://maven.terraformersmc.com/releases/" }
- maven { url "https://api.modrinth.com/maven" }
- //maven { url "https://cursemaven.com" }
- //maven { url "https://www.jitpack.io" }
- }
-
- tasks.withType(JavaCompile).configureEach {
- options.encoding = "UTF-8"
- options.release = 17
- }
-
- java {
- withSourcesJar()
- }
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..2db443ba
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+ id("java-library")
+ id("maven-publish")
+}
+
+allprojects {
+ val commitSHA = findProperty("commitSHA")?.let { "-${it.toString().take(7)}" }.orEmpty()
+ group = property("mod_group_id") as String
+ version = "${property("mod_version")}$commitSHA"
+
+ repositories {
+ mavenCentral()
+ maven("https://libraries.minecraft.net/")
+ maven("https://maven.shedaniel.me/")
+ maven("https://maven.terraformersmc.com/")
+ maven("https://maven.fabricmc.net/")
+ maven("https://maven.minecraftforge.net/")
+ maven("https://api.modrinth.com/maven/")
+ // maven("https://cursemaven.com")
+ // maven("https://www.jitpack.io"
+ }
+}
diff --git a/common/build.gradle b/common/build.gradle
deleted file mode 100644
index f4d27d6a..00000000
--- a/common/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-architectury {
- common(rootProject.enabled_platforms.split(","))
-}
-
-dependencies {
- modCompileOnly "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
- // Cloth Config
- modCompileOnly("me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}") {
- exclude(group: "net.fabricmc.fabric-api")
- }
-}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
new file mode 100644
index 00000000..01cb7847
--- /dev/null
+++ b/common/build.gradle.kts
@@ -0,0 +1,63 @@
+plugins {
+ id("net.fabricmc.fabric-loom-remap")
+ id("maven-publish")
+}
+
+repositories {
+ maven("https://libraries.minecraft.net/")
+ maven("https://maven.fabricmc.net/")
+ maven("https://maven.shedaniel.me/")
+ gradlePluginPortal()
+}
+
+val modId = project.property("mod_id") as String
+val javaVersion = project.property("java_version") as String
+val minecraftVersion = project.property("minecraft_version") as String
+val fabricLoaderVersion = project.property("fabric_loader_version") as String
+
+val clothConfigVersion = project.property("cloth_config_version") as String
+
+base {
+ archivesName = "$modId-$minecraftVersion-fabric"
+}
+
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(javaVersion))
+ }
+ withSourcesJar()
+}
+
+tasks.withType {
+ options.encoding = "UTF-8"
+ options.release.set(javaVersion.toInt())
+}
+
+dependencies {
+ minecraft("com.mojang:minecraft:$minecraftVersion")
+ mappings(loom.officialMojangMappings())
+
+ compileOnly("org.spongepowered:mixin:0.8.5")
+ compileOnly("io.github.llamalad7:mixinextras-common:0.5.3")
+ annotationProcessor("io.github.llamalad7:mixinextras-common:0.5.3")
+ // We depend on Fabric Loader here to use the Fabric @Environment annotations,
+ modCompileOnly("net.fabricmc:fabric-loader:$fabricLoaderVersion")
+
+ // Cloth Config
+ modCompileOnly("me.shedaniel.cloth:cloth-config-fabric:$clothConfigVersion") {
+ exclude(group = "net.fabricmc.fabric-api")
+ }
+}
+
+loom {
+ accessWidenerPath.set(file("src/main/resources/realcamera.accesswidener"))
+}
+
+publishing {
+ publications {
+ register("commonJar") {
+ artifactId = base.archivesName.get()
+ from(components["java"])
+ }
+ }
+}
diff --git a/common/src/main/java/com/xtracr/realcamera/KeyMappings.java b/common/src/main/java/com/xtracr/realcamera/KeyMappings.java
index 599002ec..3a022cc6 100644
--- a/common/src/main/java/com/xtracr/realcamera/KeyMappings.java
+++ b/common/src/main/java/com/xtracr/realcamera/KeyMappings.java
@@ -12,25 +12,25 @@
import java.util.function.Consumer;
public final class KeyMappings {
- private static final Map> KEY_MAPPINGS = new HashMap<>();
public static final KeyMapping MODEL_VIEW_SCREEN;
+ private static final Map> KEY_MAPPINGS = new HashMap<>();
static {
MODEL_VIEW_SCREEN = createKeyMapping("modelViewScreen", client -> client.setScreen(new ModelViewScreen()));
createKeyMapping("togglePerspective", InputConstants.KEY_F6, client -> {
- boolean enabled = ConfigFile.config().enabled();
+ boolean enabled = ConfigFile.config().enabled;
ConfigFile.load();
- ConfigFile.config().setEnabled(!enabled);
+ ConfigFile.config().enabled = !enabled;
RealCameraCore.reset();
});
createKeyMapping("toggleAdjustMode", client -> ConfigFile.config().cycleAdjustMode());
- createKeyMapping("toggleCameraMode", client -> ConfigFile.config().setClassic(!ConfigFile.config().isClassic()));
- createKeyMapping("adjustFRONT", client -> ConfigFile.config().adjustOffsetX(1));
- createKeyMapping("adjustBACK", client -> ConfigFile.config().adjustOffsetX(-1));
+ createKeyMapping("toggleCameraMode", client -> ConfigFile.config().isClassic = !ConfigFile.config().isClassic);
createKeyMapping("adjustUP", client -> ConfigFile.config().adjustOffsetY(1));
createKeyMapping("adjustDOWN", client -> ConfigFile.config().adjustOffsetY(-1));
createKeyMapping("adjustLEFT", client -> ConfigFile.config().adjustOffsetZ(1));
createKeyMapping("adjustRIGHT", client -> ConfigFile.config().adjustOffsetZ(-1));
+ createKeyMapping("adjustFRONT", client -> ConfigFile.config().adjustOffsetX(1));
+ createKeyMapping("adjustBACK", client -> ConfigFile.config().adjustOffsetX(-1));
createKeyMapping("activeConfigIndexNEXT", client -> ConfigFile.config().binding.activeConfigIndex += 1);
createKeyMapping("activeConfigIndexPREV", client -> ConfigFile.config().binding.activeConfigIndex -= 1);
createKeyMapping("activeConfigIndexRESET", client -> ConfigFile.config().binding.activeConfigIndex = 0);
@@ -41,7 +41,7 @@ private static KeyMapping createKeyMapping(String id, Consumer whenPr
}
private static KeyMapping createKeyMapping(String id, int code, Consumer whenPressed) {
- KeyMapping keyMapping = new KeyMapping("key." + RealCamera.FULL_ID + "." + id, code, LocUtil.KEY_CATEGORY_GENERAL);
+ KeyMapping keyMapping = new KeyMapping("key." + RealCamera.FULL_ID + "." + id, code, LocUtil.KEY_MOD_NAME);
KEY_MAPPINGS.put(keyMapping, whenPressed);
return keyMapping;
}
diff --git a/common/src/main/java/com/xtracr/realcamera/RealCamera.java b/common/src/main/java/com/xtracr/realcamera/RealCamera.java
index 94ede4e8..29c931c1 100644
--- a/common/src/main/java/com/xtracr/realcamera/RealCamera.java
+++ b/common/src/main/java/com/xtracr/realcamera/RealCamera.java
@@ -7,9 +7,9 @@
import org.slf4j.LoggerFactory;
public interface RealCamera extends PlatformHelper {
- String MODID = "realcamera";
- String FULL_ID = "xtracr_" + MODID;
- Logger LOGGER = LoggerFactory.getLogger(MODID);
+ String MOD_ID = "realcamera";
+ String FULL_ID = "xtracr_" + MOD_ID;
+ Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
default void initialize() {
ConfigFile.load();
diff --git a/common/src/main/java/com/xtracr/realcamera/RealCameraCore.java b/common/src/main/java/com/xtracr/realcamera/RealCameraCore.java
index 591b9089..a1f14d9e 100644
--- a/common/src/main/java/com/xtracr/realcamera/RealCameraCore.java
+++ b/common/src/main/java/com/xtracr/realcamera/RealCameraCore.java
@@ -17,6 +17,7 @@
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
import net.minecraft.world.phys.Vec3;
import org.joml.Matrix3f;
import org.joml.Matrix4f;
@@ -43,8 +44,8 @@ public static BindTarget currentTarget() {
public static void initialize(Minecraft client) {
Entity entity = client.getCameraEntity();
- active = ConfigFile.config().enabled() && client.options.getCameraType().isFirstPerson() && entity != null && !DisableHelper.MAIN_FEATURE.disabled(entity);
- rendering = ConfigFile.config().renderModel() && !DisableHelper.RENDER_MODEL.disabled(entity);
+ active = ConfigFile.config().enabled && client.options.getCameraType().isFirstPerson() && entity != null && !DisableHelper.MAIN_FEATURE.disabled(entity);
+ rendering = ConfigFile.config().renderModel && !DisableHelper.RENDER_MODEL.disabled(entity);
}
public static void reset() {
@@ -63,7 +64,7 @@ public static float getYaw(float f) {
}
public static float getRoll(float f) {
- if (ConfigFile.config().isClassic()) return f + ConfigFile.config().getClassicRoll();
+ if (ConfigFile.config().isClassic) return f + ConfigFile.config().getClassicRoll();
return (float) getEulerAngle(0, 0, f).z();
}
@@ -92,25 +93,25 @@ public static void computeCamera(Minecraft client, float deltaTick) {
Entity entity = client.getCameraEntity();
boolean invisible = entity.isInvisible();
entity.setInvisible(false);
- newResult = RealCameraAPI.computeBindResult(client, deltaTick);
- if (!newResult.available()) {
- EntityRenderDispatcher dispatcher = client.getEntityRenderDispatcher();
- try {
+ try {
+ newResult = RealCameraAPI.computeBindResult(client, deltaTick);
+ if (!newResult.available()) {
+ EntityRenderDispatcher dispatcher = client.getEntityRenderDispatcher();
dispatcher.render(entity, 0, 0, 0, Mth.lerp(deltaTick, entity.yRotO, entity.getYRot()), deltaTick, new PoseStack(), vertexCatcher, dispatcher.getPackedLightCoords(entity, deltaTick));
vertexCatcher.forEachBuffer(RealCameraCore::computeBindResult);
- } finally {
- vertexCatcher.clear();
}
+ } finally {
+ vertexCatcher.clear();
+ entity.setInvisible(invisible);
}
- entity.setInvisible(invisible);
if (newResult.available()) {
failureFrames = 0;
lastResult = newResult.computeCamera(false);
} else {
failureFrames++;
- Entity player = client.player;
- int retentionFrames = ConfigFile.config().getBindResultRetentionFrames();
- if (!ConfigFile.config().hideBindingFailureMessage() && failureFrames == retentionFrames + 1 && player != null) {
+ Player player = client.player;
+ int retentionFrames = ConfigFile.config().binding.bindResultRetentionFrames;
+ if (!ConfigFile.config().binding.hideFailureMessage && failureFrames == retentionFrames + 1 && player != null) {
player.sendSystemMessage(LocUtil.MESSAGE("bindingFailed", LocUtil.MOD_NAME(), LocUtil.MODEL_VIEW_TITLE(), KeyMappings.MODEL_VIEW_SCREEN.getTranslatedKeyMessage()));
}
if (!lastResult.available() || failureFrames > retentionFrames) {
@@ -119,8 +120,8 @@ public static void computeCamera(Minecraft client, float deltaTick) {
return;
}
}
- smoothedCamera.lerpPosition(lastResult.getPosition(), 1 - ConfigFile.config().getDisplacementSmoothFactor());
- smoothedCamera.slerpRotation(lastResult.getRotation(), 1 - ConfigFile.config().getRotationSmoothFactor());
+ smoothedCamera.lerpPosition(lastResult.getPosition(), 1 - ConfigFile.config().binding.displacementSmoothFactor);
+ smoothedCamera.slerpRotation(lastResult.getRotation(), 1 - ConfigFile.config().binding.rotationSmoothFactor);
}
public static void renderCameraEntity(Minecraft client, float deltaTick, MultiBufferSource bufferSource) {
@@ -175,8 +176,19 @@ private static void computeBindResult(BuiltIterableBuffer builtBuffer) {
BindResult result = new BindResult(target);
BindTarget.TargetConfig config = target.targetConfig();
VertexData.UV[] uvs = {new VertexData.UV(config.posU(), config.posV()), new VertexData.UV(config.forwardU(), config.forwardV()), new VertexData.UV(config.upwardU(), config.upwardV())};
- VertexData[][] primitives = builtBuffer.resolvePrimitives(uvs);
- for (VertexData[] primitive : primitives) if (primitive == null) continue targetFor;
+ VertexData[][] primitives = builtBuffer.findPrimitivesInCache(uvs);
+ boolean allFound = true;
+ for (int i = 0; i < primitives.length; i++) {
+ if (primitives[i] != null) uvs[i] = null;
+ else allFound = false;
+ }
+ if (!allFound) {
+ VertexData[][] newPrimitives = builtBuffer.findPrimitives(uvs);
+ for (int i = 0; i < primitives.length; i++) {
+ if (newPrimitives[i] == null && primitives[i] == null) continue targetFor;
+ else if (newPrimitives[i] != null) primitives[i] = newPrimitives[i];
+ }
+ }
if (primitives[0] != null) result.setPosition(VertexData.position(primitives[0], config.posU(), config.posV()));
if (primitives[1] != null) result.setForward(VertexData.normal(primitives[1]));
if (primitives[2] != null) result.setUpward(VertexData.normal(primitives[2]));
diff --git a/common/src/main/java/com/xtracr/realcamera/api/BindResult.java b/common/src/main/java/com/xtracr/realcamera/api/BindResult.java
index ac7dd12d..61a6fd37 100644
--- a/common/src/main/java/com/xtracr/realcamera/api/BindResult.java
+++ b/common/src/main/java/com/xtracr/realcamera/api/BindResult.java
@@ -19,7 +19,7 @@ public BindResult(BindTarget target) {
}
public static BindResult getOrCreate(String name) {
- List fixedTargets = ConfigFile.config().getFixedTargetList();
+ List fixedTargets = ConfigFile.config().binding.fixedTargetList;
BindTarget target = fixedTargets.stream()
.filter(t -> t.name().equals(name))
.findFirst()
diff --git a/common/src/main/java/com/xtracr/realcamera/compat/CompatibilityHelper.java b/common/src/main/java/com/xtracr/realcamera/compat/CompatibilityHelper.java
index fcc4df84..b225c705 100644
--- a/common/src/main/java/com/xtracr/realcamera/compat/CompatibilityHelper.java
+++ b/common/src/main/java/com/xtracr/realcamera/compat/CompatibilityHelper.java
@@ -12,8 +12,10 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.function.Function;
-public class CompatibilityHelper {
+public final class CompatibilityHelper {
+ public static boolean isRenderInScreen;
private static PlatformHelper platformHelper;
private static Method NEA_playerTransformer_setDeltaTick;
private static Field NEA_NEAnimationsLoader_INSTANCE;
@@ -58,6 +60,18 @@ public static void initialize(PlatformHelper platformHelper) {
} catch (Exception e) {
RealCamera.LOGGER.warn("Compatibility with SuperbWarfare is outdated: [{}] {}", e.getClass().getName(), e.getMessage());
}
+ if (isModLoaded("entity_model_features")) try {
+ Class EMF_EMFAnimationApi = Class.forName("traben.entity_model_features.EMFAnimationApi");
+ if ((int) EMF_EMFAnimationApi.getMethod("getApiVersion").invoke(null) >= 9) {
+ Function function = object -> isRenderInScreen;
+ Method EMF_registerPauseCondition = EMF_EMFAnimationApi.getMethod("registerPauseCondition", Function.class);
+ EMF_registerPauseCondition.invoke(null, function);
+ } else {
+ throw new IllegalStateException("EntityModelFeatures API is outdated, players‘s heads in the modelView may flicker");
+ }
+ } catch (Exception e) {
+ RealCamera.LOGGER.warn("Compatibility with EntityModelFeatures is outdated: [{}] {}", e.getClass().getName(), e.getMessage());
+ }
if (isModLoaded("tacz")) try {
TACZ_IClientPlayerGunOperator = Class.forName("com.tacz.guns.api.client.gameplay.IClientPlayerGunOperator");
TACZ_IClientPlayerGunOperator_fromLocalPlayer = TACZ_IClientPlayerGunOperator.getMethod("fromLocalPlayer", LocalPlayer.class);
@@ -107,7 +121,7 @@ public static void NEA_setDeltaTick(float deltaTick) {
}
public static void forceSetCameraPos(Camera camera) {
- if (RealCameraCore.isActive() && !ConfigFile.config().isClassic()) {
+ if (RealCameraCore.isActive() && !ConfigFile.config().isClassic) {
((CameraAccessor) camera).invokeSetPosition(RealCameraCore.getCameraPos(camera.getPosition()));
}
}
diff --git a/common/src/main/java/com/xtracr/realcamera/compat/DisableHelper.java b/common/src/main/java/com/xtracr/realcamera/compat/DisableHelper.java
index 558e6d49..61f1d073 100644
--- a/common/src/main/java/com/xtracr/realcamera/compat/DisableHelper.java
+++ b/common/src/main/java/com/xtracr/realcamera/compat/DisableHelper.java
@@ -15,25 +15,26 @@
import java.util.function.Predicate;
import java.util.regex.Pattern;
-public class DisableHelper {
+public final class DisableHelper {
+ public static final Entry MAIN_FEATURE, RENDER_MODEL, RENDER_HANDS;
private static final Pattern MULTI_STAR = Pattern.compile("\\*+");
private static final Predicate FALSE = player -> false;
- private static final Map entries = new HashMap<>();
- public static final Entry MAIN_FEATURE = new Entry("mainFeature", player -> player.isSleeping() || player.isSpectator());
- public static final Entry RENDER_MODEL = new Entry("renderModel", FALSE, Player::isScoping);
- public static final Entry RENDER_HANDS = new Entry("renderHands", player -> RealCameraCore.isRendering());
- public static int exitTick = 0;
+ private static final Map ENTRIES = new HashMap<>();
+ private static int exitTick = 0;
static {
- MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().bindingDisableWhenSneaking() && player.isCrouching());
- MAIN_FEATURE.registerOrInClassic(player -> ConfigFile.config().classicDisableWhenSneaking() && player.isCrouching());
- MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().bindingDisableWhenSwimming() && checkCondition(player, player.isSwimming(), ConfigFile.config().getBindingOutTick()));
- MAIN_FEATURE.registerOrInClassic(player -> ConfigFile.config().classicDisableWhenSwimming() && checkCondition(player, player.isSwimming(), ConfigFile.config().getClassicOutTick()));
- MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().bindingDisableWhenCrawling() && checkCondition(player, player.isVisuallyCrawling(), ConfigFile.config().getBindingOutTick()));
+ MAIN_FEATURE = new Entry("mainFeature", player -> player.isSleeping() || player.isSpectator());
+ RENDER_MODEL = new Entry("renderModel", FALSE, Player::isScoping);
+ RENDER_HANDS = new Entry("renderHands", player -> RealCameraCore.isRendering());
+ MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().binding.disableWhenSneaking && player.isCrouching());
+ MAIN_FEATURE.registerOrInClassic(player -> ConfigFile.config().classic.disableWhenSneaking && player.isCrouching());
+ MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().binding.disableWhenSwimming && checkCondition(player, player.isVisuallySwimming(), ConfigFile.config().binding.exitTick));
+ MAIN_FEATURE.registerOrInClassic(player -> ConfigFile.config().classic.disableWhenSwimming && checkCondition(player, player.isVisuallySwimming(), ConfigFile.config().classic.exitTick));
+ MAIN_FEATURE.registerOrInBinding(player -> ConfigFile.config().binding.disableWhenFlying && player.isFallFlying());
MAIN_FEATURE.registerOrInBinding(player -> {
Item mainHand = player.getMainHandItem().getItem();
Item offHand = player.getOffhandItem().getItem();
- for (String pattern : ConfigFile.config().getDisableMainFeatureItems())
+ for (String pattern : ConfigFile.config().binding.disableMainFeatureItems)
if (matchesItemPattern(mainHand, pattern) || matchesItemPattern(offHand, pattern))
return true;
return false;
@@ -41,7 +42,7 @@ public class DisableHelper {
RENDER_MODEL.registerOrInBinding(player -> {
Item mainHand = player.getMainHandItem().getItem();
Item offHand = player.getOffhandItem().getItem();
- for (String pattern : ConfigFile.config().getDisableRenderItems())
+ for (String pattern : ConfigFile.config().binding.disableRenderItems)
if (matchesItemPattern(mainHand, pattern) || matchesItemPattern(offHand, pattern))
return true;
return false;
@@ -65,7 +66,7 @@ private static boolean checkCondition(Player player, boolean condition, int outT
@Deprecated
public static void registerOr(String name, Predicate predicate) {
- entries.get(name).registerOrInBinding(predicate::test);
+ ENTRIES.get(name).registerOrInBinding(predicate::test);
}
public static boolean matchesItemPattern(Item item, String pattern) {
@@ -115,7 +116,7 @@ protected Entry(String name, Predicate predicate) {
protected Entry(String name, Predicate predicateInClassic, Predicate predicateInBinding) {
this.predicateInClassic = predicateInClassic;
this.predicateInBinding = predicateInBinding;
- entries.put(name, this);
+ ENTRIES.put(name, this);
}
public void registerOr(Predicate predicate) {
@@ -124,16 +125,18 @@ public void registerOr(Predicate predicate) {
}
public void registerOrInClassic(Predicate predicate) {
- this.predicateInClassic = this.predicateInClassic.or(predicate);
+ if (predicateInClassic == FALSE) predicateInClassic = predicate;
+ else predicateInClassic = predicateInClassic.or(predicate);
}
public void registerOrInBinding(Predicate predicate) {
- this.predicateInBinding = this.predicateInBinding.or(predicate);
+ if (predicateInBinding == FALSE) predicateInBinding = predicate;
+ else predicateInBinding = predicateInBinding.or(predicate);
}
public boolean disabled(Entity cameraEntity) {
if (!(cameraEntity instanceof Player player)) return false;
- return ConfigFile.config().isClassic() ? predicateInClassic.test(player) : predicateInBinding.test(player);
+ return ConfigFile.config().isClassic ? predicateInClassic.test(player) : predicateInBinding.test(player);
}
}
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/compat/LegacyBindingMode.java b/common/src/main/java/com/xtracr/realcamera/compat/LegacyBindingMode.java
index 4579387f..c0a7241c 100644
--- a/common/src/main/java/com/xtracr/realcamera/compat/LegacyBindingMode.java
+++ b/common/src/main/java/com/xtracr/realcamera/compat/LegacyBindingMode.java
@@ -24,7 +24,7 @@ public static void register() {
}
private static BindResult computeBindResult(Minecraft client, float deltaTick) {
- if (!ConfigFile.config().legacyBindingMode()) return BindResult.EMPTY;
+ if (!ConfigFile.config().binding.legacyMode) return BindResult.EMPTY;
PoseStack poseStack = new PoseStack();
AbstractClientPlayer player = client.player;
// WorldRenderer.render
diff --git a/common/src/main/java/com/xtracr/realcamera/compat/TetrahedralProbeSet.java b/common/src/main/java/com/xtracr/realcamera/compat/TetrahedralProbeSet.java
index 03ebaa74..8975ade8 100644
--- a/common/src/main/java/com/xtracr/realcamera/compat/TetrahedralProbeSet.java
+++ b/common/src/main/java/com/xtracr/realcamera/compat/TetrahedralProbeSet.java
@@ -1,7 +1,6 @@
package com.xtracr.realcamera.compat;
import org.joml.Matrix4f;
-import org.joml.Matrix4fc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
@@ -25,10 +24,6 @@ final class TetrahedralProbeSet {
private TetrahedralProbeSet() {
}
- static Vector3fc direction(int pass) {
- return DIRECTIONS[pass];
- }
-
static Matrix4f projection(int pass) {
return PROJECTIONS[pass];
}
diff --git a/common/src/main/java/com/xtracr/realcamera/config/BindTarget.java b/common/src/main/java/com/xtracr/realcamera/config/BindTarget.java
index 8f2063e8..10fb3f06 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/BindTarget.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/BindTarget.java
@@ -35,7 +35,8 @@ private static BindTarget vanillaTarget(String name, int priority, boolean shoul
offsets.x = -0.1f;
DisableConfig playerHead = new DisableConfig("player_head", textureId, false, List.of(new UVRectangle(0, 0, 1.0f, 0.25f)));
DisableConfig dragonHead = new DisableConfig("dragon_head", "minecraft:textures/entity/enderdragon/dragon.png", true, List.of());
- return new BindTarget(name, textureId, priority, 0.2f, targetConfig, bindConfig, offsets, List.of(playerHead, dragonHead));
+ List disableConfigs = List.of(playerHead, dragonHead);
+ return new BindTarget(name, textureId, priority, 0.2f, targetConfig, bindConfig, offsets, disableConfigs);
}
public boolean isEmpty() {
diff --git a/common/src/main/java/com/xtracr/realcamera/config/ConfigFile.java b/common/src/main/java/com/xtracr/realcamera/config/ConfigFile.java
index eefa33e5..23512dcb 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/ConfigFile.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/ConfigFile.java
@@ -1,45 +1,45 @@
package com.xtracr.realcamera.config;
+import com.google.common.base.Suppliers;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.xtracr.realcamera.RealCamera;
import net.minecraft.client.Minecraft;
+import org.jetbrains.annotations.Nullable;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.function.Supplier;
-public class ConfigFile {
- private static final ModConfig modConfig = new ModConfig();
- private static final String FILE_NAME = RealCamera.MODID + ".json";
+public final class ConfigFile {
+ private static final String FILE_NAME = RealCamera.MOD_ID + ".json";
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
- private static final Path PATH;
-
- static {
- File configDir = new File(Minecraft.getInstance().gameDirectory, "config");
- if (!configDir.exists()) configDir.mkdirs();
- PATH = configDir.toPath().resolve(FILE_NAME);
- }
+ private final static Supplier path = Suppliers.memoize(ConfigFile::getPath);
+ @Nullable
+ private static ModConfig config;
public static ModConfig config() {
- return modConfig;
+ if (config == null) load();
+ return config;
}
public static void load() {
- try (BufferedReader reader = Files.newBufferedReader(PATH)) {
- modConfig.set(GSON.fromJson(reader, ModConfig.class));
- modConfig.clamp();
+ try (BufferedReader reader = Files.newBufferedReader(path.get())) {
+ config = GSON.fromJson(reader, ModConfig.class);
+ config.clamp();
} catch (Exception exception) {
- RealCamera.LOGGER.warn("Failed to load " + FILE_NAME);
+ RealCamera.LOGGER.warn("Failed to load " + FILE_NAME, exception);
+ config = new ModConfig();
save();
}
}
public static void save() {
- try (BufferedWriter writer = Files.newBufferedWriter(PATH)) {
- GSON.toJson(modConfig, writer);
+ try (BufferedWriter writer = Files.newBufferedWriter(path.get())) {
+ GSON.toJson(config, writer);
} catch (Exception exception) {
RealCamera.LOGGER.warn("Failed to save " + FILE_NAME, exception);
reset();
@@ -47,11 +47,18 @@ public static void save() {
}
public static void reset() {
- try (BufferedWriter writer = Files.newBufferedWriter(PATH)) {
- modConfig.set(new ModConfig());
- GSON.toJson(modConfig, writer);
+ try (BufferedWriter writer = Files.newBufferedWriter(path.get())) {
+ config = new ModConfig();
+ GSON.toJson(config, writer);
} catch (Exception exception) {
RealCamera.LOGGER.warn("Failed to reset " + FILE_NAME, exception);
}
}
+
+ @SuppressWarnings("ResultOfMethodCallIgnored")
+ private static Path getPath() {
+ File configDir = new File(Minecraft.getInstance().gameDirectory, "config");
+ if (!configDir.exists()) configDir.mkdirs();
+ return configDir.toPath().resolve(FILE_NAME);
+ }
}
diff --git a/common/src/main/java/com/xtracr/realcamera/config/ConfigScreen.java b/common/src/main/java/com/xtracr/realcamera/config/ConfigScreen.java
index f6399e09..a0ed7953 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/ConfigScreen.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/ConfigScreen.java
@@ -11,7 +11,7 @@
import java.util.List;
-public class ConfigScreen {
+public final class ConfigScreen {
public static Screen create(Screen parent) {
ConfigFile.load();
ModConfig config = ConfigFile.config();
@@ -60,12 +60,12 @@ public static Screen create(Screen parent) {
.setDefaultValue(false)
.setSaveConsumer(b -> config.classic.disableWhenSwimming = b)
.build());
- classic.addEntry(entryBuilder.startIntField(LocUtil.CONFIG_OPTION("outTick"), config.classic.outTick)
+ classic.addEntry(entryBuilder.startIntField(LocUtil.CONFIG_OPTION("exitTick"), config.classic.exitTick)
.setDefaultValue(13)
.setMin(0)
.setMax(40)
- .setTooltip(LocUtil.CONFIG_TOOLTIP("outTick"))
- .setSaveConsumer(i -> config.classic.outTick = i)
+ .setTooltip(LocUtil.CONFIG_TOOLTIP("exitTick"))
+ .setSaveConsumer(i -> config.classic.exitTick = i)
.build());
classic.addEntry(entryBuilder.startDoubleField(LocUtil.CONFIG_OPTION("scale"), config.classic.scale)
.setDefaultValue(8.0)
@@ -140,7 +140,7 @@ public static Screen create(Screen parent) {
binding.addEntry(entryBuilder.startTextDescription(LocUtil.CONFIG_OPTION("toModelViewScreen",
LocUtil.MODEL_VIEW_TITLE().withStyle(ChatFormatting.BLUE)))
.build());
- binding.addEntry(entryBuilder.startKeyCodeField(LocUtil.CONFIG_OPTION("screenModifierKey", LocUtil.MODEL_VIEW_TITLE()), config.getScreenModifierKey())
+ binding.addEntry(entryBuilder.startKeyCodeField(LocUtil.CONFIG_OPTION("screenModifierKey", LocUtil.MODEL_VIEW_TITLE()), InputConstants.getKey(config.binding.screenModifierKey))
.setDefaultValue(InputConstants.Type.KEYSYM.getOrCreate(InputConstants.KEY_LALT))
.setAllowMouse(false)
.setAllowModifiers(false)
@@ -196,20 +196,20 @@ public static Screen create(Screen parent) {
.setDefaultValue(false)
.setSaveConsumer(b -> config.binding.disableWhenSneaking = b)
.build());
- disableConfig.add(entryBuilder.startBooleanToggle(LocUtil.CONFIG_OPTION("disableWhenCrawling"), config.binding.disableWhenCrawling)
- .setDefaultValue(false)
- .setSaveConsumer(b -> config.binding.disableWhenCrawling = b)
- .build());
disableConfig.add(entryBuilder.startBooleanToggle(LocUtil.CONFIG_OPTION("disableWhenSwimming"), config.binding.disableWhenSwimming)
.setDefaultValue(false)
.setSaveConsumer(b -> config.binding.disableWhenSwimming = b)
.build());
- disableConfig.add(entryBuilder.startIntField(LocUtil.CONFIG_OPTION("outTick"), config.binding.outTick)
+ disableConfig.add(entryBuilder.startBooleanToggle(LocUtil.CONFIG_OPTION("disableWhenFlying"), config.binding.disableWhenFlying)
+ .setDefaultValue(false)
+ .setSaveConsumer(b -> config.binding.disableWhenFlying = b)
+ .build());
+ disableConfig.add(entryBuilder.startIntField(LocUtil.CONFIG_OPTION("exitTick"), config.binding.exitTick)
.setDefaultValue(13)
.setMin(0)
.setMax(40)
- .setTooltip(LocUtil.CONFIG_TOOLTIP("outTick"))
- .setSaveConsumer(i -> config.binding.outTick = i)
+ .setTooltip(LocUtil.CONFIG_TOOLTIP("exitTick"))
+ .setSaveConsumer(i -> config.binding.exitTick = i)
.build());
disableConfig.add(entryBuilder.startStrList(LocUtil.CONFIG_OPTION("disableMainFeatureItems"), config.binding.disableMainFeatureItems)
.setDefaultValue(List.of())
@@ -225,4 +225,4 @@ public static Screen create(Screen parent) {
return builder.build();
}
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/ModConfig.java b/common/src/main/java/com/xtracr/realcamera/config/ModConfig.java
index 5d95a3f4..9eb9d1fe 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/ModConfig.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/ModConfig.java
@@ -9,26 +9,16 @@
import java.util.List;
import java.util.stream.IntStream;
-public class ModConfig {
+public final class ModConfig {
public static final double MIN_OFFSET_D = -1.0, MAX_OFFSET_D = 1.0;
public static final float MIN_OFFSET_F = -1.0f, MAX_OFFSET_F = 1.0f;
+ public final Classic classic = new Classic();
+ public final Binding binding = new Binding();
public boolean enabled = false;
public boolean isClassic = false;
public boolean dynamicCrosshair = false;
public boolean renderModel = true;
public double adjustStep = 0.01;
- public Classic classic = new Classic();
- public Binding binding = new Binding();
-
- public void set(ModConfig modConfig) {
- enabled = modConfig.enabled;
- isClassic = modConfig.isClassic;
- dynamicCrosshair = modConfig.dynamicCrosshair;
- renderModel = modConfig.renderModel;
- adjustStep = modConfig.adjustStep;
- classic = modConfig.classic;
- binding = modConfig.binding;
- }
public void clamp() {
adjustStep = Mth.clamp(adjustStep, 0.0, MAX_OFFSET_D);
@@ -36,30 +26,6 @@ public void clamp() {
binding.clamp();
}
- public boolean enabled() {
- return enabled;
- }
-
- public void setEnabled(boolean value) {
- enabled = value;
- }
-
- public boolean isClassic() {
- return isClassic;
- }
-
- public void setClassic(boolean value) {
- isClassic = value;
- }
-
- public boolean dynamicCrosshair() {
- return dynamicCrosshair;
- }
-
- public boolean renderModel() {
- return renderModel;
- }
-
public void cycleAdjustMode() {
if (isClassic) classic.adjustMode = classic.adjustMode.cycle();
else binding.adjustOffset = !binding.adjustOffset;
@@ -113,24 +79,6 @@ public void adjustOffsetZ(int count) {
}
}
- // classic
- public boolean classicDisableWhenSneaking() {
- return classic.disableWhenSneaking;
- }
-
- public boolean classicDisableWhenSwimming() {
- return classic.disableWhenSwimming;
- }
-
- public int getClassicOutTick() {
- return classic.outTick;
- }
-
- @Deprecated
- public int getClassicSwimOutTick() {
- return getClassicOutTick();
- }
-
public double getClassicX() {
return classic.cameraX * classic.scale;
}
@@ -167,75 +115,7 @@ public float getClassicRoll() {
return classic.roll;
}
- // binding
- public InputConstants.Key getScreenModifierKey() {
- return InputConstants.getKey(binding.screenModifierKey);
- }
-
- public boolean legacyBindingMode() {
- return binding.legacyMode;
- }
-
- public boolean renderStuckObjects() {
- return binding.renderStuckObjects;
- }
-
- public boolean hideBindingFailureMessage() {
- return binding.hideFailureMessage;
- }
-
- public boolean bindingDisableWhenCrawling() {
- return binding.disableWhenCrawling;
- }
-
- public boolean bindingDisableWhenSneaking() {
- return binding.disableWhenSneaking;
- }
-
- public boolean bindingDisableWhenSwimming() {
- return binding.disableWhenSwimming;
- }
-
- public int getBindingOutTick() {
- return binding.outTick;
- }
-
- @Deprecated
- public int getBindingSwimOutTick() {
- return getBindingOutTick();
- }
-
- public int getBindResultRetentionFrames() {
- return binding.bindResultRetentionFrames;
- }
-
- public double getDisplacementSmoothFactor() {
- return binding.displacementSmoothFactor;
- }
-
- public double getRotationSmoothFactor() {
- return binding.rotationSmoothFactor;
- }
-
- public List getDisableMainFeatureItems() {
- return binding.disableMainFeatureItems;
- }
-
- public List getDisableRenderItems() {
- return binding.disableRenderItems;
- }
-
- public List getFixedTargetList() {
- return binding.fixedTargetList;
- }
-
- public List getBindTargetList() {
- binding.clamp();
- return binding.targetList;
- }
-
public List getBindTargetList(String textureId) {
- binding.clamp();
int activeConfigIndex = binding.activeConfigIndex;
List matchedTargets = binding.targetList.stream().filter(target -> textureId.contains(target.textureId())).toList();
if (activeConfigIndex <= 0 || matchedTargets.isEmpty()) return matchedTargets;
@@ -263,9 +143,7 @@ public static class Classic {
public AdjustMode adjustMode = AdjustMode.CAMERA;
public boolean disableWhenSneaking = false;
public boolean disableWhenSwimming = false;
- public int outTick = 13;
- @Deprecated
- public Integer swimOutTick = null;
+ public int exitTick = 13;
public double scale = 8.0;
public double cameraX = -0.5;
public double cameraY = 0.04;
@@ -279,11 +157,7 @@ public static class Classic {
private void clamp() {
if (adjustMode == null) adjustMode = AdjustMode.CAMERA;
- if (swimOutTick != null) {
- if (outTick == 13) outTick = swimOutTick;
- swimOutTick = null;
- }
- outTick = Mth.clamp(outTick, 0, 40);
+ exitTick = Mth.clamp(exitTick, 0, 40);
scale = Mth.clamp(scale, 0.0, 64.0);
cameraX = Mth.clamp(cameraX, MIN_OFFSET_D, MAX_OFFSET_D);
cameraY = Mth.clamp(cameraY, MIN_OFFSET_D, MAX_OFFSET_D);
@@ -311,17 +185,13 @@ public static class Binding {
protected static final List DEFAULT_DISABLE_RENDER_ITEMS = List.of("minecraft:filled_map");
public String screenModifierKey = InputConstants.Type.KEYSYM.getOrCreate(InputConstants.KEY_LALT).getName();
public boolean legacyMode = false;
- @Deprecated
- public Boolean legacyBindingMode = null;
public boolean adjustOffset = true;
public boolean hideFailureMessage = false;
public boolean renderStuckObjects = true;
- public boolean disableWhenCrawling = false;
public boolean disableWhenSneaking = false;
public boolean disableWhenSwimming = false;
- public int outTick = 13;
- @Deprecated
- public Integer swimOutTick = null;
+ public boolean disableWhenFlying = false;
+ public int exitTick = 13;
public int bindResultRetentionFrames = 2;
public int activeConfigIndex = 0;
public double displacementSmoothFactor = 0.4;
@@ -337,15 +207,7 @@ private void clamp() {
} catch (Exception e) {
screenModifierKey = InputConstants.Type.KEYSYM.getOrCreate(InputConstants.KEY_LALT).getName();
}
- if (swimOutTick != null) {
- if (outTick == 13) outTick = swimOutTick;
- swimOutTick = null;
- }
- if (legacyBindingMode != null) {
- legacyMode = legacyBindingMode;
- legacyBindingMode = null;
- }
- outTick = Mth.clamp(outTick, 0, 40);
+ exitTick = Mth.clamp(exitTick, 0, 40);
bindResultRetentionFrames = Math.max(bindResultRetentionFrames, 0);
activeConfigIndex = Math.max(activeConfigIndex, 0);
displacementSmoothFactor = Mth.clamp(displacementSmoothFactor, 0.0, 1.0);
@@ -361,4 +223,4 @@ private void clamp() {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/OffsetConfig.java b/common/src/main/java/com/xtracr/realcamera/config/OffsetConfig.java
index 51136433..e3dded99 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/OffsetConfig.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/OffsetConfig.java
@@ -27,73 +27,4 @@ public void clamp() {
yaw = Mth.wrapDegrees(yaw);
roll = Mth.wrapDegrees(roll);
}
-
- public float getScale() {
- return scale;
- }
-
- public OffsetConfig setScale(float scale) {
- this.scale = scale;
- return this;
- }
-
- public float getX() {
- return x;
- }
-
- public OffsetConfig setX(float x) {
- this.x = x;
- clamp();
- return this;
- }
-
- public float getY() {
- return y;
- }
-
- public OffsetConfig setY(float y) {
- this.y = y;
- clamp();
- return this;
- }
-
- public float getZ() {
- return z;
- }
-
- public OffsetConfig setZ(float z) {
- this.z = z;
- clamp();
- return this;
- }
-
- public float getPitch() {
- return pitch;
- }
-
- public OffsetConfig setPitch(float pitch) {
- this.pitch = pitch;
- clamp();
- return this;
- }
-
- public float getYaw() {
- return yaw;
- }
-
- public OffsetConfig setYaw(float yaw) {
- this.yaw = yaw;
- clamp();
- return this;
- }
-
- public float getRoll() {
- return roll;
- }
-
- public OffsetConfig setRoll(float roll) {
- this.roll = roll;
- clamp();
- return this;
- }
}
diff --git a/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec.java b/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec.java
index 78bbd5dc..9762c2d5 100644
--- a/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec.java
+++ b/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec.java
@@ -2,40 +2,43 @@
import com.mojang.serialization.DataResult;
import com.xtracr.realcamera.config.BindTarget;
-import com.xtracr.realcamera.config.DisableConfig;
-import com.xtracr.realcamera.config.OffsetConfig;
-import com.xtracr.realcamera.config.UVRectangle;
+import com.xtracr.realcamera.config.codec.utli.StreamCodec;
+import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
-import net.minecraft.network.FriendlyByteBuf;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.EncoderException;
+import it.unimi.dsi.fastutil.shorts.Short2ReferenceMap;
+import it.unimi.dsi.fastutil.shorts.Short2ReferenceOpenHashMap;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
import java.util.Base64;
-import java.util.List;
+import java.util.Map;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
public final class ConfigCodec {
- private static final short CURRENT_VERSION = 703;
-
- private ConfigCodec() {
- }
+ static final short CURRENT_VERSION = 703;
+ static final Short2ReferenceMap> CODECS = new Short2ReferenceOpenHashMap<>(Map.of(
+ CURRENT_VERSION, ConfigCodec703.CODEC
+ ));
- public static BindTarget readWithVersion(FriendlyByteBuf byteBuf) throws IllegalArgumentException {
+ public static BindTarget readWithVersion(ByteBuf byteBuf) throws DecoderException, IllegalArgumentException {
short version = byteBuf.readShort();
- if (version != CURRENT_VERSION) throw new IllegalArgumentException("Invalid version: " + version + ", expected " + CURRENT_VERSION);
- return readTarget(byteBuf);
+ StreamCodec serializer = CODECS.get(version);
+ if (serializer == null) throw new IllegalArgumentException("Incompatible version: " + toSemVer(version));
+ return serializer.decode(byteBuf);
}
- public static void writeWithVersion(FriendlyByteBuf byteBuf, BindTarget bindTarget) {
+ public static void writeWithVersion(ByteBuf byteBuf, BindTarget bindTarget) throws EncoderException {
byteBuf.writeShort(CURRENT_VERSION);
- writeTarget(byteBuf, bindTarget);
+ CODECS.get(CURRENT_VERSION).encode(byteBuf, bindTarget);
}
public static DataResult fromCompressedBase64(String base64) {
- FriendlyByteBuf byteBuf = null;
+ ByteBuf byteBuf = null;
try {
byte[] compressed = Base64.getDecoder().decode(base64);
InflaterInputStream inflaterStream = new InflaterInputStream(new ByteArrayInputStream(compressed));
@@ -45,7 +48,8 @@ public static DataResult fromCompressedBase64(String base64) {
while ((length = inflaterStream.read(buffer)) > 0) {
outputStream.write(buffer, 0, length);
}
- byteBuf = new FriendlyByteBuf(Unpooled.wrappedBuffer(outputStream.toByteArray()));
+ byte[] bytes = outputStream.toByteArray();
+ byteBuf = Unpooled.wrappedBuffer(bytes);
BindTarget target = readWithVersion(byteBuf);
if (target.isEmpty()) return DataResult.error(() -> "Invalid config format");
return DataResult.success(target);
@@ -61,7 +65,7 @@ public static DataResult fromCompressedBase64(String base64) {
}
public static DataResult toCompressedBase64(BindTarget bindTarget) {
- FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
+ ByteBuf byteBuf = Unpooled.buffer();
try {
writeWithVersion(byteBuf, bindTarget);
byte[] bytes = new byte[byteBuf.readableBytes()];
@@ -70,7 +74,8 @@ public static DataResult toCompressedBase64(BindTarget bindTarget) {
try (DeflaterOutputStream deflaterStream = new DeflaterOutputStream(outputStream, new Deflater(Deflater.BEST_COMPRESSION))) {
deflaterStream.write(bytes);
}
- return DataResult.success(Base64.getEncoder().encodeToString(outputStream.toByteArray()));
+ String base64 = Base64.getEncoder().encodeToString(outputStream.toByteArray());
+ return DataResult.success(base64);
} catch (Exception e) {
return DataResult.error(() -> e.getClass().getSimpleName() + ": " + e.getMessage());
} finally {
@@ -78,103 +83,10 @@ public static DataResult toCompressedBase64(BindTarget bindTarget) {
}
}
- private static BindTarget readTarget(FriendlyByteBuf byteBuf) {
- String name = byteBuf.readUtf();
- String textureId = byteBuf.readUtf();
- int priority = byteBuf.readVarInt();
- float disablingDepth = byteBuf.readFloat();
- BindTarget.TargetConfig targetConfig = readTargetConfig(byteBuf);
- BindTarget.BindConfig bindConfig = readBindConfig(byteBuf);
- OffsetConfig offsets = readOffsetConfig(byteBuf);
- int size = byteBuf.readVarInt();
- List disableConfigs = new ArrayList<>(size);
- for (int i = 0; i < size; i++) disableConfigs.add(readDisableConfig(byteBuf));
- return new BindTarget(name, textureId, priority, disablingDepth, targetConfig, bindConfig, offsets, disableConfigs);
- }
-
- private static void writeTarget(FriendlyByteBuf byteBuf, BindTarget bindTarget) {
- byteBuf.writeUtf(bindTarget.name());
- byteBuf.writeUtf(bindTarget.textureId());
- byteBuf.writeVarInt(bindTarget.priority());
- byteBuf.writeFloat(bindTarget.disablingDepth());
- writeTargetConfig(byteBuf, bindTarget.targetConfig());
- writeBindConfig(byteBuf, bindTarget.bindConfig());
- writeOffsetConfig(byteBuf, bindTarget.offsets());
- byteBuf.writeVarInt(bindTarget.disableConfigs().size());
- for (DisableConfig disableConfig : bindTarget.disableConfigs()) writeDisableConfig(byteBuf, disableConfig);
- }
-
- private static BindTarget.TargetConfig readTargetConfig(FriendlyByteBuf byteBuf) {
- return new BindTarget.TargetConfig(byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat());
- }
-
- private static void writeTargetConfig(FriendlyByteBuf byteBuf, BindTarget.TargetConfig config) {
- byteBuf.writeFloat(config.forwardU());
- byteBuf.writeFloat(config.forwardV());
- byteBuf.writeFloat(config.upwardU());
- byteBuf.writeFloat(config.upwardV());
- byteBuf.writeFloat(config.posU());
- byteBuf.writeFloat(config.posV());
- }
-
- private static BindTarget.BindConfig readBindConfig(FriendlyByteBuf byteBuf) {
- byte bindFlags = byteBuf.readByte();
- boolean bindX = (bindFlags & 0x01) != 0;
- boolean bindY = (bindFlags & 0x02) != 0;
- boolean bindZ = (bindFlags & 0x04) != 0;
- boolean bindRotation = (bindFlags & 0x08) != 0;
- return new BindTarget.BindConfig(bindX, bindY, bindZ, bindRotation);
- }
-
- private static void writeBindConfig(FriendlyByteBuf byteBuf, BindTarget.BindConfig bindConfig) {
- byte bindFlags = 0;
- if (bindConfig.bindX()) bindFlags |= 0x01;
- if (bindConfig.bindY()) bindFlags |= 0x02;
- if (bindConfig.bindZ()) bindFlags |= 0x04;
- if (bindConfig.bindRotation()) bindFlags |= 0x08;
- byteBuf.writeByte(bindFlags);
- }
-
- private static OffsetConfig readOffsetConfig(FriendlyByteBuf byteBuf) {
- return new OffsetConfig(byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat());
- }
-
- private static void writeOffsetConfig(FriendlyByteBuf byteBuf, OffsetConfig offsets) {
- byteBuf.writeFloat(offsets.scale);
- byteBuf.writeFloat(offsets.x);
- byteBuf.writeFloat(offsets.y);
- byteBuf.writeFloat(offsets.z);
- byteBuf.writeFloat(offsets.pitch);
- byteBuf.writeFloat(offsets.yaw);
- byteBuf.writeFloat(offsets.roll);
- }
-
- private static DisableConfig readDisableConfig(FriendlyByteBuf byteBuf) {
- String name = byteBuf.readUtf();
- String textureId = byteBuf.readUtf();
- boolean disableAll = byteBuf.readBoolean();
- int size = byteBuf.readVarInt();
- List rectangles = new ArrayList<>(size);
- for (int i = 0; i < size; i++) rectangles.add(readUVRectangle(byteBuf));
- return new DisableConfig(name, textureId, disableAll, rectangles);
- }
-
- private static void writeDisableConfig(FriendlyByteBuf byteBuf, DisableConfig disableConfig) {
- byteBuf.writeUtf(disableConfig.name());
- byteBuf.writeUtf(disableConfig.textureId());
- byteBuf.writeBoolean(disableConfig.disableAll());
- byteBuf.writeVarInt(disableConfig.rectangles().size());
- for (UVRectangle rect : disableConfig.rectangles()) writeUVRectangle(byteBuf, rect);
- }
-
- private static UVRectangle readUVRectangle(FriendlyByteBuf byteBuf) {
- return new UVRectangle(byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat(), byteBuf.readFloat());
- }
-
- private static void writeUVRectangle(FriendlyByteBuf byteBuf, UVRectangle rect) {
- byteBuf.writeFloat(rect.uMin());
- byteBuf.writeFloat(rect.vMin());
- byteBuf.writeFloat(rect.uMax());
- byteBuf.writeFloat(rect.vMax());
+ private static String toSemVer(short version) {
+ int major = version / 10000;
+ int minor = version % 10000 / 100;
+ int patch = version % 100;
+ return major + "." + minor + "." + patch;
}
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec703.java b/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec703.java
new file mode 100644
index 00000000..edd0cf04
--- /dev/null
+++ b/common/src/main/java/com/xtracr/realcamera/config/codec/ConfigCodec703.java
@@ -0,0 +1,79 @@
+package com.xtracr.realcamera.config.codec;
+
+import com.xtracr.realcamera.config.BindTarget;
+import com.xtracr.realcamera.config.BindTarget.BindConfig;
+import com.xtracr.realcamera.config.BindTarget.TargetConfig;
+import com.xtracr.realcamera.config.DisableConfig;
+import com.xtracr.realcamera.config.OffsetConfig;
+import com.xtracr.realcamera.config.UVRectangle;
+import com.xtracr.realcamera.config.codec.utli.ByteBufCodecs;
+import com.xtracr.realcamera.config.codec.utli.CodecUtil;
+import com.xtracr.realcamera.config.codec.utli.StreamCodec;
+import io.netty.buffer.ByteBuf;
+
+import java.util.List;
+
+final class ConfigCodec703 {
+ static final StreamCodec TARGET_CONFIG_CODEC = CodecUtil.composite(
+ ByteBufCodecs.FLOAT, TargetConfig::forwardU,
+ ByteBufCodecs.FLOAT, TargetConfig::forwardV,
+ ByteBufCodecs.FLOAT, TargetConfig::upwardU,
+ ByteBufCodecs.FLOAT, TargetConfig::upwardV,
+ ByteBufCodecs.FLOAT, TargetConfig::posU,
+ ByteBufCodecs.FLOAT, TargetConfig::posV,
+ TargetConfig::new
+ );
+ static final StreamCodec BIND_CONFIG_CODEC = StreamCodec.of(
+ ByteBufCodecs.BYTE,
+ bindConfig -> {
+ byte bindFlags = 0;
+ if (bindConfig.bindX()) bindFlags |= 0x01;
+ if (bindConfig.bindY()) bindFlags |= 0x02;
+ if (bindConfig.bindZ()) bindFlags |= 0x04;
+ if (bindConfig.bindRotation()) bindFlags |= 0x08;
+ return bindFlags;
+ },
+ bindFlags -> {
+ boolean bindX = (bindFlags & 0x01) != 0;
+ boolean bindY = (bindFlags & 0x02) != 0;
+ boolean bindZ = (bindFlags & 0x04) != 0;
+ boolean bindRotation = (bindFlags & 0x08) != 0;
+ return new BindConfig(bindX, bindY, bindZ, bindRotation);
+ }
+ );
+ static final StreamCodec OFFSET_CONFIG_CODEC = CodecUtil.composite(
+ ByteBufCodecs.FLOAT, offsets -> offsets.scale,
+ ByteBufCodecs.FLOAT, offsets -> offsets.x,
+ ByteBufCodecs.FLOAT, offsets -> offsets.y,
+ ByteBufCodecs.FLOAT, offsets -> offsets.z,
+ ByteBufCodecs.FLOAT, offsets -> offsets.pitch,
+ ByteBufCodecs.FLOAT, offsets -> offsets.yaw,
+ ByteBufCodecs.FLOAT, offsets -> offsets.roll,
+ OffsetConfig::new
+ );
+ static final StreamCodec> UV_RECTANGLES_CODEC = StreamCodec.list(CodecUtil.composite(
+ ByteBufCodecs.FLOAT, UVRectangle::uMin,
+ ByteBufCodecs.FLOAT, UVRectangle::vMin,
+ ByteBufCodecs.FLOAT, UVRectangle::uMax,
+ ByteBufCodecs.FLOAT, UVRectangle::vMax,
+ UVRectangle::new
+ ));
+ static final StreamCodec> DISABLE_CONFIGS_CODEC = StreamCodec.list(CodecUtil.composite(
+ ByteBufCodecs.STRING_UTF8, DisableConfig::name,
+ ByteBufCodecs.STRING_UTF8, DisableConfig::textureId,
+ ByteBufCodecs.BOOL, DisableConfig::disableAll,
+ UV_RECTANGLES_CODEC, DisableConfig::rectangles,
+ DisableConfig::new
+ ));
+ static final StreamCodec CODEC = CodecUtil.composite(
+ ByteBufCodecs.STRING_UTF8, BindTarget::name,
+ ByteBufCodecs.STRING_UTF8, BindTarget::textureId,
+ ByteBufCodecs.VAR_INT, BindTarget::priority,
+ ByteBufCodecs.FLOAT, BindTarget::disablingDepth,
+ TARGET_CONFIG_CODEC, BindTarget::targetConfig,
+ BIND_CONFIG_CODEC, BindTarget::bindConfig,
+ OFFSET_CONFIG_CODEC, BindTarget::offsets,
+ DISABLE_CONFIGS_CODEC, BindTarget::disableConfigs,
+ BindTarget::new
+ );
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/codec/utli/ByteBufCodecs.java b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/ByteBufCodecs.java
new file mode 100644
index 00000000..a3152f50
--- /dev/null
+++ b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/ByteBufCodecs.java
@@ -0,0 +1,52 @@
+package com.xtracr.realcamera.config.codec.utli;
+
+import io.netty.buffer.ByteBuf;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * A polyfill for {@code net.minecraft.network.codec.ByteBufCodecs} in Minecraft 1.21.1.
+ */
+public final class ByteBufCodecs {
+ public static final StreamCodec FLOAT = StreamCodec.of(ByteBuf::writeFloat, ByteBuf::readFloat);
+ public static final StreamCodec BYTE = StreamCodec.of((buf, val) -> buf.writeByte(val), ByteBuf::readByte);
+ public static final StreamCodec BOOL = StreamCodec.of(ByteBuf::writeBoolean, ByteBuf::readBoolean);
+ public static final StreamCodec VAR_INT = StreamCodec.of(ByteBufCodecs::writeVarInt, ByteBufCodecs::readVarInt);
+ public static final StreamCodec STRING_UTF8 = StreamCodec.of(ByteBufCodecs::writeString, ByteBufCodecs::readString);
+
+ public static int readVarInt(ByteBuf buf) {
+ int i = 0;
+ int j = 0;
+ byte b;
+ do {
+ b = buf.readByte();
+ i |= (b & 0x7F) << j++ * 7;
+ if (j > 5) {
+ throw new RuntimeException("VarInt is too big");
+ }
+ } while ((b & 0x80) == 0x80);
+ return i;
+ }
+
+ public static void writeVarInt(ByteBuf buf, int value) {
+ int i = value;
+ while ((i & -128) != 0) {
+ buf.writeByte(i & 127 | 128);
+ i >>>= 7;
+ }
+ buf.writeByte(i);
+ }
+
+ public static String readString(ByteBuf buf) {
+ int length = readVarInt(buf);
+ byte[] bytes = new byte[length];
+ buf.readBytes(bytes);
+ return new String(bytes, StandardCharsets.UTF_8);
+ }
+
+ public static void writeString(ByteBuf buf, String value) {
+ byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+ writeVarInt(buf, bytes.length);
+ buf.writeBytes(bytes);
+ }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/codec/utli/CodecUtil.java b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/CodecUtil.java
new file mode 100644
index 00000000..cfa25a47
--- /dev/null
+++ b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/CodecUtil.java
@@ -0,0 +1,93 @@
+package com.xtracr.realcamera.config.codec.utli;
+
+import java.util.function.Function;
+
+/**
+ * A polyfill for composite constructors in {@code net.minecraft.network.codec.StreamCodec} for Minecraft 1.21.1.
+ */
+@SuppressWarnings({"unchecked", "unused"})
+public final class CodecUtil {
+ private CodecUtil() {}
+
+ @FunctionalInterface public interface Constructor4 { R apply(A a, B b, C c, D d); }
+ @FunctionalInterface public interface Constructor5 { R apply(A a, B b, C c, D d, E e); }
+ @FunctionalInterface public interface Constructor6 { R apply(A a, B b, C c, D d, E e, F f); }
+ @FunctionalInterface public interface Constructor7 { R apply(A a, B b, C c, D d, E e, F f, G g); }
+ @FunctionalInterface public interface Constructor8 { R apply(A a, B b, C c, D d, E e, F f, G g, H h); }
+ @FunctionalInterface public interface Constructor9 { R apply(A a, B b, C c, D d, E e, F f, G g, H h, I i); }
+
+ private static StreamCodec composite(final StreamCodec[] codecs, final Function[] getters, final Function constructor) {
+ return new StreamCodec<>() {
+ @Override
+ public T decode(B buf) {
+ Object[] values = new Object[codecs.length];
+ for (int i = 0; i < codecs.length; i++) {
+ values[i] = codecs[i].decode(buf);
+ }
+ return constructor.apply(values);
+ }
+
+ @Override
+ public void encode(B buf, T value) {
+ for (int i = 0; i < codecs.length; i++) {
+ ((StreamCodec) codecs[i]).encode(buf, ((Function) getters[i]).apply(value));
+ }
+ }
+ };
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ Constructor4 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4}, new Function[]{g1, g2, g3, g4},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3]));
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ StreamCodec c5, Function g5, Constructor5 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4, c5}, new Function[]{g1, g2, g3, g4, g5},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3], (F5) vals[4]));
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ StreamCodec c5, Function g5, StreamCodec c6, Function g6,
+ Constructor6 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4, c5, c6}, new Function[]{g1, g2, g3, g4, g5, g6},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3], (F5) vals[4], (F6) vals[5]));
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ StreamCodec c5, Function g5, StreamCodec c6, Function g6,
+ StreamCodec c7, Function g7,
+ Constructor7 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4, c5, c6, c7}, new Function[]{g1, g2, g3, g4, g5, g6, g7},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3], (F5) vals[4], (F6) vals[5], (F7) vals[6]));
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ StreamCodec c5, Function g5, StreamCodec c6, Function g6,
+ StreamCodec c7, Function g7, StreamCodec c8, Function g8,
+ Constructor8 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4, c5, c6, c7, c8}, new Function[]{g1, g2, g3, g4, g5, g6, g7, g8},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3], (F5) vals[4], (F6) vals[5], (F7) vals[6], (F8) vals[7]));
+ }
+
+ public static StreamCodec composite(
+ StreamCodec c1, Function g1, StreamCodec c2, Function g2,
+ StreamCodec c3, Function g3, StreamCodec c4, Function g4,
+ StreamCodec c5, Function g5, StreamCodec c6, Function g6,
+ StreamCodec c7, Function g7, StreamCodec c8, Function g8,
+ StreamCodec c9, Function g9, Constructor9 constructor) {
+ return composite(new StreamCodec[]{c1, c2, c3, c4, c5, c6, c7, c8, c9}, new Function[]{g1, g2, g3, g4, g5, g6, g7, g8, g9},
+ (vals) -> constructor.apply((F1) vals[0], (F2) vals[1], (F3) vals[2], (F4) vals[3], (F5) vals[4], (F6) vals[5], (F7) vals[6], (F8) vals[7], (F9) vals[8]));
+ }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/config/codec/utli/StreamCodec.java b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/StreamCodec.java
new file mode 100644
index 00000000..67936152
--- /dev/null
+++ b/common/src/main/java/com/xtracr/realcamera/config/codec/utli/StreamCodec.java
@@ -0,0 +1,74 @@
+package com.xtracr.realcamera.config.codec.utli;
+
+import io.netty.buffer.ByteBuf;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+/**
+ * A polyfill for {@code net.minecraft.network.codec.StreamCodec} in Minecraft 1.21.1.
+ */
+public interface StreamCodec {
+
+ V decode(B buf);
+
+ void encode(B buf, V value);
+
+ static StreamCodec of(BiConsumer encoder, Function decoder) {
+ return new StreamCodec<>() {
+ @Override
+ public V decode(B buf) {
+ return decoder.apply(buf);
+ }
+
+ @Override
+ public void encode(B buf, V value) {
+ encoder.accept(buf, value);
+ }
+ };
+ }
+
+ static StreamCodec of(StreamCodec fieldCodec, Function toField, Function fromField) {
+ return new StreamCodec<>() {
+ @Override
+ public T decode(B buf) {
+ F fieldValue = fieldCodec.decode(buf);
+ return fromField.apply(fieldValue);
+ }
+
+ @Override
+ public void encode(B buf, T value) {
+ F fieldValue = toField.apply(value);
+ fieldCodec.encode(buf, fieldValue);
+ }
+ };
+ }
+
+ static StreamCodec> list(StreamCodec elementCodec) {
+ return new StreamCodec<>() {
+ @Override
+ public List decode(B buf) {
+ if (!(buf instanceof ByteBuf byteBuf))
+ throw new UnsupportedOperationException("List codec only supports ByteBuf");
+ int size = ByteBufCodecs.readVarInt(byteBuf);
+ List list = new ArrayList<>(size);
+ for (int i = 0; i < size; i++) {
+ list.add(elementCodec.decode(buf));
+ }
+ return list;
+ }
+
+ @Override
+ public void encode(B buf, List value) {
+ if (!(buf instanceof ByteBuf byteBuf))
+ throw new UnsupportedOperationException("List codec only supports ByteBuf");
+ ByteBufCodecs.writeVarInt(byteBuf, value.size());
+ for (V element : value) {
+ elementCodec.encode(buf, element);
+ }
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/gui/GUIHelper.java b/common/src/main/java/com/xtracr/realcamera/gui/GUIHelper.java
index cd0e414a..c430e5c8 100644
--- a/common/src/main/java/com/xtracr/realcamera/gui/GUIHelper.java
+++ b/common/src/main/java/com/xtracr/realcamera/gui/GUIHelper.java
@@ -1,14 +1,21 @@
package com.xtracr.realcamera.gui;
import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.xtracr.realcamera.renderer.state.BuiltModelRecord;
import com.xtracr.realcamera.renderer.state.VertexData;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.navigation.ScreenRectangle;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.phys.Vec3;
+import org.joml.Matrix3f;
import org.joml.Matrix4f;
+import org.joml.Vector3f;
+
+import java.util.List;
+
+public class GUIHelper {
+ public static final int MODEL_MIN_Z = 0, MODEL_MAX_Z = 200;
-public final class GUIHelper {
public static void enableScissor(GuiGraphics graphics, ScreenRectangle rectangle) {
graphics.enableScissor(rectangle.left(), rectangle.top(), rectangle.right(), rectangle.bottom());
}
@@ -57,4 +64,42 @@ public static void vector(GuiGraphics graphics, Vec3 start, Vec3 vector, float z
buffer.vertex((float) (start.x + vector.x), (float) (start.y + vector.y), z).color(argb).normal((float) vector.x, (float) vector.y, 0).endVertex();
graphics.flush();
}
+
+ public static void culledModels(GuiGraphics graphics, List modelRecords, Matrix4f transform) {
+ float minEntityZ = MODEL_MIN_Z, maxEntityZ = MODEL_MAX_Z;
+ for (BuiltModelRecord record : modelRecords) {
+ for (VertexData vertex : record.vertices()) {
+ if (vertex.z() < minEntityZ) minEntityZ = vertex.z();
+ if (vertex.z() > maxEntityZ) maxEntityZ = vertex.z();
+ }
+ }
+ Matrix4f positionMatrix = new Matrix4f(transform).scale(1, 1, MODEL_MAX_Z / (maxEntityZ - minEntityZ)).translate(0, 0, -minEntityZ);
+ Matrix3f normalMatrix = new Matrix3f(positionMatrix);
+ modelRecords.forEach(record -> {
+ VertexConsumer buffer = graphics.bufferSource().getBuffer(record.renderType());
+ if (!record.renderType().canConsolidateConsecutiveGeometry()) {
+ for (VertexData vertex : record.vertices()) vertex.render(buffer, positionMatrix, normalMatrix);
+ return;
+ }
+ for (VertexData[] primitive : record.primitives()) {
+ for (VertexData vertex : primitive) vertex.render(buffer, positionMatrix, normalMatrix);
+ }
+ });
+ graphics.flush();
+ }
+
+ public static void flattenedModels(GuiGraphics graphics, List textureRecords, Matrix4f positionMatrix) {
+ textureRecords.forEach(record -> {
+ VertexConsumer buffer = graphics.bufferSource().getBuffer(record.renderType());
+ Vector3f position = new Vector3f();
+ for (VertexData vertex : record.vertices()) {
+ position.set(vertex.u(), vertex.v(), 0).mulPosition(positionMatrix);
+ int argb = vertex.argb();
+ buffer.vertex(position.x(), position.y(), 0 ,
+ (float) (argb >> 16 & 0xFF) / 255, (float) (argb >> 8 & 0xFF) / 255, (float) (argb & 0xFF) / 255, (float) (argb >> 24) / 255,
+ vertex.u(), vertex.v(), vertex.overlay(), vertex.light(), 0, 0, 1);
+
+ }
+ });
+ }
}
diff --git a/common/src/main/java/com/xtracr/realcamera/gui/ModelAnalyser.java b/common/src/main/java/com/xtracr/realcamera/gui/ModelAnalyser.java
index 4b2969f0..36bd58be 100644
--- a/common/src/main/java/com/xtracr/realcamera/gui/ModelAnalyser.java
+++ b/common/src/main/java/com/xtracr/realcamera/gui/ModelAnalyser.java
@@ -1,8 +1,8 @@
package com.xtracr.realcamera.gui;
+import com.google.common.collect.ImmutableSet;
import com.mojang.blaze3d.platform.Lighting;
import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.xtracr.realcamera.api.BindResult;
import com.xtracr.realcamera.config.BindTarget;
@@ -29,54 +29,18 @@
import java.util.List;
import java.util.Set;
-public class ModelAnalyser {
- private static final Set UNFOCUSABLE_RENDER_TYPES = Set.of(RenderType.armorEntityGlint(), RenderType.glintTranslucent(), RenderType.glint(), RenderType.entityGlint(), RenderType.entityGlintDirect());
- private static final int planeArgb = 0x6F3333CC, forwardArgb = 0xFF00CC00, upwardArgb = 0xFFCC0000, leftArgb = 0xFF0000CC, focusedArgb = 0x4FFFFFFF;
- private static final int z1 = 210, z2 = z1 + 10;
+public final class ModelAnalyser {
+ private static final MultiVertexCatcher vertexCatcher = MultiVertexCatcher.create();
+ private static final Set UNFOCUSABLE_RENDER_TYPES = ImmutableSet.of(RenderType.armorEntityGlint(), RenderType.glintTranslucent(), RenderType.glint(), RenderType.entityGlint());
+ private static final int PLANE_ARGB = 0x6F3333CC, FORWARD_ARGB = 0xFF00CC00, UPWARD_ARGB = 0xFFCC0000, LEFT_ARGB = 0xFF0000CC, FOCUSED_ARGB = 0x4FFFFFFF;
+ private static final int Z_QUAD = GUIHelper.MODEL_MAX_Z + 10, Z_LINE = Z_QUAD + 10;
private final List focusedPolyhedron = new ArrayList<>();
- public final PoseStack modelPose = new PoseStack(), texturePose = new PoseStack();
- private final List modelRecords = new ArrayList<>(), textureRecords = new ArrayList<>();
private VertexData[][] targetPrimitives = new VertexData[3][];
private BindResult bindResult = BindResult.EMPTY;
- private BindTarget target = BindTarget.EMPTY;
@Nullable
- private BuiltModelRecord focusedRecord, currentRecord;
- private double modelScale;
+ private BuiltModelRecord focusedRecord;
- private static long quantizedKey(VertexData vertex) {
- int x = Math.round(vertex.x() * 1e5f);
- int y = Math.round(vertex.y() * 1e5f);
- int z = Math.round(vertex.z() * 1e5f);
- return ((long) x & 0x1FFFFF) | (((long) y & 0x1FFFFF) << 21) | (((long) z & 0x1FFFFF) << 42);
- }
-
- public void initialize(BindTarget target, int modelScale) {
- this.target = target;
- this.modelScale = modelScale;
- modelRecords.clear();
- textureRecords.clear();
- focusedPolyhedron.clear();
- modelPose.setIdentity();
- texturePose.setIdentity();
- targetPrimitives[0] = targetPrimitives[1] = targetPrimitives[2] = null;
- bindResult = BindResult.EMPTY;
- focusedRecord = currentRecord = null;
- target.offsets().setScale(target.offsets().getScale() * modelScale);
- }
-
- public String getFocusedTextureId() {
- return focusedRecord == null ? null : focusedRecord.textureId();
- }
-
- public VertexData[][] getFocusedPolyhedron() {
- return focusedPolyhedron.toArray(new VertexData[0][]);
- }
-
- public void applyDisableConfigs(String textureId, Set hiddenNames) {
- for (BuiltModelRecord record : modelRecords) {
- if (!record.containsTextureId(textureId)) continue;
- textureRecords.add(record);
- }
+ public static void applyDisableConfigs(List modelRecords, BindTarget target, String textureId, Set hiddenNames) {
for (int i = 0; i < modelRecords.size(); i++) {
BuiltModelRecord record = modelRecords.get(i);
List primitives = new ArrayList<>();
@@ -102,14 +66,26 @@ public void applyDisableConfigs(String textureId, Set hiddenNames) {
}
}
- public void computeFocusedOnTexture(int mouseX, int mouseY) {
+ private static long quantizedKey(VertexData vertex) {
+ int x = Math.round(vertex.x() * 1e5f);
+ int y = Math.round(vertex.y() * 1e5f);
+ int z = Math.round(vertex.z() * 1e5f);
+ return ((long) x & 0x1FFFFF) | (((long) y & 0x1FFFFF) << 21) | (((long) z & 0x1FFFFF) << 42);
+ }
+
+ public VertexData[][] getFocusedPolyhedron() {
+ return focusedPolyhedron.toArray(new VertexData[0][]);
+ }
+
+ public String getFocusedTextureId() {
+ return focusedRecord == null ? null : focusedRecord.textureId();
+ }
+
+ public void computeFocusedOnTexture(List textureRecords, float mouseU, float mouseV) {
if (focusedRecord != null && !focusedPolyhedron.isEmpty()) return;
- Vector3f newMousePosition = new Vector3f(mouseX, mouseY, 0)
- .mulPosition(texturePose.last().pose().invert(new Matrix4f()));
- float newMouseX = newMousePosition.x(), newMouseY = newMousePosition.y();
for (BuiltModelRecord record : textureRecords) {
for (VertexData[] primitive : record.primitives()) {
- if (VertexData.containsUV(primitive, newMouseX, newMouseY)) {
+ if (VertexData.containsUV(primitive, mouseU, mouseV)) {
focusedRecord = record;
focusedPolyhedron.add(primitive);
break;
@@ -118,7 +94,7 @@ public void computeFocusedOnTexture(int mouseX, int mouseY) {
}
}
- public void computeFocusedOnModel(int mouseX, int mouseY, int layers) {
+ public void computeFocusedOnModel(List modelRecords, int mouseX, int mouseY, int layers) {
if (focusedRecord != null && !focusedPolyhedron.isEmpty()) return;
List sortByZ = new ArrayList<>();
for (BuiltModelRecord record : modelRecords) {
@@ -138,7 +114,7 @@ public void computeFocusedOnModel(int mouseX, int mouseY, int layers) {
focusedPolyhedron.add(result.primitive());
}
- public void computeFocusedOnModel(int minX, int minY, int maxX, int maxY) {
+ public void computeFocusedOnModel(List modelRecords, int minX, int minY, int maxX, int maxY) {
if (focusedRecord != null && !focusedPolyhedron.isEmpty()) return;
List sortByZ = new ArrayList<>();
for (BuiltModelRecord record : modelRecords) {
@@ -206,27 +182,28 @@ public void computeFocusedPolyhedron() {
}
}
} while (added);
- for (int i = focusedIndex + 1; i < primitives.length && visited[i]; i++) focusedPolyhedron.add(primitives[i]);
- for (int i = focusedIndex - 1; i >= 0 && visited[i]; i--) focusedPolyhedron.add(primitives[i]);
+ for (int i = focusedIndex + 1; i < primitives.length && visited[i]; i++)
+ focusedPolyhedron.add(primitives[i]);
+ for (int i = focusedIndex - 1; i >= 0 && visited[i]; i--)
+ focusedPolyhedron.add(primitives[i]);
focusedPolyhedron.add(focused);
}
- public void drawCameraDirections(GuiGraphics graphics) {
+ public void drawCameraDirections(GuiGraphics graphics, double modelScale) {
if (targetPrimitives[0] == null || targetPrimitives[1] == null || targetPrimitives[2] == null) return;
Vec3 start = bindResult.getPosition();
Matrix3f normal = bindResult.getRotation();
if (normal.m00() == 0 && normal.m11() == 0 && normal.m22() == 0) return;
- GUIHelper.vector(graphics, start, new Vec3(normal.m20(), normal.m21(), normal.m22()).scale(modelScale / 3), z2, forwardArgb);
- GUIHelper.vector(graphics, start, new Vec3(normal.m10(), normal.m11(), normal.m12()).scale(modelScale / 6), z2, upwardArgb);
- GUIHelper.vector(graphics, start, new Vec3(normal.m00(), normal.m01(), normal.m02()).scale(modelScale / 6), z2, leftArgb);
+ GUIHelper.vector(graphics, start, new Vec3(normal.m20(), normal.m21(), normal.m22()).scale(modelScale / 3), Z_LINE, FORWARD_ARGB);
+ GUIHelper.vector(graphics, start, new Vec3(normal.m10(), normal.m11(), normal.m12()).scale(modelScale / 6), Z_LINE, UPWARD_ARGB);
+ GUIHelper.vector(graphics, start, new Vec3(normal.m00(), normal.m01(), normal.m02()).scale(modelScale / 6), Z_LINE, LEFT_ARGB);
}
- public void drawBindTarget(GuiGraphics graphics) {
- if (currentRecord == null) return;
+ public void drawBindTarget(GuiGraphics graphics, BindTarget target, double modelScale) {
TargetConfig config = target.targetConfig();
- if (targetPrimitives[0] != null) GUIHelper.triangleOrQuad(graphics, targetPrimitives[0], z1, planeArgb);
- if (targetPrimitives[1] != null) GUIHelper.vector(graphics, VertexData.position(targetPrimitives[1], config.forwardU(), config.forwardV()), VertexData.normal(targetPrimitives[1]).scale(-modelScale / 2), z2, forwardArgb);
- if (targetPrimitives[2] != null) GUIHelper.vector(graphics, VertexData.position(targetPrimitives[2], config.upwardU(), config.upwardV()), VertexData.normal(targetPrimitives[2]).scale(-modelScale / 2), z2, upwardArgb);
+ if (targetPrimitives[0] != null) GUIHelper.triangleOrQuad(graphics, targetPrimitives[0], Z_QUAD, PLANE_ARGB);
+ if (targetPrimitives[1] != null) GUIHelper.vector(graphics, VertexData.position(targetPrimitives[1], config.forwardU(), config.forwardV()), VertexData.normal(targetPrimitives[1]).scale(-modelScale / 2), Z_LINE, FORWARD_ARGB);
+ if (targetPrimitives[2] != null) GUIHelper.vector(graphics, VertexData.position(targetPrimitives[2], config.upwardU(), config.upwardV()), VertexData.normal(targetPrimitives[2]).scale(-modelScale / 2), Z_LINE, UPWARD_ARGB);
}
public void drawFocusedInModelArea(GuiGraphics graphics) {
@@ -234,12 +211,11 @@ public void drawFocusedInModelArea(GuiGraphics graphics) {
VertexData[] focused = focusedPolyhedron.get(0);
VertexData[] reversed = new VertexData[focused.length];
for (int i = 0; i < focused.length; i++) reversed[i] = focused[focused.length - 1 - i];
- GUIHelper.triangleOrQuad(graphics, reversed, z1, focusedArgb);
- focusedPolyhedron.forEach(primitive -> GUIHelper.triangleOrQuad(graphics, primitive, z1, focusedArgb));
+ GUIHelper.triangleOrQuad(graphics, reversed, Z_QUAD, FOCUSED_ARGB);
+ focusedPolyhedron.forEach(primitive -> GUIHelper.triangleOrQuad(graphics, primitive, Z_QUAD, FOCUSED_ARGB));
}
- public void drawFocusedInTextureArea(GuiGraphics graphics) {
- Matrix4f positionMatrix = texturePose.last().pose();
+ public void drawFocusedInTextureArea(GuiGraphics graphics, Matrix4f texturePose) {
int length = 0;
VertexData[] transformed = new VertexData[0], reversed = new VertexData[0];
Vector3f position = new Vector3f();
@@ -251,72 +227,28 @@ public void drawFocusedInTextureArea(GuiGraphics graphics) {
}
for (int i = 0; i < length; i++) {
VertexData vertex = primitive[i];
- position.set(vertex.u(), vertex.v(), 0).mulPosition(positionMatrix);
+ position.set(vertex.u(), vertex.v(), 0).mulPosition(texturePose);
transformed[i] = reversed[length - 1 - i] = VertexData.immutable(position.x(), position.y(), 0, vertex.argb(), vertex.u(), vertex.v(), vertex.overlay(), vertex.light(), 0, 0, 1);
}
- GUIHelper.triangleOrQuad(graphics, transformed, 0, focusedArgb);
- GUIHelper.triangleOrQuad(graphics, reversed, 0, focusedArgb);
- }
- }
-
- public void drawModel(GuiGraphics graphics, PoseStack poseStack) {
- poseStack.pushPose();
- poseStack.mulPoseMatrix(modelPose.last().pose().invert(new Matrix4f()));
- float minEntityZ = 0f, maxEntityZ = 200f;
- for (BuiltModelRecord record : modelRecords) {
- for (VertexData vertex : record.vertices()) {
- if (vertex.z() < minEntityZ) minEntityZ = vertex.z();
- if (vertex.z() > maxEntityZ) maxEntityZ = vertex.z();
- }
+ GUIHelper.triangleOrQuad(graphics, transformed, 0, FOCUSED_ARGB);
+ GUIHelper.triangleOrQuad(graphics, reversed, 0, FOCUSED_ARGB);
}
- Matrix4f positionMatrix = new Matrix4f().mul(poseStack.last().pose()).scale(1, 1, 200 / (maxEntityZ - minEntityZ)).translate(0, 0, -minEntityZ);
- Matrix3f normalMatrix = new Matrix3f(positionMatrix);
- modelRecords.forEach(record -> {
- VertexConsumer buffer = graphics.bufferSource().getBuffer(record.renderType());
- if (!record.renderType().canConsolidateConsecutiveGeometry()) {
- for (VertexData vertex : record.vertices()) vertex.render(buffer, positionMatrix, normalMatrix);
- return;
- }
- for (VertexData[] primitive : record.primitives()) {
- for (VertexData vertex : primitive) vertex.render(buffer, positionMatrix, normalMatrix);
- }
- });
- poseStack.popPose();
- graphics.flush();
- }
-
- public void drawTexture(GuiGraphics graphics, PoseStack poseStack) {
- Matrix4f positionMatrix = poseStack.last().pose();
- textureRecords.forEach(record -> {
- VertexConsumer buffer = graphics.bufferSource().getBuffer(record.renderType());
- Vector3f position = new Vector3f();
- for (VertexData vertex : record.vertices()) {
- position.set(vertex.u(), vertex.v(), 0).mulPosition(positionMatrix);
- int argb = vertex.argb();
- buffer.vertex(position.x(), position.y(), 0 ,
- (float) (argb >> 16 & 0xFF) / 255, (float) (argb >> 8 & 0xFF) / 255, (float) (argb & 0xFF) / 255, (float) (argb >> 24) / 255,
- vertex.u(), vertex.v(), vertex.overlay(), vertex.light(), 0, 0, 1);
- }
- });
- graphics.flush();
}
- public void updateModel(Minecraft client, Entity entity, float deltaTick, PoseStack poseStack) {
+ public List captureModel(Minecraft client, Entity entity, float partialTicks, PoseStack poseStack, BindTarget target) {
Lighting.setupForEntityInInventory();
EntityRenderDispatcher dispatcher = client.getEntityRenderDispatcher();
dispatcher.setRenderShadow(false);
- MultiVertexCatcher catcher = MultiVertexCatcher.defaultImpl();
- try {
- dispatcher.render(entity, 0, 0, 0, 0, deltaTick, poseStack, catcher, 0xF000f0);
- catcher.forEachBuffer(this::computeBindResult);
- } finally {
- catcher.clear();
- dispatcher.setRenderShadow(true);
- Lighting.setupFor3DItems();
- }
+ dispatcher.render(entity, 0, 0, 0, 0, partialTicks, poseStack, vertexCatcher, 0xF000f0);
+ List records = new ArrayList<>();
+ vertexCatcher.forEachBuffer(buf -> computeRecord(buf, records, target));
+ vertexCatcher.clear();
+ dispatcher.setRenderShadow(true);
+ Lighting.setupFor3DItems();
+ return records;
}
- public void computeBindResult(BuiltIterableBuffer builtBuffer) {
+ private void computeRecord(BuiltIterableBuffer builtBuffer, List records, BindTarget target) {
VertexData[] vertices = builtBuffer.vertexBuffer().stream().map(VertexData::asImmutable).toArray(VertexData[]::new);
VertexFormat.Mode drawMode = builtBuffer.renderType().mode();
final int primitiveLength = drawMode.primitiveLength, primitiveStride = drawMode.primitiveStride;
@@ -328,20 +260,18 @@ public void computeBindResult(BuiltIterableBuffer builtBuffer) {
System.arraycopy(vertices, k + 1, primitives[i], 1, primitiveLength - 1);
}
BuiltModelRecord record = new BuiltModelRecord(builtBuffer.renderType(), builtBuffer.textureId(), vertices, primitives);
- modelRecords.add(record);
- if (!builtBuffer.textureId().contains(target.textureId()) || currentRecord != null) return;
+ records.add(record);
+ if (!builtBuffer.textureId().contains(target.textureId()) || !bindResult.target.isEmpty()) return;
BindResult result = new BindResult(target);
- BindTarget.TargetConfig config = target.targetConfig();
+ TargetConfig config = target.targetConfig();
VertexData.UV[] uvs = {new VertexData.UV(config.posU(), config.posV()), new VertexData.UV(config.forwardU(), config.forwardV()), new VertexData.UV(config.upwardU(), config.upwardV())};
- targetPrimitives = builtBuffer.resolvePrimitives(uvs);
+ targetPrimitives = builtBuffer.findPrimitives(uvs);
if (targetPrimitives[0] != null) result.setPosition(VertexData.position(targetPrimitives[0], config.posU(), config.posV()));
if (targetPrimitives[1] != null) result.setForward(VertexData.normal(targetPrimitives[1]).scale(-1));
if (targetPrimitives[2] != null) result.setUpward(VertexData.normal(targetPrimitives[2]).scale(-1));
- if (result.weakAvailable()) {
- currentRecord = record;
- bindResult = result.computeCamera(true);
- }
+ if (result.weakAvailable()) bindResult = result.computeCamera(true);
}
- private record ZEntry(BuiltModelRecord record, VertexData[] primitive, float z) { }
-}
+ private record ZEntry(BuiltModelRecord record, VertexData[] primitive, float z) {
+ }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/xtracr/realcamera/gui/ModelViewScreen.java b/common/src/main/java/com/xtracr/realcamera/gui/ModelViewScreen.java
index 63bd7eaf..471f7de7 100644
--- a/common/src/main/java/com/xtracr/realcamera/gui/ModelViewScreen.java
+++ b/common/src/main/java/com/xtracr/realcamera/gui/ModelViewScreen.java
@@ -3,27 +3,21 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.serialization.DataResult;
import com.xtracr.realcamera.RealCameraCore;
import com.xtracr.realcamera.compat.CompatibilityHelper;
-import com.xtracr.realcamera.config.BindTarget;
-import com.xtracr.realcamera.config.BindTarget.*;
-import com.xtracr.realcamera.config.ConfigFile;
-import com.xtracr.realcamera.config.ConfigScreen;
-import com.xtracr.realcamera.config.DisableConfig;
-import com.xtracr.realcamera.config.ModConfig;
-import com.xtracr.realcamera.config.OffsetConfig;
-import com.xtracr.realcamera.config.UVRectangle;
+import com.xtracr.realcamera.config.*;
+import com.xtracr.realcamera.config.BindTarget.BindConfig;
+import com.xtracr.realcamera.config.BindTarget.TargetConfig;
import com.xtracr.realcamera.config.codec.ConfigCodec;
-import com.xtracr.realcamera.gui.components.CycleIconButton;
-import com.xtracr.realcamera.gui.components.DoubleSlider;
-import com.xtracr.realcamera.gui.components.NumberField;
-import com.xtracr.realcamera.gui.components.NumberWidgetPair;
-import com.xtracr.realcamera.gui.components.SimpleIconButton;
+import com.xtracr.realcamera.gui.components.*;
+import com.xtracr.realcamera.renderer.state.BuiltModelRecord;
+import com.xtracr.realcamera.renderer.state.VertexData;
import com.xtracr.realcamera.util.LocUtil;
import com.xtracr.realcamera.util.MathUtil;
-import com.xtracr.realcamera.renderer.state.VertexData;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.*;
import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -34,6 +28,7 @@
import net.minecraft.client.gui.navigation.CommonInputs;
import net.minecraft.client.gui.navigation.ScreenRectangle;
import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.LivingEntity;
@@ -46,14 +41,16 @@
import java.util.*;
-public class ModelViewScreen extends Screen {
+public final class ModelViewScreen extends Screen {
+ private static final int SELECTION_COLOR = 0x4F3333CC, SELECTION_HOVER_COLOR = 0x2F3333CC, OUTLINE_COLOR = 0xAAFFFFFF;
+ private static final int SIDE_PANEL_BG = 0xFF444444, CENTER_PANEL_BG = 0xFF222222;
+ private static final int DEFAULT_SCALE = 80, MIN_SCALE = 16, MAX_SCALE = 1024;
private static final int CONFIG_NAME_MAX_LENGTH = 20;
- public final ModelAnalyser analyser = new ModelAnalyser();
- protected int xSize = 450, ySize = 206, middleWidth = xSize - 200, widgetWidth = (xSize - middleWidth) / 4 - 8, widgetHeight = 18;
- protected int x, y, page = 0;
- protected InputConstants.Key modifierKey = ConfigFile.config().getScreenModifierKey();
+ private final int widgetWidth = 42, widgetHeight = 18, wideWidgetWidth = widgetWidth * 2 + 4, compactWidgetWidth = widgetWidth * 2 - 18;
+ private int x, y, xSize, ySize, middleWidth, page = 0;
+ private InputConstants.Key modifierKey = InputConstants.getKey(ConfigFile.config().binding.screenModifierKey);
private boolean initialized;
- private int modelScale = 80, textureScale = 80, layers = 0, selectionRadius = 10;
+ private int modelScale = DEFAULT_SCALE, textureScale = DEFAULT_SCALE, layers = 0, selectionRadius = 10;
private double modelX, modelY, textureX, textureY, clickedX = -1, clickedY = -1;
private float xRot, yRot;
private String focusedTextureId;
@@ -63,64 +60,76 @@ public class ModelViewScreen extends Screen {
private VertexData[][] focusedPolyhedron = new VertexData[0][];
@Nullable
private UVRectangleWidget focusedRectWidget;
- private StringWidget rectWidgetsSizeWidget;
- private EditBox textureIdField, nameField, disabledNameField, disabledIdField;
- private NumberField priorityField, focusedRectWidgetNumberField;
- private NumberField forwardUField, forwardVField, upwardUField, upwardVField, posUField, posVField;
- private NumberField uMinField, vMinField, uMaxField, vMaxField;
- private NumberField scaleField, depthField;
- private NumberWidgetPair offsetXPair, offsetYPair, offsetZPair, offsetPitchPair, offsetYawPair, offsetRollPair;
- private List widgetPairs = List.of();
- private final List disableConfigs = new ArrayList<>();
- private final List rectWidgets = new ArrayList<>();
- private final Map> hiddenNameMap = new HashMap<>();
+ private final StringWidget rectWidgetsSizeWidget = new StringWidget(widgetWidth - 22, widgetHeight, CommonComponents.EMPTY, Minecraft.getInstance().font);
+ private final EditBox nameField = createTextField(wideWidgetWidth, CONFIG_NAME_MAX_LENGTH);
+ private final EditBox textureIdField = createTextField(wideWidgetWidth, 1024);
+ private final EditBox disabledNameField = createTextField(compactWidgetWidth, CONFIG_NAME_MAX_LENGTH);
+ private final EditBox disabledIdField = createTextField(wideWidgetWidth, 1024);
+ private final NumberField priorityField = NumberField.ofInt(Minecraft.getInstance().font, widgetWidth - 2, widgetHeight - 2, 0, null);
+ private final NumberField focusedRectWidgetNumberField = NumberField.ofInt(Minecraft.getInstance().font, widgetWidth - 2, widgetHeight - 2, 0, null).setMin(0);
+ private final NumberField forwardUField = createFloatField(widgetWidth, 0);
+ private final NumberField forwardVField = createFloatField(widgetWidth, 0);
+ private final NumberField upwardUField = createFloatField(widgetWidth, 0);
+ private final NumberField upwardVField = createFloatField(widgetWidth, 0);
+ private final NumberField posUField = createFloatField(widgetWidth, 0);
+ private final NumberField posVField = createFloatField(widgetWidth, 0);
+ private final NumberField uMinField = createFloatField(widgetWidth * 2 - 24, 0).setMin(-1f).setMax(2f);
+ private final NumberField uMaxField = createFloatField(widgetWidth * 2 - 24, 0).setMin(-1f).setMax(2f);
+ private final NumberField vMinField = createFloatField(widgetWidth * 2 - 24, 0).setMin(-1f).setMax(2f);
+ private final NumberField vMaxField = createFloatField(widgetWidth * 2 - 24, 0).setMin(-1f).setMax(2f);
+ private final NumberField scaleField = createFloatField(widgetWidth, 1.0f).setMax(64.0f);
+ private final NumberField depthField = createFloatField(widgetWidth, 0.2f).setMax(16.0f);
private final CycleIconButton showTextureButton = new CycleIconButton(48, 16, 0, 2).setOnValueChange(i -> initWidgets(page));
private final CycleIconButton pauseButton = new CycleIconButton(0, 16, 0, 2);
private final CycleIconButton bindXButton = new CycleIconButton(16, 16, 1, 2);
private final CycleIconButton bindYButton = new CycleIconButton(16, 16, 0, 2);
private final CycleIconButton bindZButton = new CycleIconButton(16, 16, 1, 2);
private final CycleIconButton bindRotButton = new CycleIconButton(16, 16, 1, 2);
- private final DoubleSlider entityPitchSlider = createSlider("pitch", widgetWidth * 2 + 4, -90.0, 90.0);
- private final DoubleSlider entityYawSlider = createSlider("yaw", widgetWidth * 2 + 4, -60.0, 60.0);
+ private final DoubleSlider entityPitchSlider = createSlider("pitch", wideWidgetWidth, -90.0, 90.0);
+ private final DoubleSlider entityYawSlider = createSlider("yaw", wideWidgetWidth, -60.0, 60.0);
+ private final NumberWidgetPair offsetXPair = new NumberWidgetPair(Minecraft.getInstance().font, "offsetX", compactWidgetWidth, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
+ private final NumberWidgetPair offsetYPair = new NumberWidgetPair(Minecraft.getInstance().font, "offsetY", compactWidgetWidth, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
+ private final NumberWidgetPair offsetZPair = new NumberWidgetPair(Minecraft.getInstance().font, "offsetZ", compactWidgetWidth, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
+ private final NumberWidgetPair offsetPitchPair = new NumberWidgetPair(Minecraft.getInstance().font, "pitch", compactWidgetWidth, widgetHeight, -180.0f, 180.0f);
+ private final NumberWidgetPair offsetYawPair = new NumberWidgetPair(Minecraft.getInstance().font, "yaw", compactWidgetWidth, widgetHeight, -180.0f, 180.0f);
+ private final NumberWidgetPair offsetRollPair = new NumberWidgetPair(Minecraft.getInstance().font, "roll", compactWidgetWidth, widgetHeight, -180.0f, 180.0f);
+ private final List disableConfigs = new ArrayList<>();
+ private final List rectWidgets = new ArrayList<>();
+ private final Map> hiddenNameMap = new HashMap<>();
+ private final List widgetPairs = List.of(offsetXPair, offsetYPair, offsetZPair, offsetPitchPair, offsetYawPair, offsetRollPair);
private final CycleButton selectingButton = createCyclingButtonBuilder(ImmutableSortedMap.of(
- 0, LocUtil.MODEL_VIEW_WIDGET("forwardVector").withStyle(ChatFormatting.GREEN),
- 1, LocUtil.MODEL_VIEW_WIDGET("upwardVector").withStyle(ChatFormatting.RED),
- 2, LocUtil.MODEL_VIEW_WIDGET("position").withStyle(ChatFormatting.BLUE)))
- .withInitialValue(0)
+ 0, LocUtil.MODEL_VIEW_WIDGET("forwardVector").withStyle(ChatFormatting.GREEN),
+ 1, LocUtil.MODEL_VIEW_WIDGET("upwardVector").withStyle(ChatFormatting.RED),
+ 2, LocUtil.MODEL_VIEW_WIDGET("position").withStyle(ChatFormatting.BLUE)), 0)
.withTooltip(i -> createTooltip("selecting", modifierKey.getDisplayName(), modifierKey.getDisplayName()))
- .create(0, 0, widgetWidth * 2 + 4, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("selecting"));
+ .create(0, 0, wideWidgetWidth, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("selecting"));
private final CycleButton disableModeButton = createCyclingButtonBuilder(ImmutableMap.of(
- 0, LocUtil.MODEL_VIEW_WIDGET("all").withStyle(ChatFormatting.GREEN),
- 1, LocUtil.MODEL_VIEW_WIDGET("part").withStyle(ChatFormatting.BLUE)))
- .withInitialValue(0)
+ 0, LocUtil.MODEL_VIEW_WIDGET("all").withStyle(ChatFormatting.GREEN),
+ 1, LocUtil.MODEL_VIEW_WIDGET("part").withStyle(ChatFormatting.BLUE)), 0)
.withTooltip(i -> createTooltip("disableMode", modifierKey.getDisplayName()))
- .create(0, 0, widgetWidth * 2 + 4, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("disableMode"));
+ .create(0, 0, wideWidgetWidth, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("disableMode"));
private final CycleButton selectionModeButton = createCyclingButtonBuilder(ImmutableSortedMap.of(
- 0, LocUtil.MODEL_VIEW_WIDGET("single"),
- 1, LocUtil.MODEL_VIEW_WIDGET("multiple"),
- 2, LocUtil.MODEL_VIEW_WIDGET("range").withStyle(ChatFormatting.BLUE)))
- .withInitialValue(0)
+ 0, LocUtil.MODEL_VIEW_WIDGET("single"),
+ 1, LocUtil.MODEL_VIEW_WIDGET("multiple"),
+ 2, LocUtil.MODEL_VIEW_WIDGET("range").withStyle(ChatFormatting.BLUE)), 0)
.withTooltip(i -> createTooltip("selectionMode", modifierKey.getDisplayName(), modifierKey.getDisplayName()))
- .create(0, 0, widgetWidth * 2 + 4, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("selectionMode"));
+ .create(0, 0, wideWidgetWidth, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("selectionMode"));
private final CycleButton toggleSliderButton = createCyclingButtonBuilder(ImmutableMap.of(
- 0, LocUtil.MODEL_VIEW_WIDGET("toggleSliderToField"),
- 1, LocUtil.MODEL_VIEW_WIDGET("toggleFieldToSlider")))
- .withInitialValue(0)
- .withTooltip(i -> createTooltip("toggleSlider"))
+ 0, LocUtil.MODEL_VIEW_WIDGET("toggleSliderToField"),
+ 1, LocUtil.MODEL_VIEW_WIDGET("toggleFieldToSlider")), 0)
.displayOnlyValue()
- .create(0, 0, widgetWidth * 2 + 4, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("toggleSlider"), (button, i) -> {
+ .create(0, 0, wideWidgetWidth, widgetHeight, CommonComponents.EMPTY, (button, i) -> {
boolean useSlider = i == 0;
- widgetPairs.forEach(pair -> pair.syncAndSwitch(useSlider));
+ for (NumberWidgetPair pair : widgetPairs) pair.syncAndSwitch(useSlider);
initWidgets(page);
});
private final CycleButton toggleCategoryButton = createCyclingButtonBuilder(ImmutableSortedMap.of(
- Category.CONFIGS, LocUtil.MODEL_VIEW_WIDGET(Category.CONFIGS.next().id),
- Category.PREVIEW, LocUtil.MODEL_VIEW_WIDGET(Category.PREVIEW.next().id),
- Category.DISABLE, LocUtil.MODEL_VIEW_WIDGET(Category.DISABLE.next().id)))
- .withInitialValue(Category.CONFIGS)
+ Category.CONFIGS, LocUtil.MODEL_VIEW_WIDGET(Category.CONFIGS.next().id),
+ Category.PREVIEW, LocUtil.MODEL_VIEW_WIDGET(Category.PREVIEW.next().id),
+ Category.DISABLE, LocUtil.MODEL_VIEW_WIDGET(Category.DISABLE.next().id)), Category.CONFIGS)
.withTooltip(category -> createTooltip(category.next().id))
.displayOnlyValue()
- .create(0, 0, widgetWidth * 2 - 18, widgetHeight, LocUtil.MODEL_VIEW_WIDGET("toggleCategory"), (button, i) -> initWidgets(0));
+ .create(0, 0, compactWidgetWidth, widgetHeight, CommonComponents.EMPTY, (button, value) -> initWidgets(0));
public ModelViewScreen() {
super(LocUtil.MODEL_VIEW_TITLE());
@@ -134,23 +143,12 @@ protected void init() {
middleWidth = Math.max(10, xSize - 200);
x = (width - xSize) / 2;
y = (height - ySize) / 2;
- modifierKey = ConfigFile.config().getScreenModifierKey();
+ modifierKey = InputConstants.getKey(ConfigFile.config().binding.screenModifierKey);
initWidgets(page);
if (!initialized) loadBindTarget(RealCameraCore.currentTarget());
initialized = true;
}
- private void initOffsetPairs() {
- if (offsetXPair != null) return;
- offsetXPair = new NumberWidgetPair(font, "offsetX", widgetWidth * 2 - 18, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
- offsetYPair = new NumberWidgetPair(font, "offsetY", widgetWidth * 2 - 18, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
- offsetZPair = new NumberWidgetPair(font, "offsetZ", widgetWidth * 2 - 18, widgetHeight, ModConfig.MIN_OFFSET_F, ModConfig.MAX_OFFSET_F);
- offsetPitchPair = new NumberWidgetPair(font, "pitch", widgetWidth * 2 - 18, widgetHeight, -180.0f, 180.0f);
- offsetYawPair = new NumberWidgetPair(font, "yaw", widgetWidth * 2 - 18, widgetHeight, -180.0f, 180.0f);
- offsetRollPair = new NumberWidgetPair(font, "roll", widgetWidth * 2 - 18, widgetHeight, -180.0f, 180.0f);
- widgetPairs = List.of(offsetXPair, offsetYPair, offsetZPair, offsetPitchPair, offsetYawPair, offsetRollPair);
- }
-
private void initWidgets(int page) {
this.page = page;
if (toggleCategoryButton.getValue() == Category.DISABLE && showTextureButton.getValue() == 0) {
@@ -165,10 +163,11 @@ private void initWidgets(int page) {
clearWidgets();
initLeftWidgets();
if (textureViewArea != null) rectWidgets.forEach(this::addRenderableWidget);
- if (toggleCategoryButton.getValue() == Category.DISABLE) addRenderableWidget(showTextureButton).setPosition(x + (xSize - middleWidth) / 2 + 4, y + 4);
+ if (toggleCategoryButton.getValue() == Category.DISABLE)
+ addRenderableWidget(showTextureButton).setPosition(x + (xSize - middleWidth) / 2 + 4, y + 4);
addRenderableWidget(pauseButton).setPosition(x + (xSize + middleWidth) / 2 - 38, y + 4);
addRenderableWidget(new SimpleIconButton(x + (xSize + middleWidth) / 2 - 20, y + 4, 16, 16, 0, 0, button -> {
- modelScale = textureScale = 80;
+ modelScale = textureScale = DEFAULT_SCALE;
entityYawSlider.setNumber(0);
entityPitchSlider.setNumber(0);
modelX = modelY = textureX = textureY = 0;
@@ -179,23 +178,6 @@ private void initWidgets(int page) {
}
private void initLeftWidgets() {
- initOffsetPairs();
- rectWidgetsSizeWidget = new StringWidget(x + 4 + widgetWidth + 5, y + 4 + (widgetHeight + 2) * 3, widgetWidth - 22, widgetHeight, LocUtil.literal(String.valueOf(rectWidgets.size())), font);
- forwardUField = createFloatField(widgetWidth, 0, forwardUField);
- forwardVField = createFloatField(widgetWidth, 0, forwardVField);
- upwardUField = createFloatField(widgetWidth, 0, upwardUField);
- upwardVField = createFloatField(widgetWidth, 0, upwardVField);
- posUField = createFloatField(widgetWidth, 0, posUField);
- posVField = createFloatField(widgetWidth, 0, posVField);
- textureIdField = createTextField(widgetWidth * 2 + 4, 1024, textureIdField);
- disabledIdField = createTextField(widgetWidth * 2 + 4, 1024, disabledIdField);
- focusedRectWidgetNumberField = NumberField.ofInt(font, widgetWidth - 2, widgetHeight - 2, 0, focusedRectWidgetNumberField).setMin(0).setMax(rectWidgets.size());
- uMinField = createFloatField(widgetWidth * 2 - 24, 0, uMinField).setMin(-1f).setMax(2f);
- uMaxField = createFloatField(widgetWidth * 2 - 24, 0, uMaxField).setMin(-1f).setMax(2f);
- vMinField = createFloatField(widgetWidth * 2 - 24, 0, vMinField).setMin(-1f).setMax(2f);
- vMaxField = createFloatField(widgetWidth * 2 - 24, 0, vMaxField).setMin(-1f).setMax(2f);
- scaleField = createFloatField(widgetWidth, 1.0f, scaleField).setMax(64.0f);
- depthField = createFloatField(widgetWidth, 0.2f, depthField).setMax(16.0f);
GridLayout grid = new GridLayout();
grid.defaultCellSetting().padding(4, 2, 0, 0);
LayoutSettings smallSettings = grid.newCellSettings().padding(5, 3, 1, 1);
@@ -237,7 +219,7 @@ private void initLeftWidgets() {
rows.addChild(disableModeButton, 2);
rows.addChild(disabledIdField, 2, smallSettings).setTooltip(createTooltip("textureId"));
rows.addChild(selectionModeButton, 2);
- rows.addChild(focusedRectWidgetNumberField, smallSettings).setOnValueChange(index -> {
+ rows.addChild(focusedRectWidgetNumberField.setMax(rectWidgets.size()), smallSettings).setOnValueChange(index -> {
if (index == 0) focusedRectWidget = null;
else if (index > 0 && index <= rectWidgets.size()) {
focusedRectWidget = rectWidgets.get(index - 1);
@@ -248,6 +230,8 @@ else if (index > 0 && index <= rectWidgets.size()) {
}
}).setTooltip(createTooltip("focusedRectangleNumber"));
addRenderableWidget(new StringWidget(x + 4 + widgetWidth + 3, y + 4 + (widgetHeight + 2) * 3, 6, widgetHeight, LocUtil.literal("/"), font));
+ rectWidgetsSizeWidget.setPosition(x + 4 + widgetWidth + 5 + font.width("/"), y + 4 + (widgetHeight + 2) * 3);
+ rectWidgetsSizeWidget.setMessage(LocUtil.literal(String.valueOf(rectWidgets.size())));
addRenderableWidget(rectWidgetsSizeWidget);
rows.addChild(new SimpleIconButton(48, 0, button -> deleteFocusedRectWidget()), grid.newCellSettings().padding(5 + widgetWidth - 18, 3, 1, 1))
.setTooltip(createTooltip("deleteSelectedRectangle"));
@@ -284,10 +268,10 @@ else if (index > 0 && index <= rectWidgets.size()) {
BindTarget bindTarget = genBindTarget();
ConfigFile.config().putBindTarget(bindTarget);
ConfigFile.save();
+ if (toggleCategoryButton.getValue() != Category.DISABLE) loadBindTarget(bindTarget);
initWidgets(page);
}));
- rows.addChild(priorityField = NumberField.ofInt(font, widgetWidth - 2, widgetHeight - 2, 0, priorityField), smallSettings).setTooltip(createTooltip("priority"));
- nameField = createTextField(widgetWidth * 2 + 4, 20, nameField);
+ rows.addChild(priorityField, smallSettings).setTooltip(createTooltip("priority"));
boolean editableName = toggleCategoryButton.getValue() == Category.CONFIGS;
nameField.setEditable(editableName);
if (!editableName && nameField.isFocused()) nameField.setFocused(false);
@@ -298,14 +282,15 @@ else if (index > 0 && index <= rectWidgets.size()) {
}
private void initRightWidgets() {
- disabledNameField = createTextField(widgetWidth * 2 - 18, 20, disabledNameField);
GridLayout grid = new GridLayout();
grid.defaultCellSetting().padding(4, 2, 0, 0);
LayoutSettings smallSettings = grid.newCellSettings().padding(5, 3, 1, 1);
GridLayout.RowHelper rows = grid.createRowHelper(4);
rows.addChild(toggleCategoryButton, 3);
rows.addChild(new SimpleIconButton(80, 0, button -> {
- if (CompatibilityHelper.isModLoaded("cloth-config")) minecraft.setScreen(ConfigScreen.create(this));
+ if (CompatibilityHelper.isModLoaded("cloth-config")) {
+ minecraft.setScreen(ConfigScreen.create(this));
+ }
}), smallSettings).setTooltip(createTooltip("toConfigScreen"));
final int widgetsPerPage, size;
if (toggleCategoryButton.getValue() == Category.DISABLE) {
@@ -317,18 +302,18 @@ private void initRightWidgets() {
button.setTooltip(createTooltip("saveAs"));
initWidgets(page);
}
- }), smallSettings).setTooltip(createTooltip("saveAs"));
+ }), smallSettings).setTooltip(createTooltip("saveAs"));
for (int i = page * widgetsPerPage; i < Math.min((page + 1) * widgetsPerPage, size); i++) {
DisableConfig config = disableConfigs.get(i);
String targetName = nameField.getValue();
- Set hiddenNames = hiddenNameMap.computeIfAbsent(targetName, k -> new HashSet<>());
+ Set hiddenNames = hiddenNameMap.computeIfAbsent(targetName, str -> new HashSet<>());
addRenderableWidget(new CycleIconButton(32, 16, hiddenNames.contains(config.name()) ? 1 : 0, 2))
.setOnValueChange(value -> {
if (value == 0) hiddenNames.remove(config.name());
else hiddenNames.add(config.name());
})
- .setPosition(x + (xSize + middleWidth) / 2 - 20, y + 5 + (widgetHeight + 2) * (3 + i % widgetsPerPage));
- rows.addChild(createButton(LocUtil.literal(config.name()), widgetWidth * 2 - 18, button -> {
+ .setPosition(x + (xSize + middleWidth) / 2 - 20, y + 5 + (widgetHeight + 2) * (2 + i % widgetsPerPage));
+ rows.addChild(createButton(LocUtil.literal(config.name()), compactWidgetWidth, button -> {
loadDisableConfig(config);
initWidgets(page);
}), 3).setTooltip(Tooltip.create(LocUtil.literal(config.name())));
@@ -341,18 +326,19 @@ private void initRightWidgets() {
}
} else {
widgetsPerPage = 8;
- List fixedTargetList = ConfigFile.config().getFixedTargetList().stream().filter(target -> target.name().equals(RealCameraCore.currentTarget().name())).toList();
- List targetList = ConfigFile.config().getBindTargetList();
+ List fixedTargetList = ConfigFile.config().binding.fixedTargetList.stream().filter(target -> target.name().equals(RealCameraCore.currentTarget().name())).toList();
+ List targetList = ConfigFile.config().binding.targetList;
final int fixedTargetCount = fixedTargetList.size();
size = fixedTargetCount + targetList.size();
for (int i = page * widgetsPerPage; i < Math.min((page + 1) * widgetsPerPage, size); i++) {
BindTarget target = i < fixedTargetCount ? fixedTargetList.get(i) : targetList.get(i - fixedTargetCount);
final int targetIndex = i;
String name = target.name();
- rows.addChild(createButton(LocUtil.literal(name), widgetWidth * 2 - 18, button -> loadBindTarget(target)), 3)
+ rows.addChild(createButton(LocUtil.literal(name), compactWidgetWidth, button -> loadBindTarget(target)), 3)
.setTooltip(Tooltip.create(name.equals(RealCameraCore.currentTarget().name()) ?
LocUtil.literal(name + "\n").append(LocUtil.MODEL_VIEW_WIDGET("currentConfig")) :
- LocUtil.literal(name)));
+ LocUtil.literal(name))
+ );
if (i < fixedTargetCount) continue;
rows.addChild(new SimpleIconButton(48, 0, button -> {
targetList.remove(target);
@@ -367,22 +353,11 @@ private void initRightWidgets() {
grid.visitWidgets(this::addRenderableWidget);
final int pages = (size - 1) / widgetsPerPage + 1;
addRenderableWidget(new SimpleIconButton(x + (xSize + middleWidth) / 2 + 8, y + ySize - 20, 16, 16, 16, 0, button -> initWidgets((page - 1 + pages) % pages)));
- addRenderableWidget(new StringWidget(x + (xSize + middleWidth) / 2 + 30, y + ySize - 20, widgetWidth * 2 - 40, widgetHeight, LocUtil.literal((page + 1) + " / " + pages), font));
+ Component pageInfoText = LocUtil.literal((page + 1) + " / " + pages);
+ addRenderableWidget(new StringWidget(x + (3 * xSize + middleWidth) / 4 + 2 - font.width(pageInfoText) / 2, y + ySize - 20, font.width(pageInfoText), widgetHeight, pageInfoText, font));
addRenderableWidget(new SimpleIconButton(x + xSize - 21, y + ySize - 20, 16, 16, 32, 0, button -> initWidgets((page + 1) % pages)));
}
- public @NotNull UVRectangleWidget addRectWidget(@NotNull UVRectangleWidget rectWidget) {
- UVRectangleWidget foundRectWidget = rectWidgets.stream().filter(r -> r.contains(rectWidget)).findFirst().orElse(null);
- if (foundRectWidget == null) {
- rectWidgets.add(rectWidget);
- focusedRectWidgetNumberField.setMax(rectWidgets.size());
- rectWidgetsSizeWidget.setMessage(LocUtil.literal(String.valueOf(rectWidgets.size())));
- if (textureViewArea != null) addRenderableWidget(rectWidget);
- return rectWidget;
- }
- return foundRectWidget;
- }
-
public boolean deleteFocusedRectWidget() {
if (focusedRectWidget == null) return false;
rectWidgets.remove(focusedRectWidget);
@@ -393,11 +368,186 @@ public boolean deleteFocusedRectWidget() {
return true;
}
- private boolean syncDisableDraft(AbstractButton button, boolean allowEmptyName) {
- String name = disabledNameField.getValue().trim();
- String textureId = disabledIdField.getValue().trim();
+ @Override
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+ this.renderBackground(graphics);
+ ModelAnalyser analyser = new ModelAnalyser();
+ BindTarget target = genBindTarget();
+ target.offsets().scale *= modelScale;
+ String textureId = toggleCategoryButton.getValue() == Category.DISABLE ? disabledIdField.getValue() : "";
+ Set hiddenNames = hiddenNameMap.getOrDefault(nameField.getValue(), Set.of());
+ List modelRecords = captureRotatedEntity(analyser, target, minecraft.player);
+ List textureRecords = modelRecords.stream().filter(record -> record.containsTextureId(textureId)).toList();
+ ModelAnalyser.applyDisableConfigs(modelRecords, target, textureId, hiddenNames);
+ computeFocusedPrimitives(analyser, modelRecords, textureRecords, mouseX, mouseY);
+ renderCulledModels(graphics, analyser, target, modelRecords);
+ renderFlattenedModels(graphics, analyser, textureRecords);
+ super.render(graphics, mouseX, mouseY, partialTicks);
+ if (toggleCategoryButton.getValue() == Category.DISABLE && selectionModeButton.getValue() == 2 && inModelViewArea(mouseX, mouseY)) {
+ GUIHelper.enableScissor(graphics, modelViewArea);
+ GUIHelper.fill(graphics, mouseX - selectionRadius, mouseY - selectionRadius, mouseX + selectionRadius, mouseY + selectionRadius, 400, SELECTION_COLOR);
+ graphics.disableScissor();
+ }
+ if (textureViewArea != null) {
+ GUIHelper.enableScissor(graphics, textureViewArea);
+ if (clickedX >= 0 && clickedY >= 0)
+ graphics.fill(Math.min((int) clickedX, mouseX), Math.min((int) clickedY, mouseY), Math.max((int) clickedX, mouseX), Math.max((int) clickedY, mouseY), SELECTION_COLOR);
+ if (disableModeButton.getValue() == 0)
+ new UVRectangleWidget(0f, 0f, 1f, 1f).renderWidget(graphics, mouseX, mouseY, partialTicks);
+ graphics.disableScissor();
+ }
+ }
+
+ @Override
+ public void renderBackground(GuiGraphics graphics) {
+ super.renderBackground(graphics);
+ graphics.fill(x, y, x + (xSize - middleWidth) / 2 - 4, y + ySize, SIDE_PANEL_BG);
+ graphics.fill(x + (xSize - middleWidth) / 2, y, x + (xSize + middleWidth) / 2, y + ySize, CENTER_PANEL_BG);
+ graphics.fill(x + (xSize + middleWidth) / 2 + 4, y, x + xSize, y + ySize, SIDE_PANEL_BG);
+ }
+
+ private List captureRotatedEntity(ModelAnalyser analyser, BindTarget target, LivingEntity entity) {
+ CompatibilityHelper.isRenderInScreen = true;
+ float entityBodyYaw = entity.yBodyRot;
+ float entityYaw = entity.getYRot();
+ float entityPitch = entity.getXRot();
+ float entityPrevHeadYaw = entity.yHeadRotO;
+ float entityHeadYaw = entity.yHeadRot;
+ entity.yBodyRot = 180.0f;
+ entity.setYRot(180.0f + (float) entityYawSlider.getNumber());
+ entity.setXRot((float) entityPitchSlider.getNumber());
+ entity.yHeadRot = entity.getYRot();
+ entity.yHeadRotO = entity.getYRot();
+ try {
+ int x1 = modelViewArea.left(), y1 = modelViewArea.top(), x2 = modelViewArea.right(), y2 = modelViewArea.bottom();
+ Quaternionf rotation = new Quaternionf().rotateX((float) Math.PI / 6 + xRot).rotateY((float) Math.PI / 6 + yRot).rotateZ((float) Math.PI);
+ PoseStack modelPose = new PoseStack();
+ modelPose.translate((x1 + x2) / 2.0f, (y1 + y2) / 2.0f, 0);
+ modelPose.scale(modelScale, modelScale, -modelScale);
+ modelPose.translate(modelX, modelY, 0);
+ modelPose.mulPose(rotation);
+ modelPose.translate(0, -entity.getBbHeight() / 2.0f, 0);
+ return analyser.captureModel(minecraft, entity, 1.0f, modelPose, target);
+ } finally {
+ CompatibilityHelper.isRenderInScreen = false;
+ entity.yBodyRot = entityBodyYaw;
+ entity.setYRot(entityYaw);
+ entity.setXRot(entityPitch);
+ entity.yHeadRotO = entityPrevHeadYaw;
+ entity.yHeadRot = entityHeadYaw;
+ }
+ }
+
+ private void computeFocusedPrimitives(ModelAnalyser analyser, List modelRecords, List textureRecords, int mouseX, int mouseY) {
+ if (toggleCategoryButton.getValue() == Category.DISABLE && selectionModeButton.getValue() == 2 && inModelViewArea(mouseX, mouseY))
+ analyser.computeFocusedOnModel(modelRecords, mouseX - selectionRadius, mouseY - selectionRadius, mouseX + selectionRadius, mouseY + selectionRadius);
+ if (inTextureViewArea(mouseX, mouseY)) {
+ Vec2 mouseUV = translateXYToUV(mouseX, mouseY, textureViewArea);
+ analyser.computeFocusedOnTexture(textureRecords, mouseUV.x, mouseUV.y);
+ }
+ if (inModelViewArea(mouseX, mouseY)) analyser.computeFocusedOnModel(modelRecords, mouseX, mouseY, layers);
+ if (toggleCategoryButton.getValue() == Category.CONFIGS || selectionModeButton.getValue() == 1) analyser.computeFocusedPolyhedron();
+ focusedPolyhedron = analyser.getFocusedPolyhedron();
+ focusedTextureId = analyser.getFocusedTextureId();
+ }
+
+ private void renderCulledModels(GuiGraphics graphics, ModelAnalyser analyser, BindTarget target, List modelRecords) {
+ GUIHelper.enableScissor(graphics, modelViewArea);
+ GUIHelper.culledModels(graphics, modelRecords, new Matrix4f());
+ if (toggleCategoryButton.getValue() != Category.PREVIEW) analyser.drawFocusedInModelArea(graphics);
+ if (toggleCategoryButton.getValue() == Category.CONFIGS) analyser.drawBindTarget(graphics, target, modelScale);
+ else analyser.drawCameraDirections(graphics, modelScale);
+ graphics.disableScissor();
+ }
+
+ private void renderFlattenedModels(GuiGraphics graphics, ModelAnalyser analyser, List textureRecords) {
+ if (textureViewArea == null) return;
+ int x1 = textureViewArea.left(), y1 = textureViewArea.top(), x2 = textureViewArea.right(), y2 = textureViewArea.bottom();
+ GUIHelper.enableScissor(graphics, textureViewArea);
+ float scale = (textureScale * textureViewArea.width()) / (float) DEFAULT_SCALE;
+ Vector3f offset = new Vector3f((float) textureX - 0.5f, (float) textureY - 0.5f, 0);
+ Matrix4f texturePose = new Matrix4f();
+ texturePose.translate((x1 + x2) / 2.0f, (y1 + y2) / 2.0f, 0);
+ texturePose.scale(scale, scale, -scale);
+ texturePose.translate(offset);
+ GUIHelper.flattenedModels(graphics, textureRecords, texturePose);
+ analyser.drawFocusedInTextureArea(graphics, texturePose);
+ graphics.disableScissor();
+ }
+
+ private Vec2 translateUVToXY(float u, float v, ScreenRectangle screenArea) {
+ int left = screenArea.left(), width = screenArea.width(), top = screenArea.top(), height = screenArea.height();
+ float scale = (textureScale * width) / (float) DEFAULT_SCALE;
+ float x = (u + (float) textureX - 0.5f) * scale + left + width / 2.0f;
+ float y = (v + (float) textureY - 0.5f) * scale + top + height / 2.0f;
+ return new Vec2(x, y);
+ }
+
+ private Vec2 translateXYToUV(float x, float y, ScreenRectangle screenArea) {
+ int left = screenArea.left(), width = screenArea.width(), top = screenArea.top(), height = screenArea.height();
+ float invScale = (float) DEFAULT_SCALE / (textureScale * width);
+ float u = (x - left - width / 2.0f) * invScale - (float) textureX + 0.5f;
+ float v = (y - top - height / 2.0f) * invScale - (float) textureY + 0.5f;
+ return new Vec2(u, v);
+ }
+
+ private void importBindTarget(Button button) {
+ String base64 = minecraft.keyboardHandler.getClipboard().strip();
+ DataResult result = ConfigCodec.fromCompressedBase64(base64);
+
+ result.result().ifPresentOrElse(target -> {
+ loadBindTarget(target);
+ button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("importSucceeded", LocUtil.literal("'" + target.name() + "'").withStyle(ChatFormatting.WHITE)).withStyle(ChatFormatting.GREEN)));
+ }, () -> result.error().ifPresent(partialResult -> {
+ String message = partialResult.message();
+ button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("importFailed", message).withStyle(ChatFormatting.RED)));
+ }));
+ }
+
+ private void exportBindTarget(Button button) {
+ BindTarget target = genBindTarget();
+ DataResult result = ConfigCodec.toCompressedBase64(target);
+
+ result.result().ifPresentOrElse(base64 -> {
+ minecraft.keyboardHandler.setClipboard(base64);
+ button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("exportSucceeded").withStyle(ChatFormatting.GREEN)));
+ }, () -> result.error().ifPresent(partialResult -> {
+ String message = partialResult.message();
+ button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("exportFailed", message).withStyle(ChatFormatting.RED)));
+ }));
+ }
+
+ private void clearDisableDraft() {
+ disabledNameField.setValue("");
+ disabledIdField.setValue("");
+ focusedRectWidget = null;
+ rectWidgets.clear();
+ focusedRectWidgetNumberField.setMax(0);
+ focusedRectWidgetNumberField.setNumber(0);
+ rectWidgetsSizeWidget.setMessage(LocUtil.literal("0"));
+ uMinField.setNumber(0f);
+ vMinField.setNumber(0f);
+ uMaxField.setNumber(0f);
+ vMaxField.setNumber(0f);
+ }
+
+ private void loadDisableConfig(DisableConfig config) {
+ disabledNameField.setValue(config.name());
+ disabledIdField.setValue(config.textureId());
+ disableModeButton.setValue(config.disableAll() ? 0 : 1);
+ focusedRectWidget = null;
+ rectWidgets.clear();
+ for (UVRectangle rect : config.rectangles()) rectWidgets.add(createRectWidget(rect));
+ focusedRectWidgetNumberField.setMax(rectWidgets.size());
+ focusedRectWidgetNumberField.setNumber(0);
+ rectWidgetsSizeWidget.setMessage(LocUtil.literal(String.valueOf(rectWidgets.size())));
+ }
+
+ private boolean syncDisableDraft(AbstractButton button, boolean autoName) {
+ String name = disabledNameField.getValue();
+ String textureId = disabledIdField.getValue();
if (name.isBlank()) {
- if (!allowEmptyName) {
+ if (!autoName) {
button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("emptyName").withStyle(ChatFormatting.RED)));
return false;
}
@@ -460,18 +610,17 @@ private String sanitizeDisableConfigName(String name) {
if (Character.isLetterOrDigit(c)) {
builder.append(c);
lastWasSeparator = false;
- } else if ((c == '_' || c == '-') && builder.length() > 0 && !lastWasSeparator) {
+ } else if ((c == '_' || c == '-') && !builder.isEmpty() && !lastWasSeparator) {
builder.append(c);
lastWasSeparator = true;
- } else if (builder.length() > 0 && !lastWasSeparator) {
+ } else if (!builder.isEmpty() && !lastWasSeparator) {
builder.append('_');
lastWasSeparator = true;
}
}
- while (builder.length() > 0 && (builder.charAt(builder.length() - 1) == '_' || builder.charAt(builder.length() - 1) == '-')) {
+ while (!builder.isEmpty() && (builder.charAt(builder.length() - 1) == '_' || builder.charAt(builder.length() - 1) == '-'))
builder.deleteCharAt(builder.length() - 1);
- }
- return builder.length() == 0 ? "disable" : builder.toString();
+ return builder.isEmpty() ? "disable" : builder.toString();
}
private boolean disableConfigNameExists(String name) {
@@ -485,144 +634,7 @@ private void loadAdjacentBindTarget(List fixedTargetList, List= 0 && clickedY >= 0)
- graphics.fill(Math.min((int) clickedX, mouseX), Math.min((int) clickedY, mouseY), Math.max((int) clickedX, mouseX), Math.max((int) clickedY, mouseY), 0x4F3333CC);
- if (disableModeButton.getValue() == 0)
- new UVRectangleWidget(0f, 0f, 1f, 1f).renderWidget(graphics, mouseX, mouseY, deltaTick);
- graphics.disableScissor();
- }
- }
-
- @Override
- public void renderBackground(GuiGraphics graphics) {
- super.renderBackground(graphics);
- graphics.fill(x, y, x + (xSize - middleWidth) / 2 - 4, y + ySize, 0xFF444444);
- graphics.fill(x + (xSize - middleWidth) / 2, y, x + (xSize + middleWidth) / 2, y + ySize, 0xFF222222);
- graphics.fill(x + (xSize + middleWidth) / 2 + 4, y, x + xSize, y + ySize, 0xFF444444);
- }
-
- protected void applyAnalyser(GuiGraphics graphics, int mouseX, int mouseY) {
- String textureId = toggleCategoryButton.getValue() == Category.DISABLE ? disabledIdField.getValue() : "";
- Set hiddenNames = hiddenNameMap.getOrDefault(nameField.getValue(), Set.of());
- analyser.applyDisableConfigs(textureId, hiddenNames);
- if (toggleCategoryButton.getValue() == Category.DISABLE && selectionModeButton.getValue() == 2 && inModelViewArea(mouseX, mouseY))
- analyser.computeFocusedOnModel(mouseX - selectionRadius, mouseY - selectionRadius, mouseX + selectionRadius, mouseY + selectionRadius);
- if (inTextureViewArea(mouseX, mouseY)) analyser.computeFocusedOnTexture(mouseX, mouseY);
- if (inModelViewArea(mouseX, mouseY)) analyser.computeFocusedOnModel(mouseX, mouseY, layers);
- if (toggleCategoryButton.getValue() == Category.CONFIGS || selectionModeButton.getValue() == 1) analyser.computeFocusedPolyhedron();
- focusedPolyhedron = analyser.getFocusedPolyhedron();
- focusedTextureId = analyser.getFocusedTextureId();
- GUIHelper.enableScissor(graphics, modelViewArea);
- analyser.drawModel(graphics, analyser.modelPose);
- if (toggleCategoryButton.getValue() != Category.PREVIEW) analyser.drawFocusedInModelArea(graphics);
- if (toggleCategoryButton.getValue() == Category.CONFIGS) analyser.drawBindTarget(graphics);
- else analyser.drawCameraDirections(graphics);
- graphics.disableScissor();
- if (textureViewArea != null) {
- GUIHelper.enableScissor(graphics, textureViewArea);
- analyser.drawTexture(graphics, analyser.texturePose);
- analyser.drawFocusedInTextureArea(graphics);
- graphics.disableScissor();
- }
- }
-
- protected void renderModelViewArea(GuiGraphics graphics, LivingEntity entity) {
- int x1 = modelViewArea.left(), y1 = modelViewArea.top(), x2 = modelViewArea.right(), y2 = modelViewArea.bottom();
- Quaternionf quaternionf = new Quaternionf().rotateX((float) Math.PI / 6 + xRot).rotateY((float) Math.PI / 6 + yRot).rotateZ((float) Math.PI);
- float entityBodyYaw = entity.yBodyRot;
- float entityYaw = entity.getYRot();
- float entityPitch = entity.getXRot();
- float entityPrevHeadYaw = entity.yHeadRotO;
- float entityHeadYaw = entity.yHeadRot;
- try {
- entity.yBodyRot = 180.0f;
- entity.setYRot(180.0f + (float) entityYawSlider.getNumber());
- entity.setXRot((float) entityPitchSlider.getNumber());
- entity.yHeadRot = entity.getYRot();
- entity.yHeadRotO = entity.getYRot();
- Vector3f offset = new Vector3f((float) modelX, (float) modelY, 0);
- renderEntityWithAnalyser(graphics, x1, y1, x2, y2, modelScale, offset, quaternionf, entity);
- } finally {
- entity.yBodyRot = entityBodyYaw;
- entity.setYRot(entityYaw);
- entity.setXRot(entityPitch);
- entity.yHeadRotO = entityPrevHeadYaw;
- entity.yHeadRot = entityHeadYaw;
- }
- }
-
- protected void renderEntityWithAnalyser(GuiGraphics graphics, int x1, int y1, int x2, int y2, float scale, Vector3f offset, Quaternionf quaternionf, LivingEntity entity) {
- analyser.modelPose.translate((float) (x1 + x2) / 2.0f, (float) (y1 + y2) / 2.0f, 0);
- analyser.modelPose.mulPoseMatrix(new Matrix4f().scaling(scale, scale, -scale));
- analyser.modelPose.translate(offset.x(), offset.y(), offset.z());
- analyser.modelPose.mulPose(quaternionf);
- analyser.modelPose.translate(0, -entity.getBbHeight() / 2.0f, 0);
- analyser.updateModel(minecraft, entity, 1.0f, analyser.modelPose);
- }
-
- protected void renderTextureViewArea(GuiGraphics graphics) {
- if (textureViewArea == null) return;
- int x1 = textureViewArea.left(), y1 = textureViewArea.top(), x2 = textureViewArea.right(), y2 = textureViewArea.bottom();
- Vector3f offset = new Vector3f((float) textureX - 0.5f, (float) textureY - 0.5f, 0);
- renderTextureWithAnalyser(graphics, x1, y1, x2, y2, (float) (textureScale * textureViewArea.width()) / 80, offset);
- }
-
- protected void renderTextureWithAnalyser(GuiGraphics graphics, int x1, int y1, int x2, int y2, float scale, Vector3f offset) {
- analyser.texturePose.translate((float) (x1 + x2) / 2.0f, (float) (y1 + y2) / 2.0f, 0);
- analyser.texturePose.mulPoseMatrix(new Matrix4f().scaling(scale, scale, -scale));
- analyser.texturePose.translate(offset.x(), offset.y(), offset.z());
- }
-
- protected void importBindTarget(Button button) {
- DataResult result = ConfigCodec.fromCompressedBase64(minecraft.keyboardHandler.getClipboard());
- result.result().ifPresentOrElse(target -> {
- loadBindTarget(target);
- button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("importSucceeded", LocUtil.literal("'" + target.name() + "'").withStyle(ChatFormatting.WHITE)).withStyle(ChatFormatting.GREEN)));
- }, () -> {
- String message = result.error().map(error -> error.message()).orElse("Unknown error");
- button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("importFailed", message).withStyle(ChatFormatting.RED)));
- });
- }
-
- protected void exportBindTarget(Button button) {
- DataResult result = ConfigCodec.toCompressedBase64(genBindTarget());
- result.result().ifPresentOrElse(base64 -> {
- minecraft.keyboardHandler.setClipboard(base64);
- button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("exportSucceeded").withStyle(ChatFormatting.GREEN)));
- }, () -> {
- String message = result.error().map(error -> error.message()).orElse("Unknown error");
- button.setTooltip(Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP("exportFailed", message).withStyle(ChatFormatting.RED)));
- });
- }
-
- protected void loadBindTarget(BindTarget target) {
+ private void loadBindTarget(BindTarget target) {
if (target.isEmpty()) return;
nameField.setValue(target.name());
textureIdField.setValue(target.textureId());
@@ -638,86 +650,81 @@ protected void loadBindTarget(BindTarget target) {
bindYButton.setValue(target.bindConfig().bindY() ? 0 : 1);
bindZButton.setValue(target.bindConfig().bindZ() ? 0 : 1);
bindRotButton.setValue(target.bindConfig().bindRotation() ? 0 : 1);
- scaleField.setNumber(target.offsets().getScale());
- initOffsetPairs();
- offsetXPair.setNumber(target.offsets().getX());
- offsetYPair.setNumber(target.offsets().getY());
- offsetZPair.setNumber(target.offsets().getZ());
- offsetPitchPair.setNumber(target.offsets().getPitch());
- offsetYawPair.setNumber(target.offsets().getYaw());
- offsetRollPair.setNumber(target.offsets().getRoll());
+ OffsetConfig offsets = target.offsets();
+ scaleField.setNumber(offsets.scale);
+ offsetXPair.setNumber(offsets.x);
+ offsetYPair.setNumber(offsets.y);
+ offsetZPair.setNumber(offsets.z);
+ offsetPitchPair.setNumber(offsets.pitch);
+ offsetYawPair.setNumber(offsets.yaw);
+ offsetRollPair.setNumber(offsets.roll);
disableConfigs.clear();
disableConfigs.addAll(target.disableConfigs());
clearDisableDraft();
}
- protected BindTarget genBindTarget() {
- initOffsetPairs();
- TargetConfig targetConfig = new TargetConfig( forwardUField.getNumber(), forwardVField.getNumber(), upwardUField.getNumber(), upwardVField.getNumber(), posUField.getNumber(), posVField.getNumber());
- BindConfig bindConfig = new BindConfig( bindXButton.getValue() == 0, bindYButton.getValue() == 0, bindZButton.getValue() == 0, bindRotButton.getValue() == 0);
- OffsetConfig offsets = new OffsetConfig()
- .setScale(scaleField.getNumber())
- .setX(offsetXPair.getNumber())
- .setY(offsetYPair.getNumber())
- .setZ(offsetZPair.getNumber())
- .setPitch(offsetPitchPair.getNumber())
- .setYaw(offsetYawPair.getNumber())
- .setRoll(offsetRollPair.getNumber());
- return new BindTarget(nameField.getValue(), textureIdField.getValue(), priorityField.getNumber(), depthField.getNumber(), targetConfig, bindConfig, offsets, new ArrayList<>(disableConfigs));
+ private BindTarget genBindTarget() {
+ DisableConfig currentDisableConfig = new DisableConfig(disabledNameField.getValue(), disabledIdField.getValue(), disableModeButton.getValue() == 0, rectWidgets.stream().map(UVRectangleWidget::toUVRectangle).toList());
+ List newDisableConfigs = new ArrayList<>(disableConfigs);
+ for (int i = 0; i < newDisableConfigs.size(); i++) {
+ if (newDisableConfigs.get(i).name().equals(currentDisableConfig.name()))
+ newDisableConfigs.set(i, currentDisableConfig);
+ }
+ TargetConfig targetConfig = new TargetConfig(forwardUField.getNumber(), forwardVField.getNumber(), upwardUField.getNumber(), upwardVField.getNumber(), posUField.getNumber(), posVField.getNumber());
+ BindConfig bindConfig = new BindConfig(bindXButton.getValue() == 0, bindYButton.getValue() == 0, bindZButton.getValue() == 0, bindRotButton.getValue() == 0);
+ OffsetConfig offsets = new OffsetConfig(scaleField.getNumber(), offsetXPair.getNumber(), offsetYPair.getNumber(), offsetZPair.getNumber(), offsetPitchPair.getNumber(), offsetYawPair.getNumber(), offsetRollPair.getNumber());
+ return new BindTarget(nameField.getValue(), textureIdField.getValue(), priorityField.getNumber(), depthField.getNumber(), targetConfig, bindConfig, offsets, newDisableConfigs);
}
- private void clearDisableDraft() {
- disabledNameField.setValue("");
- disabledIdField.setValue("");
- disableModeButton.setValue(0);
- rectWidgets.clear();
- focusedRectWidget = null;
- focusedRectWidgetNumberField.setMax(0);
- focusedRectWidgetNumberField.setNumber(0);
- rectWidgetsSizeWidget.setMessage(LocUtil.literal("0"));
- uMinField.setNumber(0f);
- vMinField.setNumber(0f);
- uMaxField.setNumber(0f);
- vMaxField.setNumber(0f);
+ private UVRectangleWidget addRectWidget(UVRectangleWidget rectWidget) {
+ UVRectangleWidget foundRectWidget = rectWidgets.stream().filter(r -> r.contains(rectWidget)).findFirst().orElse(null);
+ if (foundRectWidget == null) {
+ rectWidgets.add(rectWidget);
+ focusedRectWidgetNumberField.setMax(rectWidgets.size());
+ rectWidgetsSizeWidget.setMessage(LocUtil.literal(String.valueOf(rectWidgets.size())));
+ if (textureViewArea != null) addRenderableWidget(rectWidget);
+ return rectWidget;
+ }
+ return foundRectWidget;
}
- protected Tooltip createTooltip(String key, Object... args) {
+ private Tooltip createTooltip(String key, Object... args) {
return Tooltip.create(LocUtil.MODEL_VIEW_TOOLTIP(key, args));
}
- protected UVRectangleWidget createRectWidget(UVRectangle rect) {
+ private UVRectangleWidget createRectWidget(UVRectangle rect) {
return new UVRectangleWidget(rect.uMin(), rect.vMin(), rect.uMax(), rect.vMax());
}
- protected Button createButton(Component message, int width, Button.OnPress onPress) {
+ private Button createButton(Component message, int width, Button.OnPress onPress) {
return Button.builder(message, onPress).size(width, widgetHeight).build();
}
- protected CycleButton.Builder createCyclingButtonBuilder(Map messages) {
- return new CycleButton.Builder(messages::get).withValues(messages.keySet());
+ private CycleButton.Builder createCyclingButtonBuilder(Map