Compare commits

...

33 commits

Author SHA1 Message Date
654589355d fix version name 2025-06-18 18:18:55 +03:00
0b3bac264f port to 1.21.6 2025-06-18 18:17:57 +03:00
59a2175fb2 port to 1.21.5 2025-06-18 16:18:48 +03:00
ac1ee8ec6d fix record list widget 2025-06-18 15:57:29 +03:00
c65e906500 port to 1.21.4, RECORDS LIST IS BROKEN 2025-06-15 20:36:55 +03:00
f082788406 set fabric mod json 1.21. 2025-06-15 20:06:31 +03:00
072efb64f6 Merge branch '1.21' 2025-06-15 19:59:44 +03:00
06634a8704 set license wtfpl in mod 2025-06-15 19:59:29 +03:00
d101b11c36 fix movements 1.21.2 2025-06-15 16:23:04 +03:00
412c3f47ab port to 1.21.2, MOVEMENTS ARE BROKEN 2025-06-14 23:46:18 +03:00
9d7ac6b213 Merge pull request 'add "compatible with" comment' (#1) from 1.21 into master
Reviewed-on: MeexReay/repeating_mod#1
2025-06-14 22:23:13 +03:00
4714b1dbfb add compatible with comment 2025-06-14 22:22:27 +03:00
5c9df13d15 fix gitea actions 2025-06-14 21:38:30 +03:00
38127eb69f make img folder for readme images 2025-06-14 20:35:23 +03:00
5d5e628cdf add dev artifacts 2025-06-14 20:18:04 +03:00
42bf96701e Merge branch 'master' of https://git.meex.lol/MeexReay/repeating_mod 2025-06-14 20:05:07 +03:00
666377e5ee fix pos event 2025-06-14 20:04:53 +03:00
63132684cd Update README.md 2025-06-14 19:28:24 +03:00
d4abb39c80 downgrade upload-artifact 2025-06-14 08:01:57 +03:00
2e62b69a21 action refactor 2025-06-14 07:45:08 +03:00
62dcb75960 fix upload artifact 2025-06-14 06:48:00 +03:00
b6084063a1 make gradlew exec 2025-06-14 06:23:35 +03:00
1e4f4fdaeb gitea actions fix x3 2025-06-14 06:00:20 +03:00
f49b1e21a3 maybefix gitea actions 2025-06-14 05:23:49 +03:00
759b6cb05e gitea action 2025-06-14 05:17:53 +03:00
2944395e54 remove some crap 2025-06-14 05:09:39 +03:00
45998bbe2e rename group-id and artifact-id, fix recording points render 2025-06-14 05:02:06 +03:00
8242b2c601 readme update 2025-06-14 03:13:26 +03:00
e7abf3e15b open source! 2025-06-14 03:04:16 +03:00
61c755aabc move to 1.21 and fix for nixos 2025-06-14 03:02:04 +03:00
c02d96edca Merge branch 'main' of https://git.meex.lol/MeexReay/repeating_mod 2024-12-08 02:40:33 +03:00
cc12eab006 wh 2024-12-08 02:39:49 +03:00
MeexReay
41706ade80
Update README.md 2024-04-26 20:08:14 +03:00
86 changed files with 1595 additions and 4259 deletions

29
.gitea/workflows/java.yml Normal file
View file

@ -0,0 +1,29 @@
on: [ push ]
name: Build fabric mod
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
- name: Setup Gradle 8.12.1
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
with:
gradle-version: '8.12.1'
- name: Build with Gradle Wrapper
run: chmod +x ./gradlew; ./gradlew build
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: build
path: build/libs/*

42
.gitignore vendored Normal file
View file

@ -0,0 +1,42 @@
# gradle
.gradle/
build/
out/
classes/
# eclipse
*.launch
# idea
.idea/
*.iml
*.ipr
*.iws
# vscode
.settings/
.vscode/
bin/
.classpath
.project
# macos
*.DS_Store
# fabric
run/
# java
hs_err_*.log
replay_*.log
*.hprof
*.jfr
remappedSrc/

433
LICENSE
View file

@ -1,428 +1,13 @@
Attribution-ShareAlike 4.0 International DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
======================================================================= Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Creative Commons Corporation ("Creative Commons") is not a law firm and Everyone is permitted to copy and distribute verbatim or modified
does not provide legal services or legal advice. Distribution of copies of this license document, and changing it is allowed as long
Creative Commons public licenses does not create a lawyer-client or as the name is changed.
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
Using Creative Commons Public Licenses DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
Creative Commons Attribution-ShareAlike 4.0 International Public
License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution-ShareAlike 4.0 International Public License ("Public
License"). To the extent this Public License may be interpreted as a
contract, You are granted the Licensed Rights in consideration of Your
acceptance of these terms and conditions, and the Licensor grants You
such rights in consideration of benefits the Licensor receives from
making the Licensed Material available under these terms and
conditions.
Section 1 -- Definitions.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
c. BY-SA Compatible License means a license listed at
creativecommons.org/compatiblelicenses, approved by Creative
Commons as essentially the equivalent of this Public License.
d. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
e. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
f. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
g. License Elements means the license attributes listed in the name
of a Creative Commons Public License. The License Elements of this
Public License are Attribution and ShareAlike.
h. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
i. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
j. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
k. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
l. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
m. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
Section 2 -- Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
a. reproduce and Share the Licensed Material, in whole or
in part; and
b. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
3. Term. The term of this Public License is specified in Section
6(a).
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
5. Downstream recipients.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
b. Additional offer from the Licensor -- Adapted Material.
Every recipient of Adapted Material from You
automatically receives an offer from the Licensor to
exercise the Licensed Rights in the Adapted Material
under the conditions of the Adapter's License You apply.
c. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this
Public License.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
Section 3 -- License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
a. Attribution.
1. If You Share the Licensed Material (including in modified
form), You must:
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of
warranties;
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
b. ShareAlike.
In addition to the conditions in Section 3(a), if You Share
Adapted Material You produce, the following conditions also apply.
1. The Adapter's License You apply must be a Creative Commons
license with the same License Elements, this version or
later, or a BY-SA Compatible License.
2. You must include the text of, or the URI or hyperlink to, the
Adapter's License You apply. You may satisfy this condition
in any reasonable manner based on the medium, means, and
context in which You Share Adapted Material.
3. You may not offer or impose any additional or different terms
or conditions on, or apply any Effective Technological
Measures to, Adapted Material that restrict exercise of the
rights granted under the Adapter's License You apply.
Section 4 -- Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material,
including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
Section 6 -- Term and Termination.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
Section 7 -- Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
Section 8 -- Interpretation.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
=======================================================================
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
Creative Commons may be contacted at creativecommons.org.
0. You just DO WHAT THE FUCK YOU WANT TO.

View file

@ -2,44 +2,49 @@
This mod can record your movements and play them back. This mod can record your movements and play them back.
![Preview gif](preview.gif) ## How to use
## Controls Simply start recording, perform any actions, stop the recording, return to the starting point, and then you can replay everything you did.
### Showcase
![Preview gif](img/preview.gif)
This is how menu looks like:
![repeating mod menu](img/menu.png)
### Controls
Default Repeating Mod keys Default Repeating Mod keys
``` ```
Menu | J Menu | J
Toggle recording | not specified Toggle recording | not specified by default
Toggle replay | not specified Toggle replay | not specified by default
``` ```
## Menu ## Where to download
How menu looks like ### Stable releases
![repeating mod menu](https://github.com/MeexReay/repeating-mod/assets/127148610/4123068f-b150-45ae-8ae3-fcaa0e6bb9f8) You can find stable releases on [Modrinth](https://modrinth.com/mod/repeating-mod/versions) or on [Releases page](https://git.meex.lol/MeexReay/repeating_mod/releases)
## Todo ### Development artifacts
Releases dont have striked lines
- ~~fix "Space in record name deletes record 0_0"~~ Artifacts are automatically built with [Gitea Actions](https://git.meex.lol/MeexReay/repeating_mod/actions) on each commit. \
- ~~fix "Save record (edit name) on recording crashes the game"~~ [Download latest artifact](https://git.meex.lol/MeexReay/repeating_mod/actions/runs/latest/artifacts/build)
- ~~select record on click (you can see start and finish points when its selected)~~
- ~~select record on import~~
- ~~change icon in mod menu to new one~~
- ~~fix "Crashes the game when leaving world while record is replaying"~~
- ~~copy file to record list when import~~
- record gui mouse clicks and key pressing
- create new preview.gif
- practice mode like in geometry dash for parkours
## How to build ## Roadmap
How to build mod from source - [ ] relative mode for repeating actions (like mining)
- [ ] record mouse and keyboard in gui
- [ ] practice mode (like in geometry dash but for parkours)
``` ### Contributing
gradlew build
```
Compiled .jar file you can find in `build/libs` If you would like to contribute to the project, feel free to fork the repository and submit a pull request.
### License
This project is licensed under the WTFPL License

View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.6-SNAPSHOT' id 'fabric-loom' version "${loom_version}"
id 'maven-publish' id 'maven-publish'
} }
@ -19,8 +19,8 @@ repositories {
} }
dependencies { dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24' compileOnly 'org.projectlombok:lombok:1.18.38'
annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.38'
//add joml //add joml
modImplementation 'org.joml:joml:1.10.4' modImplementation 'org.joml:joml:1.10.4'
@ -33,7 +33,6 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway. // Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
} }
processResources { processResources {
@ -45,7 +44,7 @@ processResources {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.release = 17 it.options.release = 21
} }
java { java {
@ -54,8 +53,8 @@ java {
// If you remove this line, sources will not be generated. // If you remove this line, sources will not be generated.
withSourcesJar() withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_21
} }
jar { jar {

View file

@ -1,17 +1,20 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20 minecraft_version=1.21.6
yarn_mappings=1.20+build.1 yarn_mappings=1.21.6+build.1
loader_version=0.15.10 loader_version=0.16.14
loom_version=1.10-SNAPSHOT
#Fabric api
fabric_version=0.83.0+1.20 # Fabric API
fabric_version=0.127.0+1.21.6
# Mod Properties
mod_version = 1.1.1+1.20 # Mod Properties
maven_group = themixray.repeating.mod mod_version = 1.1.2+1.21.6
archives_base_name = repeating-mod maven_group = ru.themixray
archives_base_name = repeating-mod
# Compatible with: 1.21.6

Binary file not shown.

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

184
gradlew.bat vendored
View file

@ -1,92 +1,92 @@
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused @rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter. @rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2 echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2 echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. 1>&2 echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2 echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
goto fail goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL% set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE% exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

BIN
img/menu.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

View file

Before

Width:  |  Height:  |  Size: 4.8 MiB

After

Width:  |  Height:  |  Size: 4.8 MiB

Before After
Before After

View file

@ -1,325 +0,0 @@
package themixray.repeating.mod;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.math.Vec3d;
import org.lwjgl.glfw.GLFW;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import themixray.repeating.mod.event.RecordDelayEvent;
import themixray.repeating.mod.event.RecordEvent;
import themixray.repeating.mod.event.RecordInputEvent;
import themixray.repeating.mod.event.RecordMoveEvent;
import themixray.repeating.mod.render.RenderHelper;
import themixray.repeating.mod.render.RenderSystem;
import themixray.repeating.mod.render.buffer.WorldBuffer;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.util.*;
public class Main implements ClientModInitializer {
public static final Logger LOGGER = LoggerFactory.getLogger("repeating-mod");
public static final MinecraftClient client = MinecraftClient.getInstance();
public static final FabricLoader loader = FabricLoader.getInstance();
public static Main me;
public RecordList record_list;
public RecordState now_record;
public boolean is_recording = false;
public long last_record = -1;
public TickTask move_tick = null;
public TickTask replay_tick = null;
public boolean is_replaying = false;
public boolean loop_replay = false;
public static RecordInputEvent input_replay = null;
public long living_ticks = 0;
public static RepeatingScreen menu;
private static KeyBinding menu_key;
private static KeyBinding toggle_replay_key;
private static KeyBinding toggle_record_key;
public long record_pos_delay = 20;
public static Random rand = new Random();
public EasyConfig conf;
public File records_folder;
@Override
public void onInitializeClient() {
LOGGER.info("Repeating mod initialized");
me = this;
now_record = null;
records_folder = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating_mod_records");
if (!records_folder.exists()) records_folder.mkdir();
record_list = new RecordList(records_folder);
record_list.loadRecords();
RenderSystem.init();
WorldRenderEvents.LAST.register(context -> {
WorldBuffer buffer = RenderHelper.startTri(context);
if (now_record != null) {
Vec3d start_pos = now_record.getStartRecordPos();
Vec3d finish_pos = now_record.getFinishRecordPos();
if (start_pos != null) drawRecordPos(buffer, start_pos, new Color(70, 230, 70, 128));
if (finish_pos != null) drawRecordPos(buffer, finish_pos, new Color(230, 70, 70, 128));
}
RenderHelper.endTri(buffer);
});
Map<String,String> def = new HashMap<>();
def.put("record_pos_delay", String.valueOf(record_pos_delay));
conf = new EasyConfig(loader.getConfigDir(),"repeating-mod",def);
record_pos_delay = Long.parseLong(conf.data.get("record_pos_delay"));
menu_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.menu",InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_J,"text.repeating-mod.name"));
toggle_replay_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.toggle_replay",InputUtil.Type.KEYSYM,
-1,"text.repeating-mod.name"));
toggle_record_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.toggle_record",InputUtil.Type.KEYSYM,
-1,"text.repeating-mod.name"));
menu = new RepeatingScreen();
ClientTickEvents.END_CLIENT_TICK.register(client -> {
if (menu_key.wasPressed())
client.setScreen(menu);
if (toggle_replay_key.wasPressed()) {
if (now_record != null) {
if (!is_recording) {
if (is_replaying)
stopReplay();
else startReplay();
menu.updateButtons();
}
}
}
if (toggle_record_key.wasPressed()) {
if (!is_replaying) {
if (is_recording)
stopRecording();
else startRecording();
menu.updateButtons();
}
}
});
new TickTask(0,0) {
@Override
public void run() {
living_ticks++;
}
};
System.setProperty("java.awt.headless", "false");
}
public void setNowRecord(RecordState record) {
now_record = record;
}
public void drawRecordPos(WorldBuffer buffer, Vec3d pos, Color color) {
RenderHelper.drawRectFromTri(buffer,
(float) pos.getX() - 0.25F,
(float) pos.getY() + 0.01F,
(float) pos.getZ() - 0.25F,
(float) pos.getX() + 0.25F,
(float) pos.getY() + 0.01F,
(float) pos.getZ() - 0.25F,
(float) pos.getX() + 0.25F,
(float) pos.getY() + 0.01F,
(float) pos.getZ() + 0.25F,
(float) pos.getX() - 0.25F,
(float) pos.getY() + 0.01F,
(float) pos.getZ() + 0.25F,
color);
}
public void startRecording() {
is_recording = true;
menu.updateButtons();
now_record = record_list.newRecord();
Vec3d start_pos = client.player.getPos();
now_record.addEvent(new RecordMoveEvent(start_pos,client.player.getHeadYaw(),client.player.getPitch()));
now_record.setStartRecordPos(start_pos);
if (record_pos_delay > 0) {
move_tick = new TickTask(
record_pos_delay,
record_pos_delay) {
@Override
public void run() {
now_record.addEvent(new RecordMoveEvent(client.player.getPos(),
client.player.getHeadYaw(), client.player.getPitch()));
}
};
}
sendMessage(Text.translatable("message.repeating-mod.record_start"));
}
public void recordTick(RecordEvent e) {
if (is_recording) {
long now = living_ticks;
if (last_record != -1) {
long diff = now - last_record - 2;
if (diff > 0) now_record.addEvent(new RecordDelayEvent(diff));
}
now_record.addEvent(e);
last_record = now;
}
}
public void recordAllInput() {
if (client.player == null) {
stopRecording();
return;
}
RecordInputEvent l = ((RecordInputEvent) now_record.getLastEvent("input"));
if (l == null) {
RecordInputEvent e = new RecordInputEvent(
client.player.input.sneaking,
client.player.input.jumping,
client.player.input.movementSideways,
client.player.input.movementForward,
client.player.input.pressingForward,
client.player.input.pressingBack,
client.player.input.pressingLeft,
client.player.input.pressingRight,
client.player.getHeadYaw(),
client.player.getBodyYaw(),
client.player.getPitch(),
client.player.isSprinting(),
client.player.getYaw(),
client.player.getMovementSpeed());
recordTick(e);
} else {
RecordInputEvent e = new RecordInputEvent(
((Boolean) client.player.input.sneaking == l.sneaking) ? null : client.player.input.sneaking,
((Boolean) client.player.input.jumping == l.jumping) ? null : client.player.input.jumping,
(((Float) client.player.input.movementSideways).equals(l.movementSideways)) ? null : client.player.input.movementSideways,
(((Float) client.player.input.movementForward).equals(l.movementForward)) ? null : client.player.input.movementForward,
((Boolean) client.player.input.pressingForward == l.pressingForward) ? null : client.player.input.pressingForward,
((Boolean) client.player.input.pressingBack == l.pressingBack) ? null : client.player.input.pressingBack,
((Boolean) client.player.input.pressingLeft == l.pressingLeft) ? null : client.player.input.pressingLeft,
((Boolean) client.player.input.pressingRight == l.pressingRight) ? null : client.player.input.pressingRight,
client.player.getHeadYaw(), Main.client.player.getBodyYaw(),client.player.getPitch(),
((Boolean) client.player.isSprinting() == l.sprinting) ? null : client.player.isSprinting(),
client.player.getYaw(),client.player.getMovementSpeed());
if (!(e.isEmpty() &&
e.yaw == l.yaw &&
e.head_yaw == l.head_yaw &&
e.pitch == l.pitch &&
e.body_yaw == l.body_yaw)) {
e.fillEmpty(l);
recordTick(e);
}
}
}
public void stopRecording() {
is_recording = false;
now_record.setFinishRecordPos(client.player.getPos());
try {
now_record.save();
} catch (IOException e) {
throw new RuntimeException(e);
}
if (move_tick != null) {
move_tick.cancel();
move_tick = null;
}
menu.updateButtons();
last_record = -1;
sendMessage(Text.translatable("message.repeating-mod.record_stop"));
}
public void startReplay() {
is_recording = false;
is_replaying = true;
menu.updateButtons();
List<RecordEvent> events = now_record.getEvents();
replay_tick = new TickTask(0,0, TickTask.TickAt.CLIENT_TAIL) {
public int replay_index = 0;
@Override
public void run() {
if (!is_replaying) cancel();
RecordEvent e = events.get(replay_index);
if (e instanceof RecordDelayEvent) {
setDelay(((RecordDelayEvent) e).delay);
} else {
e.replay();
}
replay_index++;
if (!loop_replay) {
if (replay_index == events.size()) {
stopReplay();
cancel();
}
} else if (replay_index == events.size()) {
replay_index = 0;
}
}
};
sendMessage(Text.translatable("message.repeating-mod.replay_start"));
}
public void stopReplay() {
is_recording = false;
is_replaying = false;
if (replay_tick != null) {
replay_tick.cancel();
replay_tick = null;
}
menu.updateButtons();
record_list.getWidget().getWidget(now_record).getChildren().get(3).setMessage(Text.translatable("text.repeating-mod.start"));
sendMessage(Text.translatable("message.repeating-mod.replay_stop"));
}
public static void sendMessage(MutableText text) {
client.player.sendMessage(Text.literal("[")
.append(Text.translatable("text.repeating-mod.name"))
.append("] ").formatted(Formatting.BOLD,Formatting.DARK_GRAY)
.append(text.formatted(Formatting.RESET).formatted(Formatting.GRAY)));
}
public static void sendDebug(String s) {
client.player.sendMessage(Text.literal("[DEBUG] ").append(Text.of(s)));
}
}

View file

@ -1,77 +0,0 @@
package themixray.repeating.mod;
import net.minecraft.text.Text;
import themixray.repeating.mod.widget.RecordListWidget;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class RecordList {
private final File folder;
private List<RecordState> records;
private RecordListWidget widget;
public RecordList(File folder) {
this.folder = folder;
this.records = new ArrayList<>();
this.widget = new RecordListWidget(0, 0, 180, 200);
}
public List<RecordState> getRecords() {
return records;
}
public File getFolder() {
return folder;
}
public RecordListWidget getWidget() {
return widget;
}
public void loadRecords() {
for (File file : folder.listFiles()) {
try {
addRecord(file);
} catch (Exception e) {}
}
}
public void addRecord(File file) throws Exception {
addRecord(RecordState.load(file));
}
public void addRecord(RecordState record) {
records.add(record);
widget.addWidget(record);
}
public void removeRecord(RecordState record) {
records.remove(record);
widget.removeWidget(record);
}
public RecordState newRecord() {
Date date = new Date();
String name = "Unnamed";
String author = Main.client.player.getName().getString();
File file = new File(Main.me.records_folder,
"record_" + RecordState.FILE_DATE_FORMAT.format(date) +
"_" + Main.rand.nextInt(10) + ".rrm");
RecordState state = new RecordState(
file, name, date, author,
new ArrayList<>(),
null,
null);
addRecord(state);
return state;
}
}

View file

@ -1,169 +0,0 @@
package themixray.repeating.mod;
import com.google.common.collect.Lists;
import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.event.RecordEvent;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class RecordState {
public static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM.dd.yyyy HH:mm:ss");
public static SimpleDateFormat FILE_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy_HH-mm-ss");
private final File file;
private String name;
private Date date;
private String author;
private List<RecordEvent> events;
private Vec3d start_record_pos;
private Vec3d finish_record_pos;
public RecordState(File file,
String name,
Date date,
String author,
List<RecordEvent> events,
Vec3d start_record_pos,
Vec3d finish_record_pos) {
this.file = file;
this.name = name;
this.date = date;
this.author = author;
this.events = events;
this.start_record_pos = start_record_pos;
this.finish_record_pos = finish_record_pos;
}
public File getFile() {
return file;
}
public String getName() {
return name;
}
public String getAuthor() {
return author;
}
public Date getDate() {
return date;
}
public List<RecordEvent> getEvents() {
return events;
}
public Vec3d getFinishRecordPos() {
return finish_record_pos;
}
public Vec3d getStartRecordPos() {
return start_record_pos;
}
public void setAuthor(String author) {
this.author = author;
}
public void setDate(Date date) {
this.date = date;
}
public void setName(String name) {
this.name = name;
}
public void setEvents(List<RecordEvent> events) {
this.events = events;
}
public void setFinishRecordPos(Vec3d finish_record_pos) {
this.finish_record_pos = finish_record_pos;
}
public void setStartRecordPos(Vec3d start_record_pos) {
this.start_record_pos = start_record_pos;
}
public void addEvent(RecordEvent event) {
events.add(event);
}
public RecordEvent getLastEvent(String type) {
for (RecordEvent r: Lists.reverse(new ArrayList<>(events))) {
if (r.getType().equals(type)) {
return r;
}
}
return null;
}
public void save() throws IOException {
StringBuilder text = new StringBuilder();
text.append(name).append("\n")
.append(DATE_FORMAT.format(date)).append("\n")
.append(author).append("\n");
text.append(start_record_pos.getX()).append("n")
.append(start_record_pos.getY()).append("n")
.append(start_record_pos.getZ()).append("x")
.append(finish_record_pos.getX()).append("n")
.append(finish_record_pos.getY()).append("n")
.append(finish_record_pos.getZ());
for (int i = 0; i < events.size(); i++) {
text.append("\n");
text.append(events.get(i).serialize());
}
Files.write(file.toPath(), text.toString().getBytes());
}
public static RecordState load(File file) throws Exception {
String text = Files.readString(file.toPath());
List<String> lines = List.of(text.split("\n"));
List<String> signature = lines.subList(0,4);
String name = signature.get(0);
Date date = DATE_FORMAT.parse(signature.get(1));
String author = signature.get(2);
String record_pos = signature.get(3);
String[] lss0 = record_pos.split("x");
String[] lss1 = lss0[0].split("n");
String[] lss2 = lss0[1].split("n");
Vec3d start_record_pos = new Vec3d(
Float.parseFloat(lss1[0]),
Float.parseFloat(lss1[1]),
Float.parseFloat(lss1[2]));
Vec3d finish_record_pos = new Vec3d(
Float.parseFloat(lss2[0]),
Float.parseFloat(lss2[1]),
Float.parseFloat(lss2[2]));
List<String> event_lines = lines.subList(4,lines.size());
List<RecordEvent> events = event_lines.stream().map(RecordEvent::deserialize).toList();
return new RecordState(file, name, date, author, events, start_record_pos, finish_record_pos);
}
public void remove() {
file.delete();
Main.me.record_list.removeRecord(this);
Main.me.record_list.getWidget().removeWidget(this);
}
}

View file

@ -1,193 +0,0 @@
package themixray.repeating.mod;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.text.Text;
import themixray.repeating.mod.widget.RecordListWidget;
import java.awt.*;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@Environment(EnvType.CLIENT)
public class RepeatingScreen extends Screen {
private static List<RenderListener> render_listeners = new ArrayList<>();
public ButtonWidget record_btn;
public ButtonWidget loop_btn;
public ButtonWidget import_btn;
public SliderWidget pos_delay_slider;
public boolean was_build = false;
protected RepeatingScreen() {
super(Text.empty());
}
public static void addRenderListener(RenderListener render) {
render_listeners.add(render);
}
public static void removeRenderListener(RenderListener render) {
render_listeners.remove(render);
}
public void updateButtons() {
if (was_build) {
record_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.is_recording) ? "stop_record" : "start_record")));
loop_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.loop_replay) ? "off_loop" : "on_loop")));
}
}
@Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
renderBackground(context,mouseX,mouseY,delta);
for (RenderListener l : render_listeners) {
if (l.beforeRender()) {
l.render(context, mouseX, mouseY, delta);
}
}
super.render(context, mouseX, mouseY, delta);
for (RenderListener l : render_listeners) {
if (!l.beforeRender()) {
l.render(context, mouseX, mouseY, delta);
}
}
}
@Override
protected void init() {
RecordListWidget list_widget = Main.me.record_list.getWidget();
list_widget.method_46421(width / 2 + 2);
list_widget.method_46419(height / 2 - list_widget.getHeight() / 2);
list_widget.init(this);
record_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.start_record"), button -> {
if (!Main.me.is_replaying) {
if (Main.me.is_recording)
Main.me.stopRecording();
else Main.me.startRecording();
updateButtons();
}
})
.dimensions(width / 2 - 120, height / 2 - 32, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.record_tooltip")))
.build();
loop_btn = ButtonWidget.builder(Text.empty(), button -> {
Main.me.loop_replay = !Main.me.loop_replay;
updateButtons();
})
.dimensions(width / 2 - 120, height / 2 - 10, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.loop_tooltip")))
.build();
pos_delay_slider = new SliderWidget(
width / 2 - 120, height / 2 + 12, 120, 20,
(Main.me.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") :
Text.translatable("text.repeating-mod.pos_delay", String.valueOf(Main.me.record_pos_delay)),
(Main.me.record_pos_delay+1d)/101d) {
@Override
protected void updateMessage() {
double v = value*101d-1d;
if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay"));
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
}
@Override
protected void applyValue() {
double v = value*101d-1d;
if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay"));
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
Main.me.record_pos_delay = (long) v;
Main.me.conf.data.put("record_pos_delay",String.valueOf(Main.me.record_pos_delay));
Main.me.conf.save();
}
@Override
public void onRelease(double mouseX, double mouseY) {
super.onRelease(mouseX, mouseY);
applyValue();
}
@Override
protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) {
super.onDrag(mouseX, mouseY, deltaX, deltaY);
applyValue();
}
@Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
super.render(context, mouseX, mouseY, delta);
updateMessage();
}
};
pos_delay_slider.setTooltip(Tooltip.of(Text.translatable("text.repeating-mod.pos_delay_tooltip")));
import_btn = ButtonWidget.builder(Text.translatable("text.repeating-mod.import"), button -> {
new Thread(() -> {
FileDialog fd = new FileDialog((java.awt.Frame) null);
fd.setMultipleMode(true);
fd.setName("Choose record files");
fd.setTitle("Choose record files");
fd.setFilenameFilter((dir, name) -> name.endsWith(".rrm"));
fd.setVisible(true);
File[] files = fd.getFiles();
if (files != null) {
for (File file : files) {
try {
Main.me.record_list.addRecord(file);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}}).start();
})
.dimensions(width / 2 + 2, height / 2 - list_widget.getHeight() / 2 - 22, 180, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.import_tooltip")))
.build();
was_build = true;
updateButtons();
addDrawableChild(loop_btn);
addDrawableChild(record_btn);
addDrawableChild(import_btn);
addDrawableChild(pos_delay_slider);
}
public <T extends Element & Drawable & Selectable> T addDrawableChild(T drawableElement) {
return super.addDrawableChild(drawableElement);
}
public <T extends Drawable> T addDrawable(T drawable) {
return super.addDrawable(drawable);
}
public <T extends Element & Selectable> T addSelectableChild(T child) {
return super.addSelectableChild(child);
}
public void remove(Element child) {
super.remove(child);
}
}

View file

@ -1,94 +0,0 @@
package themixray.repeating.mod;
import java.util.ArrayList;
import java.util.List;
public abstract class TickTask implements Runnable {
public static List<TickTask> tasks = new ArrayList<>();
public static void tickTasks(TickAt at) {
for (TickTask t:new ArrayList<>(tasks))
if (t.getAt() == at) t.tick();
}
private long living;
private long delay;
private boolean is_repeating;
private long period;
private boolean is_cancelled;
private TickAt at;
public enum TickAt {
CLIENT_HEAD, CLIENT_TAIL,
MOVEMENT_HEAD, MOVEMENT_TAIL,
RENDER_HEAD, RENDER_TAIL
}
public TickTask(long delay, TickAt at) {
this.is_cancelled = false;
this.is_repeating = false;
this.delay = delay;
this.living = 0;
this.period = 0;
this.at = at;
tasks.add(this);
}
public TickTask(long delay, long period, TickAt at) {
this.is_cancelled = false;
this.is_repeating = true;
this.delay = delay;
this.period = period;
this.living = 0;
this.at = at;
tasks.add(this);
}
public TickTask(long delay) {
this(delay,TickAt.CLIENT_HEAD);
}
public TickTask(long delay, long period) {
this(delay,period,TickAt.CLIENT_HEAD);
}
public void cancel() {
if (!is_cancelled) {
is_cancelled = true;
tasks.remove(this);
}
}
public boolean isCancelled() {
return is_cancelled;
}
public TickAt getAt() {
return at;
}
public void setDelay(long delay) {
if (is_repeating) {
this.delay = delay;
}
}
public long getDelay() {
return this.delay;
}
public void tick() {
if (living >= delay) {
if (is_repeating) {
delay = period;
run();
living = -1;
} else {
run();
cancel();
}
}
living++;
}
}

View file

@ -1,32 +0,0 @@
package themixray.repeating.mod.event;
import net.minecraft.util.math.BlockPos;
import themixray.repeating.mod.Main;
public class RecordBlockBreakEvent extends RecordEvent {
public BlockPos pos;
public static RecordBlockBreakEvent fromArgs(String[] a) {
return new RecordBlockBreakEvent(new BlockPos(
Integer.parseInt(a[0]),
Integer.parseInt(a[1]),
Integer.parseInt(a[2])));
}
public RecordBlockBreakEvent(
BlockPos pos) {
this.pos = pos;
}
public void replay() {
Main.client.interactionManager.breakBlock(pos);
}
public String serialize() {
return "b=" + pos.getX() + "&" + pos.getY() + "&" + pos.getZ();
}
public String getType() {
return "block_break";
}
}

View file

@ -1,46 +0,0 @@
package themixray.repeating.mod.event;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.Main;
public class RecordBlockInteractEvent extends RecordEvent {
public Hand hand;
public BlockHitResult hitResult;
public static RecordBlockInteractEvent fromArgs(String[] a) {
return new RecordBlockInteractEvent(
Hand.valueOf(a[5]),
new BlockHitResult(new Vec3d(
Double.parseDouble(a[0]),
Double.parseDouble(a[1]),
Double.parseDouble(a[2])),
Direction.byId(Integer.parseInt(a[4])),
new BlockPos(
Integer.parseInt(a[0]),
Integer.parseInt(a[1]),
Integer.parseInt(a[2])),
a[3].equals("1")));
}
public RecordBlockInteractEvent(Hand hand, BlockHitResult hitResult) {
this.hand = hand;
this.hitResult = hitResult;
}
public void replay() {
Main.client.interactionManager.interactBlock(Main.client.player, hand, hitResult);
}
public String serialize() {
return "i=" + hitResult.getBlockPos().getX() + "&" + hitResult.getBlockPos().getY() + "&" + hitResult.getBlockPos().getZ() +
"&" + (hitResult.isInsideBlock() ? "1" : "0") + "&" + hitResult.getSide().getId() + "&" + hand.name();
}
public String getType() {
return "block_interact";
}
}

View file

@ -1,29 +0,0 @@
package themixray.repeating.mod.event;
public class RecordDelayEvent extends RecordEvent {
public long delay;
public static RecordDelayEvent fromArgs(String[] a) {
return new RecordDelayEvent(Long.parseLong(a[0]));
}
public RecordDelayEvent(long delay) {
this.delay = delay;
}
public void replay() {
try {
Thread.sleep(delay / 20 * 1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
public String serialize() {
return "d=" + delay;
}
public String getType() {
return "delay";
}
}

View file

@ -1,28 +0,0 @@
package themixray.repeating.mod.event;
public abstract class RecordEvent {
public abstract void replay();
public abstract String serialize();
public abstract String getType();
public static RecordEvent deserialize(String t) {
try {
String type = String.valueOf(t.charAt(0));
String[] args = t.substring(2).split("&");
if (type.equals("d")) {
return RecordDelayEvent.fromArgs(args);
} else if (type.equals("m")) {
return RecordMoveEvent.fromArgs(args);
} else if (type.equals("p")) {
return RecordInputEvent.fromArgs(args);
} else if (type.equals("b")) {
return RecordBlockBreakEvent.fromArgs(args);
} else if (type.equals("i")) {
return RecordBlockInteractEvent.fromArgs(args);
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}

View file

@ -1,147 +0,0 @@
package themixray.repeating.mod.event;
import themixray.repeating.mod.Main;
public class RecordInputEvent extends RecordEvent {
public Boolean sneaking;
public Boolean jumping;
public Boolean pressingForward;
public Boolean pressingBack;
public Boolean pressingLeft;
public Boolean pressingRight;
public Boolean sprinting;
public Float movementSideways;
public Float movementForward;
public float yaw;
public float head_yaw;
public float body_yaw;
public float pitch;
public float speed;
public static RecordInputEvent fromArgs(String[] a) {
return new RecordInputEvent(
(a[0].equals("n") ? null : a[0].equals("1")),
(a[1].equals("n") ? null : a[1].equals("1")),
(a[2].equals("n") ? null : Float.parseFloat(a[2])),
(a[3].equals("n") ? null : Float.parseFloat(a[3])),
(a[4].equals("n") ? null : a[4].equals("1")),
(a[5].equals("n") ? null : a[5].equals("1")),
(a[6].equals("n") ? null : a[6].equals("1")),
(a[7].equals("n") ? null : a[7].equals("1")),
Float.parseFloat(a[8]), Float.parseFloat(a[9]),
Float.parseFloat(a[10]),
(a[11].equals("n") ? null : a[11].equals("1")),
Float.parseFloat(a[12]),
Float.parseFloat(a[13]));
}
public RecordInputEvent(Boolean sneaking,
Boolean jumping,
Float movementSideways,
Float movementForward,
Boolean pressingForward,
Boolean pressingBack,
Boolean pressingLeft,
Boolean pressingRight,
float head_yaw,
float body_yaw,
float head_pitch,
Boolean sprinting,
float yaw,
float speed) {
this.sneaking = sneaking;
this.jumping = jumping;
this.movementSideways = movementSideways;
this.movementForward = movementForward;
this.pressingForward = pressingForward;
this.pressingBack = pressingBack;
this.pressingLeft = pressingLeft;
this.pressingRight = pressingRight;
this.head_yaw = head_yaw;
this.body_yaw = body_yaw;
this.pitch = head_pitch;
this.sprinting = sprinting;
this.yaw = yaw;
this.speed = speed;
}
public void fillEmpty(RecordInputEvent e) {
if (sneaking == null) sneaking = e.sneaking;
if (jumping == null) jumping = e.jumping;
if (movementSideways == null) movementSideways = e.movementSideways;
if (movementForward == null) movementForward = e.movementForward;
if (pressingForward == null) pressingForward = e.pressingForward;
if (pressingBack == null) pressingBack = e.pressingBack;
if (pressingLeft == null) pressingLeft = e.pressingLeft;
if (pressingRight == null) pressingRight = e.pressingRight;
if (sprinting == null) sprinting = e.sprinting;
}
public boolean isEmpty() {
return sneaking == null &&
jumping == null &&
movementSideways == null &&
movementForward == null &&
pressingForward == null &&
pressingBack == null &&
pressingLeft == null &&
pressingRight == null &&
sprinting == null;
}
public void replay() {
Main.input_replay = this;
}
public void inputCallback() {
if (sprinting != null && Main.client.player.isSprinting() != sprinting)
Main.client.player.setSprinting(sprinting);
if (Main.client.player.getYaw() != yaw)
Main.client.player.setYaw(yaw);
if (Main.client.player.getHeadYaw() != head_yaw)
Main.client.player.setHeadYaw(head_yaw);
if (Main.client.player.getBodyYaw() != body_yaw)
Main.client.player.setBodyYaw(body_yaw);
if (Main.client.player.getPitch() != pitch)
Main.client.player.setPitch(pitch);
if (Main.client.player.getMovementSpeed() != speed)
Main.client.player.setMovementSpeed(speed);
if (sneaking != null && Main.client.player.input.sneaking != sneaking)
Main.client.player.input.sneaking = sneaking;
if (jumping != null && Main.client.player.input.jumping != jumping)
Main.client.player.input.jumping = jumping;
if (movementSideways != null && Main.client.player.input.movementSideways != movementSideways)
Main.client.player.input.movementSideways = movementSideways;
if (movementForward != null && Main.client.player.input.movementForward != movementForward)
Main.client.player.input.movementForward = movementForward;
if (pressingForward != null && Main.client.player.input.pressingForward != pressingForward)
Main.client.player.input.pressingForward = pressingForward;
if (pressingBack != null && Main.client.player.input.pressingBack != pressingBack)
Main.client.player.input.pressingBack = pressingBack;
if (pressingLeft != null && Main.client.player.input.pressingLeft != pressingLeft)
Main.client.player.input.pressingLeft = pressingLeft;
if (pressingRight != null && Main.client.player.input.pressingRight != pressingRight)
Main.client.player.input.pressingRight = pressingRight;
}
public String serialize() {
return "p=" +
((sneaking == null) ? "n" : (sneaking ? "1" : "0")) + "&" +
((jumping == null) ? "n" : (jumping ? "1" : "0")) + "&" +
((movementSideways == null) ? "n" : movementSideways) + "&" +
((movementForward == null) ? "n" : movementForward) + "&" +
((pressingForward == null) ? "n" : (pressingForward ? "1" : "0")) + "&" +
((pressingBack == null) ? "n" : (pressingBack ? "1" : "0")) + "&" +
((pressingLeft == null) ? "n" : (pressingLeft ? "1" : "0")) + "&" +
((pressingRight == null) ? "n" : (pressingRight ? "1" : "0")) + "&" +
head_yaw + "&" + body_yaw + "&" + pitch + "&" +
((sprinting == null) ? "n" : (sprinting ? "1" : "0") +
"&" + yaw + "&" + speed);
}
public String getType() {
return "input";
}
}

View file

@ -1,42 +0,0 @@
package themixray.repeating.mod.event;
import net.minecraft.entity.MovementType;
import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.Main;
public class RecordMoveEvent extends RecordEvent {
public Vec3d vec;
public float yaw;
public float pitch;
public static RecordMoveEvent fromArgs(String[] a) {
return new RecordMoveEvent(new Vec3d(
Double.parseDouble(a[0]),
Double.parseDouble(a[1]),
Double.parseDouble(a[2])),
Float.parseFloat(a[3]),
Float.parseFloat(a[4]));
}
public RecordMoveEvent(Vec3d vec, float yaw, float pitch) {
this.vec = vec;
this.yaw = yaw;
this.pitch = pitch;
}
public void replay() {
Vec3d p = Main.client.player.getPos();
Vec3d v = new Vec3d(vec.getX() - p.getX(), vec.getY() - p.getY(), vec.getZ() - p.getZ());
Main.client.player.move(MovementType.SELF, v);
Main.client.player.setYaw(yaw);
Main.client.player.setPitch(pitch);
}
public String serialize() {
return "m=" + vec.getX() + "&" + vec.getY() + "&" + vec.getZ() + "&" + yaw + "&" + pitch;
}
public String getType() {
return "move";
}
}

View file

@ -1,24 +0,0 @@
package themixray.repeating.mod.mixin;
import net.minecraft.client.MinecraftClient;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main;
import themixray.repeating.mod.TickTask;
@Mixin(MinecraftClient.class)
public abstract class ClientMixin {
@Inject(at = @At(value = "HEAD"), method = "tick")
private void onTickHead(CallbackInfo ci) {
if (Main.me.is_recording)
Main.me.recordAllInput();
TickTask.tickTasks(TickTask.TickAt.CLIENT_HEAD);
}
@Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.CLIENT_TAIL);
}
}

View file

@ -1,44 +0,0 @@
package themixray.repeating.mod.mixin;
import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.hit.HitResult;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main;
import themixray.repeating.mod.event.RecordBlockBreakEvent;
import themixray.repeating.mod.event.RecordBlockInteractEvent;
import themixray.repeating.mod.TickTask;
@Mixin(ClientPlayerEntity.class)
public abstract class MovementMixin {
@Inject(at = @At(value = "HEAD"), method = "init")
private void init(CallbackInfo ci) {
PlayerBlockBreakEvents.AFTER.register((world, player, pos, blockState, blockEntity) -> {
if (Main.me.is_recording)
Main.me.recordTick(new RecordBlockBreakEvent(pos));
});
UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> {
if (hitResult.getType().equals(HitResult.Type.BLOCK))
if (Main.me.is_recording)
Main.me.recordTick(new RecordBlockInteractEvent(hand,hitResult));
return ActionResult.PASS;
});
}
@Inject(at = @At(value = "HEAD"), method = "tickMovement")
private void onMoveHead(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.MOVEMENT_HEAD);
}
@Inject(at = @At(value = "TAIL"), method = "tick")
private void onMoveTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.MOVEMENT_TAIL);
}
}

View file

@ -1,29 +0,0 @@
package themixray.repeating.mod.mixin;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.listener.ServerPlayPacketListener;
import net.minecraft.network.packet.Packet;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.time.Duration;
import java.util.function.BooleanSupplier;
@Mixin(ClientPlayNetworkHandler.class)
public abstract class NetworkMixin {
// @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V")
// private void onSendPacket1Head(Packet<?> packet,
// CallbackInfo ci) {
//
// }
//
// @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;Ljava/util/function/BooleanSupplier;Ljava/time/Duration;)V")
// private void onSendPacket2Head(Packet<ServerPlayPacketListener> packet,
// BooleanSupplier sendCondition,
// Duration expirationTime,
// CallbackInfo ci) {
//
// }
}

View file

@ -1,21 +0,0 @@
package themixray.repeating.mod.mixin;
import net.minecraft.client.render.*;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.TickTask;
@Mixin(GameRenderer.class)
public abstract class RendererMixin {
@Inject(at = @At(value = "HEAD"), method = "tick")
private void onTickHead(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.RENDER_HEAD);
}
@Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.RENDER_TAIL);
}
}

View file

@ -1,200 +0,0 @@
package themixray.repeating.mod.render;
import lombok.experimental.UtilityClass;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.render.buffer.WorldBuffer;
import themixray.repeating.mod.render.shader.ShaderManager;
import java.awt.*;
import static org.lwjgl.opengl.GL33.*;
@UtilityClass
public class RenderHelper {
public WorldBuffer startLines(WorldRenderContext context) {
glEnable(GL_LINE_SMOOTH);
return new WorldBuffer(GL_LINES, ShaderManager.getPositionColorShader(), context);
}
public void endLines(WorldBuffer buffer) {
glEnable(GL_BLEND);
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glDepthMask(false);
buffer.draw();
glDepthMask(true);
glDisable(GL_BLEND);
}
public void drawLine(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, Color color) {
buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
}
public static WorldBuffer startTri(WorldRenderContext context) {
return new WorldBuffer(GL_TRIANGLES, ShaderManager.getPositionColorShader(), context);
}
public static void endTri(WorldBuffer buffer) {
//glDepthRange(0, 0.7);
glEnable(GL_BLEND);
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glDisable(GL_CULL_FACE);
glDepthMask(false);
buffer.draw();
glDepthMask(true);
glEnable(GL_CULL_FACE);
glDisable(GL_BLEND);
glDepthRange(0, 1);
}
public void drawTri(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, Color color) {
buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x3, y3, z3, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
}
public static void drawRectFromTri(WorldBuffer buffer,
float x1, float y1, float z1,
float x2, float y2, float z2,
float x3, float y3, float z3,
float x4, float y4, float z4,
Color color) {
drawTri(buffer,
x1, y1, z1,
x2, y2, z2,
x3, y3, z3,
color);
drawTri(buffer,
x3, y3, z3,
x4, y4, z4,
x1, y1, z1,
color);
}
public void drawRectFromLines(WorldBuffer buffer,
float x1, float y1, float z1,
float x2, float y2, float z2,
float x3, float y3, float z3,
float x4, float y4, float z4,
Color color) {
drawLine(buffer,
x1, y1, z1,
x2, y2, z2,
color);
drawLine(buffer,
x2, y2, z2,
x3, y3, z3,
color);
drawLine(buffer,
x3, y3, z3,
x4, y4, z4,
color);
drawLine(buffer,
x4, y4, z4,
x1, y1, z1,
color);
}
public void drawBoxFromTri(WorldBuffer buffer,
float x1, float y1, float z1,
float x2, float y2, float z2,
Color color) {
float[][] v = new float[][]{
new float[]{Math.min(x1, x2), Math.min(y1, y2), Math.min(z1, z2)},
new float[]{Math.max(x1, x2), Math.max(y1, y2), Math.max(z1, z2)}};
drawRectFromTri(buffer,
v[0][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[0][2],
v[1][0], v[1][1], v[0][2],
v[0][0], v[1][1], v[0][2],
color);
drawRectFromTri(buffer,
v[0][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[1][2],
v[0][0], v[0][1], v[1][2],
color);
drawRectFromTri(buffer,
v[0][0], v[0][1], v[0][2],
v[0][0], v[0][1], v[1][2],
v[0][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[0][2],
color);
drawRectFromTri(buffer,
v[0][0], v[0][1], v[1][2],
v[1][0], v[0][1], v[1][2],
v[1][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[1][2],
color);
drawRectFromTri(buffer,
v[0][0], v[1][1], v[0][2],
v[1][0], v[1][1], v[0][2],
v[1][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[1][2],
color);
drawRectFromTri(buffer,
v[1][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[1][2],
v[1][0], v[1][1], v[1][2],
v[1][0], v[1][1], v[0][2],
color);
}
public void drawBoxFromLines(WorldBuffer buffer,
float x1, float y1, float z1,
float x2, float y2, float z2,
Color color) {
float[][] v = new float[][]{
new float[]{Math.min(x1, x2), Math.min(y1, y2), Math.min(z1, z2)},
new float[]{Math.max(x1, x2), Math.max(y1, y2), Math.max(z1, z2)}};
drawRectFromLines(buffer,
v[0][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[0][2],
v[1][0], v[1][1], v[0][2],
v[0][0], v[1][1], v[0][2],
color);
drawRectFromLines(buffer,
v[0][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[1][2],
v[0][0], v[0][1], v[1][2],
color);
drawRectFromLines(buffer,
v[0][0], v[0][1], v[0][2],
v[0][0], v[0][1], v[1][2],
v[0][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[0][2],
color);
drawRectFromLines(buffer,
v[0][0], v[0][1], v[1][2],
v[1][0], v[0][1], v[1][2],
v[1][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[1][2],
color);
drawRectFromLines(buffer,
v[0][0], v[1][1], v[0][2],
v[1][0], v[1][1], v[0][2],
v[1][0], v[1][1], v[1][2],
v[0][0], v[1][1], v[1][2],
color);
drawRectFromLines(buffer,
v[1][0], v[0][1], v[0][2],
v[1][0], v[0][1], v[1][2],
v[1][0], v[1][1], v[1][2],
v[1][0], v[1][1], v[0][2],
color);
}
}

View file

@ -1,13 +0,0 @@
package themixray.repeating.mod.render;
import lombok.experimental.UtilityClass;
import themixray.repeating.mod.render.buffer.BufferManager;
import themixray.repeating.mod.render.shader.ShaderManager;
@UtilityClass
public class RenderSystem {
public static void init() {
BufferManager.init();
ShaderManager.init();
}
}

View file

@ -1,30 +0,0 @@
package themixray.repeating.mod.render.buffer;
import lombok.Getter;
public class Vertex {
@Getter
private float x;
@Getter
private float y;
@Getter
private float z;
@Getter
private float r;
@Getter
private float g;
@Getter
private float b;
@Getter
private float a;
public Vertex(float x, float y, float z, float r, float g, float b, float a) {
this.x = x;
this.y = y;
this.z = z;
this.r = r;
this.g = g;
this.b = b;
this.a = a;
}
}

View file

@ -1,42 +0,0 @@
package themixray.repeating.mod.render.shader;
import lombok.Getter;
import java.nio.FloatBuffer;
import static org.lwjgl.opengl.GL33.*;
public class Shader {
@Getter
private final int id;
public Shader(String name) {
int v = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.VERTEX);
int f = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.FRAGMENT);
this.id = glCreateProgram();
glAttachShader(id, v);
glAttachShader(id, f);
glLinkProgram(id);
}
public void bind() {
glUseProgram(id);
}
public void unbind() {
glUseProgram(0);
}
public void uniformMatrix4f(String name, FloatBuffer matrix) {
bind();
glUniformMatrix4fv(glGetUniformLocation(id, name), false, matrix);
unbind();
}
public void uniformValue2f(String name, float value1, float value2) {
bind();
glUniform2f(glGetUniformLocation(id, name), value1, value2);
unbind();
}
}

View file

@ -1,150 +0,0 @@
package themixray.repeating.mod.widget;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.*;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text;
import themixray.repeating.mod.Main;
import themixray.repeating.mod.RecordState;
import themixray.repeating.mod.RepeatingScreen;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
public class RecordListWidget extends ScrollableWidget {
private List<RecordWidget> widgets = new ArrayList<>();
private boolean focused = false;
public RecordListWidget(int x, int y, int width, int height) {
super(x,y,width,height,Text.empty());
}
@Override
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
focused = true;
boolean res = super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
focused = false;
return res;
}
@Override
protected double getDeltaYPerScroll() {
return 10;
}
@Override
protected void renderContents(DrawContext ctx, int mouseX, int mouseY, float delta) {
int y = 0;
for (RecordWidget wid: widgets) {
wid.method_46419(y);
wid.render(ctx, mouseX, (int) (mouseY + this.getScrollY()), delta);
y += wid.getHeight();
y += 2;
}
}
public void addWidget(RecordState record) {
RecordWidget widget = new RecordWidget(0, 0, width, 55, record, this);
widget.init(null);
widgets.add(0, widget);
}
public void removeWidget(RecordState record) {
widgets.removeIf(i -> i.getRecord().equals(record));
}
@Override
public void setFocused(boolean focused) {
}
@Override
public boolean isFocused() {
return focused;
}
@Override
protected int getContentsHeight() {
return !widgets.isEmpty() ? widgets.size() * 55 + (widgets.size() - 1) * 2 : 0;
}
public void init(RepeatingScreen screen) {
for (RecordWidget widget : widgets) {
widget.init(screen);
}
screen.addDrawableChild(this);
}
@Override
protected void appendClickableNarrations(NarrationMessageBuilder builder) {
}
public RecordWidget getWidget(RecordState record) {
for (RecordWidget widget : widgets) {
if (widget.getRecord().equals(record)) {
return widget;
}
}
return null;
}
public interface transport {
boolean check(ClickableWidget ch);
}
public boolean checkTransport(transport tr) {
for (RecordWidget wid : widgets) {
for (ClickableWidget child : wid.getChildren()) {
if (tr.check(child)) {
return true;
}
}
}
return false;
}
public boolean checkTransportNF(transport tr) {
for (RecordWidget wid : widgets) {
for (ClickableWidget child : wid.getChildren()) {
boolean res = tr.check(child);
if (res) {
child.setFocused(true);
return true;
} else {
child.setFocused(false);
}
}
}
return false;
}
@Override
public boolean mouseClicked(double mouseX, double mouseY, int button) {
return checkTransportNF((c) -> c.mouseClicked(mouseX, mouseY + this.getScrollY(), button)) || super.mouseClicked(mouseX, mouseY, button);
}
@Override
public boolean charTyped(char chr, int modifiers) {
return checkTransport((c) -> c.charTyped(chr, modifiers)) || super.charTyped(chr, modifiers);
}
@Override
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
return checkTransport((c) -> c.keyPressed(keyCode, scanCode, modifiers)) || super.keyPressed(keyCode, scanCode, modifiers);
}
@Override
public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
return checkTransport((c) -> c.keyReleased(keyCode, scanCode, modifiers)) || super.keyReleased(keyCode, scanCode, modifiers);
}
}

View file

@ -1,196 +0,0 @@
package themixray.repeating.mod.widget;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.*;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import themixray.repeating.mod.Main;
import themixray.repeating.mod.RecordState;
import themixray.repeating.mod.RenderListener;
import themixray.repeating.mod.RepeatingScreen;
import java.awt.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
public class RecordWidget implements Drawable, Widget {
private RecordState record;
private List<ClickableWidget> children;
private RecordListWidget parent;
private int x;
private int y;
private int width;
private int height;
public RecordWidget(int x, int y, int width, int height, RecordState record, RecordListWidget parent) {
this.parent = parent;
this.record = record;
this.x = x;
this.y = y;
this.width = width;
this.height = height;
this.children = new ArrayList<>();
}
public void method_46421(int x) {
this.x = x;
}
public void method_46419(int y) {
this.y = y;
}
public int getX() {
return x;
}
public int getY() {
return y;
}
public int getWidth() {
return width;
}
public int getHeight() {
return height;
}
public List<ClickableWidget> getChildren() {
return children;
}
@Override
public void forEachChild(Consumer<ClickableWidget> consumer) {
children.forEach(consumer);
}
public void init(RepeatingScreen screen) {
this.children = new ArrayList<>();
TextFieldWidget name_widget = new TextFieldWidget(
Main.client.textRenderer,
parent.getX() + getX() + 5,
parent.getY() + getY() + 5,
102,
10,
Text.empty());
name_widget.setText(record.getName());
name_widget.setChangedListener((s) -> {
record.setName(s);
try {
record.save();
} catch (IOException e) {
throw new RuntimeException(e);
}
});
children.add(name_widget);
ButtonWidget delete_button = ButtonWidget.builder(Text.translatable("text.repeating-mod.delete"), (i) -> {
record.remove();
}).dimensions(parent.getX() + getX() + 110,parent.getY() + getY() + 4, 65, 13).build();
children.add(delete_button);
ButtonWidget export_button = ButtonWidget.builder(Text.translatable("text.repeating-mod.export"), (i) -> {
if (Desktop.isDesktopSupported()) {
Desktop desk = Desktop.getDesktop();
try {
desk.browseFileDirectory(record.getFile());
} catch (Exception e) {
try {
desk.browse(record.getFile().toURI());
} catch (IOException ex) {
throw new RuntimeException(ex);
}
}
}
}).dimensions(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 14, 65, 13).build();
children.add(export_button);
ButtonWidget replay_button = ButtonWidget.builder(Text.translatable("text.repeating-mod.start"), (i) -> {
if (Main.me.is_replaying) {
Main.me.stopReplay();
}
i.setMessage(Text.translatable("text.repeating-mod.stop"));
Main.me.now_record = record;
Main.me.startReplay();
}).dimensions(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 28, 65, 13)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.replay_tooltip"))).build();
children.add(replay_button);
}
public RecordState getRecord() {
return record;
}
public void drawText(int x, int y, DrawContext ctx, List<Text> lines, float size, int line_height, boolean shadow) {
ctx.getMatrices().push();
ctx.getMatrices().scale(size, size, size);
int now_y = y;
for (Text line : lines) {
ctx.drawText(Main.client.textRenderer, line, (int) (x / size), (int) (now_y / size), line.getStyle().getColor().getRgb(), shadow);
now_y += line_height;
}
ctx.getMatrices().pop();
}
@Override
public void render(DrawContext ctx, int mouseX, int mouseY, float delta) {
int color = record.equals(Main.me.now_record) ? 0xFF555555 : 0xFF333333;
ctx.fill(parent.getX() + getX(),
parent.getY() + getY(),
parent.getX() + getX() + getWidth(),
parent.getY() + getY() + getHeight(),
color);
drawText(
parent.getX() + getX() + 5,
parent.getY() + getY() + 5 + 12,
ctx, List.of(
Text.translatable("text.repeating-mod.recorded_at")
.append(": ")
.styled((s) -> s.withColor(0xbbbbbb)),
Text.literal(RecordState.DATE_FORMAT.format(record.getDate())).styled((s) -> s.withColor(0xffffff)),
Text.translatable("text.repeating-mod.author")
.append(": ")
.styled((s) -> s.withColor(0xbbbbbb)),
Text.literal(record.getAuthor()).styled((s) -> s.withColor(0xffffff))
), 1,
9,
false);
if (!children.isEmpty()) {
ClickableWidget name_widget = children.get(0);
name_widget.setPosition(parent.getX() + getX() + 5, parent.getY() + getY() + 5);
ClickableWidget delete_button = children.get(1);
delete_button.setPosition(parent.getX() + getX() + 110,parent.getY() + getY() + 4);
ClickableWidget export_button = children.get(2);
export_button.setPosition(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 14);
ClickableWidget replay_button = children.get(3);
replay_button.setPosition(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 28);
}
for (ClickableWidget child : children) {
child.render(ctx, mouseX, mouseY, delta);
}
}
}

6
shell.nix Normal file
View file

@ -0,0 +1,6 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
shellHook = ''
export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH}''${LD_LIBRARY_PATH:+:}${pkgs.libglvnd}/lib"
'';
}

View file

@ -1,103 +1,103 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.io.File; import java.io.File;
public class EasyConfig { public class EasyConfig {
public final Path path; public final Path path;
public final File file; public final File file;
public Map<String,String> data; public Map<String,String> data;
public EasyConfig(File f, Map<String,String> def) { public EasyConfig(File f, Map<String,String> def) {
this.path = f.toPath(); this.path = f.toPath();
this.file = f; this.file = f;
this.data = new HashMap<>(); this.data = new HashMap<>();
if (!file.exists()) { if (!file.exists()) {
try { try {
file.createNewFile(); file.createNewFile();
write(def); write(def);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
reload(); reload();
for (Map.Entry<String,String> m:def.entrySet()) for (Map.Entry<String,String> m:def.entrySet())
if (!data.containsKey(m.getKey())) if (!data.containsKey(m.getKey()))
data.put(m.getKey(),m.getValue()); data.put(m.getKey(),m.getValue());
save(); save();
} }
public EasyConfig(Path f, Map<String,String> def) { public EasyConfig(Path f, Map<String,String> def) {
this(f.toFile(),def); this(f.toFile(),def);
} }
public EasyConfig(String parent,String child,Map<String,String> def) { public EasyConfig(String parent,String child,Map<String,String> def) {
this(new File(parent,child),def); this(new File(parent,child),def);
} }
public EasyConfig(File parent,String child,Map<String,String> def) { public EasyConfig(File parent,String child,Map<String,String> def) {
this(new File(parent,child),def); this(new File(parent,child),def);
} }
public EasyConfig(Path parent,String child,Map<String,String> def) { public EasyConfig(Path parent,String child,Map<String,String> def) {
this(new File(parent.toFile(),child),def); this(new File(parent.toFile(),child),def);
} }
public EasyConfig(File f) { public EasyConfig(File f) {
this(f,new HashMap<>()); this(f,new HashMap<>());
} }
public EasyConfig(Path path) { public EasyConfig(Path path) {
this(path.toFile(),new HashMap<>()); this(path.toFile(),new HashMap<>());
} }
public EasyConfig(String parent,String child) { public EasyConfig(String parent,String child) {
this(new File(parent,child),new HashMap<>()); this(new File(parent,child),new HashMap<>());
} }
public EasyConfig(File parent,String child) { public EasyConfig(File parent,String child) {
this(new File(parent,child),new HashMap<>()); this(new File(parent,child),new HashMap<>());
} }
public EasyConfig(Path parent,String child) { public EasyConfig(Path parent,String child) {
this(new File(parent.toFile(),child),new HashMap<>()); this(new File(parent.toFile(),child),new HashMap<>());
} }
public void reload() { public void reload() {
data = read(); data = read();
} }
public void save() { public void save() {
write(data); write(data);
} }
private String toText(Map<String,String> p) { private String toText(Map<String,String> p) {
StringBuilder t = new StringBuilder(); StringBuilder t = new StringBuilder();
for (Map.Entry<String,String> e:p.entrySet()) for (Map.Entry<String,String> e:p.entrySet())
t.append(e.getKey()).append("=").append(e.getValue()).append("\n"); t.append(e.getKey()).append("=").append(e.getValue()).append("\n");
return t.toString(); return t.toString();
} }
private Map<String,String> toMap(String j) { private Map<String,String> toMap(String j) {
Map<String,String> m = new HashMap<>(); Map<String,String> m = new HashMap<>();
for (String l:j.split("\n")) { for (String l:j.split("\n")) {
String s[] = l.split("="); String s[] = l.split("=");
m.put(s[0],s[1]); m.put(s[0],s[1]);
} }
return m; return m;
} }
private Map<String,String> read() { private Map<String,String> read() {
try { try {
return toMap(Files.readString(path)); return toMap(Files.readString(path));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
return new HashMap<>(); return new HashMap<>();
} }
private void write(Map<String,String> p) { private void write(Map<String,String> p) {
try { try {
Files.write(path, toText(p).getBytes()); Files.write(path, toText(p).getBytes());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }

View file

@ -1,339 +1,309 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.KeyBinding; import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import themixray.repeating.mod.event.events.DelayEvent; import ru.themixray.repeating_mod.event.events.DelayEvent;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
import themixray.repeating.mod.event.events.InputEvent; import ru.themixray.repeating_mod.event.events.InputEvent;
import themixray.repeating.mod.event.events.MoveEvent; import ru.themixray.repeating_mod.event.events.MoveEvent;
import themixray.repeating.mod.render.RenderHelper; import ru.themixray.repeating_mod.render.RenderHelper;
import themixray.repeating.mod.render.RenderSystem; import ru.themixray.repeating_mod.render.RenderSystem;
import themixray.repeating.mod.render.buffer.WorldBuffer; import ru.themixray.repeating_mod.render.buffer.WorldBuffer;
import java.awt.*; import java.awt.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
public class Main implements ClientModInitializer { public class Main implements ClientModInitializer {
public static final Logger LOGGER = LoggerFactory.getLogger("repeating-mod"); public static final Logger LOGGER = LoggerFactory.getLogger("repeating-mod");
public static final MinecraftClient client = MinecraftClient.getInstance(); public static final MinecraftClient client = MinecraftClient.getInstance();
public static final FabricLoader loader = FabricLoader.getInstance(); public static final FabricLoader loader = FabricLoader.getInstance();
public static Main me; public static Main me;
public RecordList record_list; public RecordList record_list;
public RecordState now_record; public RecordState now_record;
public boolean is_recording = false; public boolean is_recording = false;
public long last_record = -1; public long last_record = -1;
public TickTask move_tick = null; public TickTask move_tick = null;
public TickTask replay_tick = null; public TickTask replay_tick = null;
public boolean is_replaying = false; public boolean is_replaying = false;
public boolean loop_replay = false; public boolean loop_replay = false;
public static InputEvent input_replay = null; public static InputEvent input_replay = null;
public long living_ticks = 0; public long living_ticks = 0;
public static RepeatingScreen menu; public static RepeatingScreen menu;
private static KeyBinding menu_key; private static KeyBinding menu_key;
private static KeyBinding toggle_replay_key; private static KeyBinding toggle_replay_key;
private static KeyBinding toggle_record_key; private static KeyBinding toggle_record_key;
public long record_pos_delay = 20; public long record_pos_delay = -1;
public static Random rand = new Random(); public static Random rand = new Random();
public EasyConfig conf; public EasyConfig conf;
public File records_folder; public File records_folder;
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
LOGGER.info("Repeating mod initialized"); LOGGER.info("Repeating mod initialized");
me = this; me = this;
now_record = null; now_record = null;
records_folder = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating_mod_records"); records_folder = new File(FabricLoader.getInstance().getGameDir().toFile(),"repeating_mod_records");
if (!records_folder.exists()) records_folder.mkdir(); if (!records_folder.exists()) records_folder.mkdir();
record_list = new RecordList(records_folder); record_list = new RecordList(records_folder);
record_list.loadRecords(); record_list.loadRecords();
RenderSystem.init(); RenderSystem.init();
WorldRenderEvents.LAST.register(context -> { WorldRenderEvents.AFTER_ENTITIES.register(context -> {
WorldBuffer buffer = RenderHelper.startTri(context); WorldBuffer buffer = RenderHelper.startTri(context);
if (now_record != null) { if (now_record != null) {
Vec3d start_pos = now_record.getStartRecordPos(); Vec3d start_pos = now_record.getStartRecordPos();
Vec3d finish_pos = now_record.getFinishRecordPos(); Vec3d finish_pos = now_record.getFinishRecordPos();
if (start_pos != null) drawRecordPos(buffer, start_pos, new Color(70, 230, 70, 128)); if (start_pos != null) drawRecordPos(buffer, start_pos, new Color(70, 230, 70, 128));
if (finish_pos != null) drawRecordPos(buffer, finish_pos, new Color(230, 70, 70, 128)); if (finish_pos != null) drawRecordPos(buffer, finish_pos, new Color(230, 70, 70, 128));
} }
RenderHelper.endTri(buffer); RenderHelper.endTri(buffer);
}); });
ClientTickEvents.END_CLIENT_TICK.register(client -> { ClientTickEvents.END_CLIENT_TICK.register(client -> {
TickTask.tickTasks(TickTask.TickAt.CLIENT_EVENT); TickTask.tickTasks(TickTask.TickAt.CLIENT_EVENT);
}); });
Map<String,String> def = new HashMap<>(); Map<String,String> def = new HashMap<>();
def.put("record_pos_delay", String.valueOf(record_pos_delay)); def.put("record_pos_delay", String.valueOf(record_pos_delay));
conf = new EasyConfig(loader.getConfigDir(),"repeating-mod",def); conf = new EasyConfig(loader.getConfigDir(),"repeating-mod",def);
record_pos_delay = Long.parseLong(conf.data.get("record_pos_delay")); record_pos_delay = Long.parseLong(conf.data.get("record_pos_delay"));
menu_key = KeyBindingHelper.registerKeyBinding(new KeyBinding( menu_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.menu",InputUtil.Type.KEYSYM, "key.repeating-mod.menu",InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_J,"text.repeating-mod.name")); GLFW.GLFW_KEY_J,"text.repeating-mod.name"));
toggle_replay_key = KeyBindingHelper.registerKeyBinding(new KeyBinding( toggle_replay_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.toggle_replay",InputUtil.Type.KEYSYM, "key.repeating-mod.toggle_replay",InputUtil.Type.KEYSYM,
-1,"text.repeating-mod.name")); -1,"text.repeating-mod.name"));
toggle_record_key = KeyBindingHelper.registerKeyBinding(new KeyBinding( toggle_record_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.repeating-mod.toggle_record",InputUtil.Type.KEYSYM, "key.repeating-mod.toggle_record",InputUtil.Type.KEYSYM,
-1,"text.repeating-mod.name")); -1,"text.repeating-mod.name"));
menu = new RepeatingScreen(); menu = new RepeatingScreen();
ClientTickEvents.END_CLIENT_TICK.register(client -> { ClientTickEvents.END_CLIENT_TICK.register(client -> {
if (menu_key.wasPressed()) if (menu_key.wasPressed())
client.setScreen(menu); client.setScreen(menu);
if (toggle_replay_key.wasPressed()) { if (toggle_replay_key.wasPressed()) {
if (now_record != null) { if (now_record != null) {
if (!is_recording) { if (!is_recording) {
if (is_replaying) if (is_replaying)
stopReplay(); stopReplay();
else startReplay(); else startReplay();
menu.updateButtons(); menu.updateButtons();
} }
} }
} }
if (toggle_record_key.wasPressed()) { if (toggle_record_key.wasPressed()) {
if (!is_replaying) { if (!is_replaying) {
if (is_recording) if (is_recording)
stopRecording(); stopRecording();
else startRecording(); else startRecording();
menu.updateButtons(); menu.updateButtons();
} }
} }
}); });
new TickTask(0,0) { new TickTask(0,0) {
@Override @Override
public void run() { public void run() {
living_ticks++; living_ticks++;
} }
}; };
System.setProperty("java.awt.headless", "false"); System.setProperty("java.awt.headless", "false");
} }
public void setNowRecord(RecordState record) { public void setNowRecord(RecordState record) {
now_record = record; now_record = record;
} }
public void drawRecordPos(WorldBuffer buffer, Vec3d pos, Color color) { public void drawRecordPos(WorldBuffer buffer, Vec3d pos, Color color) {
RenderHelper.drawRectFromTri(buffer, RenderHelper.drawRectFromTri(buffer,
(float) pos.getX() - 0.25F, (float) pos.getX() - 0.25F,
(float) pos.getY() + 0.01F, (float) pos.getY() + 0.01F,
(float) pos.getZ() - 0.25F, (float) pos.getZ() - 0.25F,
(float) pos.getX() + 0.25F, (float) pos.getX() + 0.25F,
(float) pos.getY() + 0.01F, (float) pos.getY() + 0.01F,
(float) pos.getZ() - 0.25F, (float) pos.getZ() - 0.25F,
(float) pos.getX() + 0.25F, (float) pos.getX() + 0.25F,
(float) pos.getY() + 0.01F, (float) pos.getY() + 0.01F,
(float) pos.getZ() + 0.25F, (float) pos.getZ() + 0.25F,
(float) pos.getX() - 0.25F, (float) pos.getX() - 0.25F,
(float) pos.getY() + 0.01F, (float) pos.getY() + 0.01F,
(float) pos.getZ() + 0.25F, (float) pos.getZ() + 0.25F,
color); color);
} }
public void startRecording() { public void startRecording() {
is_recording = true; is_recording = true;
menu.updateButtons(); menu.updateButtons();
now_record = record_list.newRecord(); now_record = record_list.newRecord();
Vec3d start_pos = client.player.getPos(); Vec3d start_pos = client.player.getPos();
now_record.addEvent(new MoveEvent(start_pos,client.player.getHeadYaw(),client.player.getPitch())); recordTick(new MoveEvent(start_pos,client.player.getHeadYaw(),client.player.getPitch()));
now_record.setStartRecordPos(start_pos); now_record.setStartRecordPos(start_pos);
if (record_pos_delay > 0) { if (record_pos_delay > 0) {
move_tick = new TickTask( move_tick = new TickTask(
record_pos_delay, record_pos_delay,
record_pos_delay) { record_pos_delay) {
@Override @Override
public void run() { public void run() {
now_record.addEvent(new MoveEvent(client.player.getPos(), recordTick(new MoveEvent(client.player.getPos(),
client.player.getHeadYaw(), client.player.getPitch())); client.player.getHeadYaw(), client.player.getPitch()));
} }
}; };
} }
sendMessage(Text.translatable("message.repeating-mod.record_start")); sendMessage(Text.translatable("message.repeating-mod.record_start"));
} }
public void recordTick(RecordEvent e) { public void recordTick(RecordEvent e) {
if (is_recording) { if (is_recording) {
long now = living_ticks; long now = living_ticks;
if (last_record != -1) { if (last_record != -1) {
long diff = now - last_record - 2; long diff = now - last_record - 2;
if (diff > 0) now_record.addEvent(new DelayEvent(diff)); if (diff > 0) now_record.addEvent(new DelayEvent(diff));
} }
now_record.addEvent(e); now_record.addEvent(e);
last_record = now; last_record = now;
} }
} }
public void recordAllInput() { public void recordAllInput() {
if (client.player == null) { if (client.player == null) {
stopRecording(); stopRecording();
return; return;
} }
InputEvent l = ((InputEvent) now_record.getLastEvent("input")); InputEvent curr = InputEvent.current();
if (l == null) { if (curr == null) return;
InputEvent e = new InputEvent(
client.player.input.sneaking, InputEvent last = ((InputEvent) now_record.getLastEvent("input"));
client.player.input.jumping, if (last == null) {
client.player.input.movementSideways, recordTick(curr);
client.player.input.movementForward, } else if (!curr.equals(last)) {
client.player.input.pressingForward, recordTick(curr.differs(last));
client.player.input.pressingBack, }
client.player.input.pressingLeft, }
client.player.input.pressingRight,
client.player.getHeadYaw(), public void stopRecording() {
client.player.getBodyYaw(), is_recording = false;
client.player.getPitch(), now_record.setFinishRecordPos(client.player.getPos());
client.player.isSprinting(), try {
client.player.getYaw(), now_record.save();
client.player.getMovementSpeed()); } catch (IOException e) {
recordTick(e); throw new RuntimeException(e);
} else { }
InputEvent e = new InputEvent( if (move_tick != null) {
((Boolean) client.player.input.sneaking == l.sneaking) ? null : client.player.input.sneaking, move_tick.cancel();
((Boolean) client.player.input.jumping == l.jumping) ? null : client.player.input.jumping, move_tick = null;
(((Float) client.player.input.movementSideways).equals(l.movementSideways)) ? null : client.player.input.movementSideways, }
(((Float) client.player.input.movementForward).equals(l.movementForward)) ? null : client.player.input.movementForward, menu.updateButtons();
((Boolean) client.player.input.pressingForward == l.pressingForward) ? null : client.player.input.pressingForward, last_record = -1;
((Boolean) client.player.input.pressingBack == l.pressingBack) ? null : client.player.input.pressingBack, sendMessage(Text.translatable("message.repeating-mod.record_stop"));
((Boolean) client.player.input.pressingLeft == l.pressingLeft) ? null : client.player.input.pressingLeft, }
((Boolean) client.player.input.pressingRight == l.pressingRight) ? null : client.player.input.pressingRight,
client.player.getHeadYaw(), Main.client.player.getBodyYaw(),client.player.getPitch(),
((Boolean) client.player.isSprinting() == l.sprinting) ? null : client.player.isSprinting(), public void startReplay() {
client.player.getYaw(),client.player.getMovementSpeed()); is_recording = false;
is_replaying = true;
if (!(e.isEmpty() && menu.updateButtons();
e.yaw == l.yaw &&
e.head_yaw == l.head_yaw && List<RecordEvent> events = now_record.getEvents();
e.pitch == l.pitch &&
e.body_yaw == l.body_yaw)) { replay_tick = new TickTask(0,0, TickTask.TickAt.CLIENT_EVENT) {
e.fillEmpty(l); public int replay_index = 0;
recordTick(e);
} @Override
} public void run() {
} if (!is_replaying) {
cancel();
public void stopRecording() { return;
is_recording = false; }
now_record.setFinishRecordPos(client.player.getPos());
try { RecordEvent e = events.get(replay_index);
now_record.save(); if (e != null) {
} catch (IOException e) { if (e instanceof DelayEvent) {
throw new RuntimeException(e); setDelay(((DelayEvent) e).delay);
} } else {
if (move_tick != null) { e.replay();
move_tick.cancel(); }
move_tick = null; }
}
menu.updateButtons(); replay_index++;
last_record = -1; if (!loop_replay) {
sendMessage(Text.translatable("message.repeating-mod.record_stop")); if (replay_index >= events.size()) {
} stopReplay();
cancel();
}
public void startReplay() { } else if (replay_index >= events.size()) {
is_recording = false; replay_index = 0;
is_replaying = true; }
menu.updateButtons(); }
};
List<RecordEvent> events = now_record.getEvents();
sendMessage(Text.translatable("message.repeating-mod.replay_start"));
replay_tick = new TickTask(0,0, TickTask.TickAt.CLIENT_EVENT) { }
public int replay_index = 0;
public void stopReplay() {
@Override is_recording = false;
public void run() { is_replaying = false;
if (!is_replaying) { if (replay_tick != null) {
cancel(); replay_tick.cancel();
return; replay_tick = null;
} }
try {
RecordEvent e = events.get(replay_index); now_record.save();
if (e instanceof DelayEvent) { } catch (IOException e) {
setDelay(((DelayEvent) e).delay); throw new RuntimeException(e);
} else { }
e.replay(); menu.updateButtons();
} record_list.getWidget().getWidget(now_record).getChildren().get(3).setMessage(Text.translatable("text.repeating-mod.start"));
sendMessage(Text.translatable("message.repeating-mod.replay_stop"));
replay_index++; }
if (!loop_replay) {
if (replay_index == events.size()) { public static void sendMessage(MutableText text) {
stopReplay(); client.player.sendMessage(Text.literal("[")
cancel(); .append(Text.translatable("text.repeating-mod.name"))
} .append("] ").formatted(Formatting.BOLD,Formatting.DARK_GRAY)
} else if (replay_index == events.size()) { .append(text.formatted(Formatting.RESET).formatted(Formatting.GRAY)), false);
replay_index = 0; }
}
} // public static void sendDebug(String s) {
}; // client.player.sendMessage(Text.literal("[DEBUG] ").append(Text.of(s)), false);
// }
sendMessage(Text.translatable("message.repeating-mod.replay_start")); }
}
public void stopReplay() {
is_recording = false;
is_replaying = false;
if (replay_tick != null) {
replay_tick.cancel();
replay_tick = null;
}
try {
now_record.save();
} catch (IOException e) {
throw new RuntimeException(e);
}
menu.updateButtons();
record_list.getWidget().getWidget(now_record).getChildren().get(3).setMessage(Text.translatable("text.repeating-mod.start"));
sendMessage(Text.translatable("message.repeating-mod.replay_stop"));
}
public static void sendMessage(MutableText text) {
client.player.sendMessage(Text.literal("[")
.append(Text.translatable("text.repeating-mod.name"))
.append("] ").formatted(Formatting.BOLD,Formatting.DARK_GRAY)
.append(text.formatted(Formatting.RESET).formatted(Formatting.GRAY)));
}
public static void sendDebug(String s) {
client.player.sendMessage(Text.literal("[DEBUG] ").append(Text.of(s)));
}
}

View file

@ -1,12 +1,9 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import net.minecraft.text.Text; import ru.themixray.repeating_mod.widget.RecordListWidget;
import themixray.repeating.mod.widget.RecordListWidget;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
public class RecordList { public class RecordList {
@ -51,6 +48,7 @@ public class RecordList {
} }
public void addRecord(RecordState record) { public void addRecord(RecordState record) {
if (record == null) return;
records.add(record); records.add(record);
widget.addWidget(record); widget.addWidget(record);
} }

View file

@ -1,10 +1,9 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
import java.awt.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -96,6 +95,7 @@ public class RecordState {
} }
public void addEvent(RecordEvent event) { public void addEvent(RecordEvent event) {
if (event == null) return;
events.add(event); events.add(event);
} }
@ -124,9 +124,10 @@ public class RecordState {
.append(finish_record_pos.getY()).append("n") .append(finish_record_pos.getY()).append("n")
.append(finish_record_pos.getZ()); .append(finish_record_pos.getZ());
for (int i = 0; i < events.size(); i++) { for (RecordEvent event : events) {
if (event == null) continue;
text.append("\n"); text.append("\n");
text.append(events.get(i).serialize()); text.append(event.serialize());
} }
Files.write(file.toPath(), text.toString().getBytes()); Files.write(file.toPath(), text.toString().getBytes());

View file

@ -1,4 +1,4 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;

View file

@ -1,187 +1,187 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.SliderWidget; import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import themixray.repeating.mod.widget.RecordListWidget; import ru.themixray.repeating_mod.widget.RecordListWidget;
import java.awt.*; import java.awt.*;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class RepeatingScreen extends Screen { public class RepeatingScreen extends Screen {
private static List<RenderListener> render_listeners = new ArrayList<>(); private static List<RenderListener> render_listeners = new ArrayList<>();
public ButtonWidget record_btn; public ButtonWidget record_btn;
public ButtonWidget loop_btn; public ButtonWidget loop_btn;
public ButtonWidget import_btn; public ButtonWidget import_btn;
public SliderWidget pos_delay_slider; public SliderWidget pos_delay_slider;
public boolean was_build = false; public boolean was_build = false;
protected RepeatingScreen() { protected RepeatingScreen() {
super(Text.empty()); super(Text.empty());
} }
public static void addRenderListener(RenderListener render) { public static void addRenderListener(RenderListener render) {
render_listeners.add(render); render_listeners.add(render);
} }
public static void removeRenderListener(RenderListener render) { public static void removeRenderListener(RenderListener render) {
render_listeners.remove(render); render_listeners.remove(render);
} }
public void updateButtons() { public void updateButtons() {
if (was_build) { if (was_build) {
record_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.is_recording) ? "stop_record" : "start_record"))); record_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.is_recording) ? "stop_record" : "start_record")));
loop_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.loop_replay) ? "off_loop" : "on_loop"))); loop_btn.setMessage(Text.translatable("text.repeating-mod." + ((Main.me.loop_replay) ? "off_loop" : "on_loop")));
} }
} }
@Override @Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(DrawContext context, int mouseX, int mouseY, float delta) {
renderBackground(context); // renderBackground(context, mouseX, mouseY, delta);
for (RenderListener l : render_listeners) { for (RenderListener l : render_listeners) {
if (l.beforeRender()) { if (l.beforeRender()) {
l.render(context, mouseX, mouseY, delta); l.render(context, mouseX, mouseY, delta);
} }
} }
super.render(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta);
for (RenderListener l : render_listeners) { for (RenderListener l : render_listeners) {
if (!l.beforeRender()) { if (!l.beforeRender()) {
l.render(context, mouseX, mouseY, delta); l.render(context, mouseX, mouseY, delta);
} }
} }
} }
@Override @Override
protected void init() { protected void init() {
RecordListWidget list_widget = Main.me.record_list.getWidget(); RecordListWidget list_widget = Main.me.record_list.getWidget();
list_widget.setX(width / 2 + 2); list_widget.setX(width / 2 + 2);
list_widget.setY(height / 2 - list_widget.getHeight() / 2); list_widget.setY(height / 2 - list_widget.getHeight() / 2);
list_widget.init(this); list_widget.init(this);
record_btn = ButtonWidget.builder( record_btn = ButtonWidget.builder(
Text.translatable("text.repeating-mod.start_record"), button -> { Text.translatable("text.repeating-mod.start_record"), button -> {
if (!Main.me.is_replaying) { if (!Main.me.is_replaying) {
if (Main.me.is_recording) if (Main.me.is_recording)
Main.me.stopRecording(); Main.me.stopRecording();
else Main.me.startRecording(); else Main.me.startRecording();
updateButtons(); updateButtons();
} }
}) })
.dimensions(width / 2 - 120, height / 2 - 32, 120, 20) .dimensions(width / 2 - 120, height / 2 - 32, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.record_tooltip"))) .tooltip(Tooltip.of(Text.translatable("text.repeating-mod.record_tooltip")))
.build(); .build();
loop_btn = ButtonWidget.builder(Text.empty(), button -> { loop_btn = ButtonWidget.builder(Text.empty(), button -> {
Main.me.loop_replay = !Main.me.loop_replay; Main.me.loop_replay = !Main.me.loop_replay;
updateButtons(); updateButtons();
}) })
.dimensions(width / 2 - 120, height / 2 - 10, 120, 20) .dimensions(width / 2 - 120, height / 2 - 10, 120, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.loop_tooltip"))) .tooltip(Tooltip.of(Text.translatable("text.repeating-mod.loop_tooltip")))
.build(); .build();
pos_delay_slider = new SliderWidget( pos_delay_slider = new SliderWidget(
width / 2 - 120, height / 2 + 12, 120, 20, width / 2 - 120, height / 2 + 12, 120, 20,
(Main.me.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") : (Main.me.record_pos_delay < 0) ? Text.translatable("text.repeating-mod.nan_pos_delay") :
Text.translatable("text.repeating-mod.pos_delay", String.valueOf(Main.me.record_pos_delay)), Text.translatable("text.repeating-mod.pos_delay", String.valueOf(Main.me.record_pos_delay)),
(Main.me.record_pos_delay+1d)/101d) { (Main.me.record_pos_delay+1d)/101d) {
@Override @Override
protected void updateMessage() { protected void updateMessage() {
double v = value*101d-1d; double v = value*101d-1d;
if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay")); if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay"));
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v))); else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
} }
@Override @Override
protected void applyValue() { protected void applyValue() {
double v = value*101d-1d; double v = value*101d-1d;
if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay")); if (v <= 1) setMessage(Text.translatable("text.repeating-mod.nan_pos_delay"));
else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v))); else setMessage(Text.translatable("text.repeating-mod.pos_delay", String.valueOf((long) v)));
Main.me.record_pos_delay = (long) v; Main.me.record_pos_delay = (long) v;
Main.me.conf.data.put("record_pos_delay",String.valueOf(Main.me.record_pos_delay)); Main.me.conf.data.put("record_pos_delay",String.valueOf(Main.me.record_pos_delay));
Main.me.conf.save(); Main.me.conf.save();
} }
@Override @Override
public void onRelease(double mouseX, double mouseY) { public void onRelease(double mouseX, double mouseY) {
super.onRelease(mouseX, mouseY); super.onRelease(mouseX, mouseY);
applyValue(); applyValue();
} }
@Override @Override
protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) { protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) {
super.onDrag(mouseX, mouseY, deltaX, deltaY); super.onDrag(mouseX, mouseY, deltaX, deltaY);
applyValue(); applyValue();
} }
}; };
pos_delay_slider.setTooltip(Tooltip.of(Text.translatable("text.repeating-mod.pos_delay_tooltip"))); pos_delay_slider.setTooltip(Tooltip.of(Text.translatable("text.repeating-mod.pos_delay_tooltip")));
import_btn = ButtonWidget.builder(Text.translatable("text.repeating-mod.import"), button -> { import_btn = ButtonWidget.builder(Text.translatable("text.repeating-mod.import"), button -> {
new Thread(() -> { new Thread(() -> {
FileDialog fd = new FileDialog((java.awt.Frame) null); FileDialog fd = new FileDialog((java.awt.Frame) null);
fd.setMultipleMode(true); fd.setMultipleMode(true);
fd.setName("Choose record files"); fd.setName("Choose record files");
fd.setTitle("Choose record files"); fd.setTitle("Choose record files");
fd.setFilenameFilter((dir, name) -> name.endsWith(".rrm")); fd.setFilenameFilter((dir, name) -> name.endsWith(".rrm"));
fd.setVisible(true); fd.setVisible(true);
File[] files = fd.getFiles(); File[] files = fd.getFiles();
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {
try { try {
Main.me.setNowRecord(Main.me.record_list.cloneRecord(file)); Main.me.setNowRecord(Main.me.record_list.cloneRecord(file));
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
}}).start(); }}).start();
}) })
.dimensions(width / 2 + 2, height / 2 - list_widget.getHeight() / 2 - 22, 180, 20) .dimensions(width / 2 + 2, height / 2 - list_widget.getHeight() / 2 - 22, 180, 20)
.tooltip(Tooltip.of(Text.translatable("text.repeating-mod.import_tooltip"))) .tooltip(Tooltip.of(Text.translatable("text.repeating-mod.import_tooltip")))
.build(); .build();
was_build = true; was_build = true;
updateButtons(); updateButtons();
addDrawableChild(loop_btn); addDrawableChild(loop_btn);
addDrawableChild(record_btn); addDrawableChild(record_btn);
addDrawableChild(import_btn); addDrawableChild(import_btn);
addDrawableChild(pos_delay_slider); addDrawableChild(pos_delay_slider);
} }
public <T extends Element & Drawable & Selectable> T addDrawableChild(T drawableElement) { public <T extends Element & Drawable & Selectable> T addDrawableChild(T drawableElement) {
return super.addDrawableChild(drawableElement); return super.addDrawableChild(drawableElement);
} }
public <T extends Drawable> T addDrawable(T drawable) { public <T extends Drawable> T addDrawable(T drawable) {
return super.addDrawable(drawable); return super.addDrawable(drawable);
} }
public <T extends Element & Selectable> T addSelectableChild(T child) { public <T extends Element & Selectable> T addSelectableChild(T child) {
return super.addSelectableChild(child); return super.addSelectableChild(child);
} }
public void remove(Element child) { public void remove(Element child) {
super.remove(child); super.remove(child);
} }
} }

View file

@ -1,95 +1,95 @@
package themixray.repeating.mod; package ru.themixray.repeating_mod;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public abstract class TickTask implements Runnable { public abstract class TickTask implements Runnable {
public static List<TickTask> tasks = new ArrayList<>(); public static List<TickTask> tasks = new ArrayList<>();
public static void tickTasks(TickAt at) { public static void tickTasks(TickAt at) {
for (TickTask t:new ArrayList<>(tasks)) for (TickTask t:new ArrayList<>(tasks))
if (t.getAt() == at) t.tick(); if (t.getAt() == at) t.tick();
} }
private long living; private long living;
private long delay; private long delay;
private boolean is_repeating; private boolean is_repeating;
private long period; private long period;
private boolean is_cancelled; private boolean is_cancelled;
private TickAt at; private TickAt at;
public enum TickAt { public enum TickAt {
CLIENT_HEAD, CLIENT_TAIL, CLIENT_HEAD, CLIENT_TAIL,
MOVEMENT_HEAD, MOVEMENT_TAIL, MOVEMENT_HEAD, MOVEMENT_TAIL,
RENDER_HEAD, RENDER_TAIL, RENDER_HEAD, RENDER_TAIL,
CLIENT_EVENT CLIENT_EVENT
} }
public TickTask(long delay, TickAt at) { public TickTask(long delay, TickAt at) {
this.is_cancelled = false; this.is_cancelled = false;
this.is_repeating = false; this.is_repeating = false;
this.delay = delay; this.delay = delay;
this.living = 0; this.living = 0;
this.period = 0; this.period = 0;
this.at = at; this.at = at;
tasks.add(this); tasks.add(this);
} }
public TickTask(long delay, long period, TickAt at) { public TickTask(long delay, long period, TickAt at) {
this.is_cancelled = false; this.is_cancelled = false;
this.is_repeating = true; this.is_repeating = true;
this.delay = delay; this.delay = delay;
this.period = period; this.period = period;
this.living = 0; this.living = 0;
this.at = at; this.at = at;
tasks.add(this); tasks.add(this);
} }
public TickTask(long delay) { public TickTask(long delay) {
this(delay,TickAt.CLIENT_HEAD); this(delay,TickAt.CLIENT_HEAD);
} }
public TickTask(long delay, long period) { public TickTask(long delay, long period) {
this(delay,period,TickAt.CLIENT_HEAD); this(delay,period,TickAt.CLIENT_HEAD);
} }
public void cancel() { public void cancel() {
if (!is_cancelled) { if (!is_cancelled) {
is_cancelled = true; is_cancelled = true;
tasks.remove(this); tasks.remove(this);
} }
} }
public boolean isCancelled() { public boolean isCancelled() {
return is_cancelled; return is_cancelled;
} }
public TickAt getAt() { public TickAt getAt() {
return at; return at;
} }
public void setDelay(long delay) { public void setDelay(long delay) {
if (is_repeating) { if (is_repeating) {
this.delay = delay; this.delay = delay;
} }
} }
public long getDelay() { public long getDelay() {
return this.delay; return this.delay;
} }
public void tick() { public void tick() {
if (living >= delay) { if (living >= delay) {
if (is_repeating) { if (is_repeating) {
delay = period; delay = period;
run(); run();
living = -1; living = -1;
} else { } else {
run(); run();
cancel(); cancel();
} }
} }
living++; living++;
} }
} }

View file

@ -1,6 +1,6 @@
package themixray.repeating.mod.event; package ru.themixray.repeating_mod.event;
import themixray.repeating.mod.event.events.*; import ru.themixray.repeating_mod.event.events.*;
public abstract class RecordEvent { public abstract class RecordEvent {
public abstract void replay(); public abstract void replay();

View file

@ -1,6 +1,6 @@
package themixray.repeating.mod.event; package ru.themixray.repeating_mod.event;
import themixray.repeating.mod.event.events.*; import ru.themixray.repeating_mod.event.events.*;
public enum RecordEventType { public enum RecordEventType {
BLOCK_BREAK('b',"block_break",BlockBreakEvent.class), BLOCK_BREAK('b',"block_break",BlockBreakEvent.class),

View file

@ -1,8 +1,8 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class BlockBreakEvent extends RecordEvent { public class BlockBreakEvent extends RecordEvent {
public BlockPos pos; public BlockPos pos;

View file

@ -1,12 +1,12 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class BlockInteractEvent extends RecordEvent { public class BlockInteractEvent extends RecordEvent {
public Hand hand; public Hand hand;
@ -19,7 +19,7 @@ public class BlockInteractEvent extends RecordEvent {
Double.parseDouble(a[0]), Double.parseDouble(a[0]),
Double.parseDouble(a[1]), Double.parseDouble(a[1]),
Double.parseDouble(a[2])), Double.parseDouble(a[2])),
Direction.byId(Integer.parseInt(a[4])), Direction.byIndex(Integer.parseInt(a[4])),
new BlockPos( new BlockPos(
Integer.parseInt(a[0]), Integer.parseInt(a[0]),
Integer.parseInt(a[1]), Integer.parseInt(a[1]),
@ -44,7 +44,7 @@ public class BlockInteractEvent extends RecordEvent {
String.valueOf(hitResult.getBlockPos().getY()), String.valueOf(hitResult.getBlockPos().getY()),
String.valueOf(hitResult.getBlockPos().getZ()), String.valueOf(hitResult.getBlockPos().getZ()),
(hitResult.isInsideBlock() ? "1" : "0"), (hitResult.isInsideBlock() ? "1" : "0"),
String.valueOf(hitResult.getSide().getId()), String.valueOf(hitResult.getSide().getIndex()),
hand.name() hand.name()
}; };
} }

View file

@ -1,6 +1,6 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class DelayEvent extends RecordEvent { public class DelayEvent extends RecordEvent {
public long delay; public long delay;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiCharTypeEvent extends RecordEvent { public class GuiCharTypeEvent extends RecordEvent {
private char chr; private char chr;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiCloseEvent extends RecordEvent { public class GuiCloseEvent extends RecordEvent {
public GuiCloseEvent() {} public GuiCloseEvent() {}

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiKeyPressEvent extends RecordEvent { public class GuiKeyPressEvent extends RecordEvent {
private int keyCode; private int keyCode;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiKeyReleaseEvent extends RecordEvent { public class GuiKeyReleaseEvent extends RecordEvent {
private int keyCode; private int keyCode;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiMouseClickEvent extends RecordEvent { public class GuiMouseClickEvent extends RecordEvent {
private double mouseX; private double mouseX;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiMouseDragEvent extends RecordEvent { public class GuiMouseDragEvent extends RecordEvent {
private double mouseX; private double mouseX;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiMouseMoveEvent extends RecordEvent { public class GuiMouseMoveEvent extends RecordEvent {
private double mouseX; private double mouseX;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiMouseReleaseEvent extends RecordEvent { public class GuiMouseReleaseEvent extends RecordEvent {
private double mouseX; private double mouseX;

View file

@ -1,7 +1,7 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class GuiMouseScrollEvent extends RecordEvent { public class GuiMouseScrollEvent extends RecordEvent {
private double mouseX; private double mouseX;
@ -16,7 +16,7 @@ public class GuiMouseScrollEvent extends RecordEvent {
public void replay() { public void replay() {
if (Main.client.currentScreen != null) { if (Main.client.currentScreen != null) {
Main.client.currentScreen.mouseScrolled(mouseX, mouseY, amount); // Main.client.currentScreen.mouseScrolled(mouseX, mouseY, amount);
} }
} }

View file

@ -0,0 +1,195 @@
package ru.themixray.repeating_mod.event.events;
import net.minecraft.client.input.Input;
import net.minecraft.util.PlayerInput;
import net.minecraft.util.math.Vec2f;
import ru.themixray.repeating_mod.Main;
import ru.themixray.repeating_mod.event.RecordEvent;
import java.lang.reflect.Field;
public class InputEvent extends RecordEvent {
public Boolean forward;
public Boolean backward;
public Boolean left;
public Boolean right;
public Boolean jump;
public Boolean sneak;
public Boolean sprint;
public float yaw;
public float head_yaw;
public float body_yaw;
public float pitch;
public float speed;
public float movementForward;
public float movementSideways;
public static InputEvent current() {
if (Main.client.player == null) return null;
return new InputEvent(
Main.client.player.input.playerInput.forward(),
Main.client.player.input.playerInput.backward(),
Main.client.player.input.playerInput.left(),
Main.client.player.input.playerInput.right(),
Main.client.player.input.playerInput.jump(),
Main.client.player.input.playerInput.sneak(),
Main.client.player.input.playerInput.sprint(),
Main.client.player.getHeadYaw(),
Main.client.player.getBodyYaw(),
Main.client.player.getPitch(),
Main.client.player.getYaw(),
Main.client.player.getMovementSpeed(),
Main.client.player.input.getMovementInput().y,
Main.client.player.input.getMovementInput().x
);
}
public InputEvent(Boolean forward,
Boolean backward,
Boolean left,
Boolean right,
Boolean jump,
Boolean sneak,
Boolean sprint,
float head_yaw,
float body_yaw,
float head_pitch,
float yaw,
float speed,
float movementForward,
float movementSideways) {
this.forward = forward;
this.backward = backward;
this.left = left;
this.right = right;
this.jump = jump;
this.sneak = sneak;
this.sprint = sprint;
this.head_yaw = head_yaw;
this.body_yaw = body_yaw;
this.pitch = head_pitch;
this.yaw = yaw;
this.speed = speed;
this.movementForward = movementForward;
this.movementSideways = movementSideways;
}
/**
* Returns differences of this InputEvent to the provided one, saving first booleans if differ and first floats always
*/
public InputEvent differs(InputEvent event) {
return new InputEvent(
forward == event.forward ? null : forward,
backward == event.backward ? null : backward,
left == event.left ? null : left,
right == event.right ? null : right,
jump == event.jump ? null : jump,
sneak == event.sneak ? null : sneak,
sprint == event.sprint ? null : sprint,
head_yaw,
body_yaw,
pitch,
yaw,
speed,
movementForward,
movementSideways
);
}
public static InputEvent deserialize(String[] a) {
return new InputEvent(
(a[0].equals("n") ? null : a[0].equals("1")),
(a[1].equals("n") ? null : a[1].equals("1")),
(a[2].equals("n") ? null : a[2].equals("1")),
(a[3].equals("n") ? null : a[3].equals("1")),
(a[4].equals("n") ? null : a[4].equals("1")),
(a[5].equals("n") ? null : a[5].equals("1")),
(a[6].equals("n") ? null : a[6].equals("1")),
Float.parseFloat(a[7]),
Float.parseFloat(a[8]),
Float.parseFloat(a[9]),
Float.parseFloat(a[10]),
Float.parseFloat(a[11]),
Float.parseFloat(a[12]),
Float.parseFloat(a[13])
);
}
protected String[] serializeArgs() {
return new String[] {
((forward == null) ? "n" : (forward ? "1" : "0")),
((backward == null) ? "n" : (backward ? "1" : "0")),
((left == null) ? "n" : (left ? "1" : "0")),
((right == null) ? "n" : (right ? "1" : "0")),
((jump == null) ? "n" : (jump ? "1" : "0")),
((sneak == null) ? "n" : (sneak ? "1" : "0")),
((sprint == null) ? "n" : (sprint ? "1" : "0")),
String.valueOf(head_yaw),
String.valueOf(body_yaw),
String.valueOf(pitch),
String.valueOf(yaw),
String.valueOf(speed),
String.valueOf(movementForward),
String.valueOf(movementSideways)
};
}
public boolean equals(InputEvent event) {
return event.forward == forward &&
event.backward == backward &&
event.sprint == sprint &&
event.jump == jump &&
event.sneak == sneak &&
event.left == left &&
event.right == right &&
event.speed == speed &&
event.head_yaw == head_yaw &&
event.body_yaw == body_yaw &&
event.yaw == yaw &&
event.pitch == pitch &&
event.movementForward == movementForward &&
event.movementSideways == movementSideways;
}
public void replay() {
Main.input_replay = this;
}
public void inputCallback() {
if (Main.client.player != null) {
if (sprint != null && Main.client.player.isSprinting() != sprint)
Main.client.player.setSprinting(sprint);
if (Main.client.player.getYaw() != yaw)
Main.client.player.setYaw(yaw);
if (Main.client.player.getHeadYaw() != head_yaw)
Main.client.player.setHeadYaw(head_yaw);
if (Main.client.player.getBodyYaw() != body_yaw)
Main.client.player.setBodyYaw(body_yaw);
if (Main.client.player.getPitch() != pitch)
Main.client.player.setPitch(pitch);
if (Main.client.player.getMovementSpeed() != speed)
Main.client.player.setMovementSpeed(speed);
try {
Field field = Input.class.getDeclaredField("movementVector");
field.setAccessible(true);
field.set(Main.client.player.input, new Vec2f(movementSideways, movementForward));
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
PlayerInput input = Main.client.player.input.playerInput;
Main.client.player.input.playerInput = new PlayerInput(
this.forward == null ? input.forward() : this.forward,
this.backward == null ? input.backward() : this.backward,
this.left == null ? input.left() : this.left,
this.right == null ? input.right() : this.right,
this.jump == null ? input.jump() : this.jump,
this.sneak == null ? input.sneak() : this.sneak,
this.sprint == null ? input.sprint() : this.sprint
);
}
}
}

View file

@ -1,15 +1,17 @@
package themixray.repeating.mod.event.events; package ru.themixray.repeating_mod.event.events;
import net.minecraft.entity.MovementType; import net.minecraft.entity.MovementType;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.RecordEvent; import ru.themixray.repeating_mod.event.RecordEvent;
public class MoveEvent extends RecordEvent { public class MoveEvent extends RecordEvent {
public Vec3d vec; public Vec3d vec;
public float yaw; public float yaw;
public float pitch; public float pitch;
public static final float MOVE_THRESHOLD = 0.001f;
public static MoveEvent deserialize(String[] a) { public static MoveEvent deserialize(String[] a) {
return new MoveEvent(new Vec3d( return new MoveEvent(new Vec3d(
Double.parseDouble(a[0]), Double.parseDouble(a[0]),
@ -29,9 +31,13 @@ public class MoveEvent extends RecordEvent {
if (Main.client.player != null) { if (Main.client.player != null) {
Vec3d p = Main.client.player.getPos(); Vec3d p = Main.client.player.getPos();
Vec3d v = new Vec3d(vec.getX() - p.getX(), vec.getY() - p.getY(), vec.getZ() - p.getZ()); Vec3d v = new Vec3d(vec.getX() - p.getX(), vec.getY() - p.getY(), vec.getZ() - p.getZ());
Main.client.player.move(MovementType.SELF, v); if (Math.abs(v.x) > MOVE_THRESHOLD || Math.abs(v.y) > MOVE_THRESHOLD || Math.abs(v.z) > MOVE_THRESHOLD)
Main.client.player.setYaw(yaw); Main.client.player.move(MovementType.SELF, v);
Main.client.player.setPitch(pitch);
if (Math.abs(Main.client.player.getYaw() - yaw) > MOVE_THRESHOLD)
Main.client.player.setYaw(yaw);
if (Math.abs(Main.client.player.getPitch() - pitch) > MOVE_THRESHOLD)
Main.client.player.setPitch(pitch);
} }
} }

View file

@ -1,24 +1,24 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.TickTask; import ru.themixray.repeating_mod.TickTask;
@Mixin(MinecraftClient.class) @Mixin(MinecraftClient.class)
public abstract class ClientMixin { public abstract class ClientMixin {
@Inject(at = @At(value = "HEAD"), method = "tick") @Inject(at = @At(value = "HEAD"), method = "tick")
private void onTickHead(CallbackInfo ci) { private void onTickHead(CallbackInfo ci) {
if (Main.me.is_recording) if (Main.me.is_recording)
Main.me.recordAllInput(); Main.me.recordAllInput();
TickTask.tickTasks(TickTask.TickAt.CLIENT_HEAD); TickTask.tickTasks(TickTask.TickAt.CLIENT_HEAD);
} }
@Inject(at = @At(value = "TAIL"), method = "tick") @Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(CallbackInfo ci) { private void onTickTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.CLIENT_TAIL); TickTask.tickTasks(TickTask.TickAt.CLIENT_TAIL);
} }
} }

View file

@ -1,31 +1,31 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import java.util.UUID; import java.util.UUID;
@Mixin(Entity.class) @Mixin(Entity.class)
public abstract class EntityMixin { public abstract class EntityMixin {
@Shadow public abstract UUID getUuid(); @Shadow public abstract UUID getUuid();
@Inject(at = @At(value = "HEAD"), method = "setSprinting", cancellable = true) @Inject(at = @At(value = "HEAD"), method = "setSprinting", cancellable = true)
private void onSprint(boolean sprinting,CallbackInfo ci) { private void onSprint(boolean sprinting,CallbackInfo ci) {
if (Main.client.player != null) { if (Main.client.player != null) {
if (getUuid().equals(Main.client.player.getUuid())) { if (getUuid().equals(Main.client.player.getUuid())) {
if (Main.me.is_replaying) { if (Main.me.is_replaying) {
if (Main.input_replay != null && if (Main.input_replay != null &&
Main.input_replay.sprinting != null && Main.input_replay.sprint != null &&
Main.input_replay.sprinting != sprinting) { Main.input_replay.sprint != sprinting) {
ci.cancel(); ci.cancel();
} }
} }
} }
} }
} }
} }

View file

@ -1,20 +1,20 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.client.input.KeyboardInput; import net.minecraft.client.input.KeyboardInput;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
@Mixin(KeyboardInput.class) @Mixin(KeyboardInput.class)
public abstract class InputMixin { public abstract class InputMixin {
@Inject(at = @At(value = "TAIL"), method = "tick") @Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(boolean slowDown, float f, CallbackInfo ci) { private void onTickTail(CallbackInfo ci) {
if (Main.me.is_replaying) { if (Main.me.is_replaying) {
if (Main.input_replay != null) { if (Main.input_replay != null) {
Main.input_replay.inputCallback(); Main.input_replay.inputCallback();
} }
} }
} }
} }

View file

@ -1,44 +1,44 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
import net.fabricmc.fabric.api.event.player.UseBlockCallback; import net.fabricmc.fabric.api.event.player.UseBlockCallback;
import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.hit.HitResult; import net.minecraft.util.hit.HitResult;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.event.events.BlockBreakEvent; import ru.themixray.repeating_mod.event.events.BlockBreakEvent;
import themixray.repeating.mod.event.events.BlockInteractEvent; import ru.themixray.repeating_mod.event.events.BlockInteractEvent;
import themixray.repeating.mod.TickTask; import ru.themixray.repeating_mod.TickTask;
@Mixin(ClientPlayerEntity.class) @Mixin(ClientPlayerEntity.class)
public abstract class MovementMixin { public abstract class MovementMixin {
@Inject(at = @At(value = "HEAD"), method = "init") @Inject(at = @At(value = "HEAD"), method = "init")
private void init(CallbackInfo ci) { private void init(CallbackInfo ci) {
PlayerBlockBreakEvents.AFTER.register((world, player, pos, blockState, blockEntity) -> { PlayerBlockBreakEvents.AFTER.register((world, player, pos, blockState, blockEntity) -> {
if (Main.me.is_recording) if (Main.me.is_recording)
Main.me.recordTick(new BlockBreakEvent(pos)); Main.me.recordTick(new BlockBreakEvent(pos));
}); });
UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> { UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> {
if (hitResult.getType().equals(HitResult.Type.BLOCK)) if (hitResult.getType().equals(HitResult.Type.BLOCK))
if (Main.me.is_recording) if (Main.me.is_recording)
Main.me.recordTick(new BlockInteractEvent(hand,hitResult)); Main.me.recordTick(new BlockInteractEvent(hand,hitResult));
return ActionResult.PASS; return ActionResult.PASS;
}); });
} }
@Inject(at = @At(value = "HEAD"), method = "tickMovement") @Inject(at = @At(value = "HEAD"), method = "tickMovement")
private void onMoveHead(CallbackInfo ci) { private void onMoveHead(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.MOVEMENT_HEAD); TickTask.tickTasks(TickTask.TickAt.MOVEMENT_HEAD);
} }
@Inject(at = @At(value = "TAIL"), method = "tick") @Inject(at = @At(value = "TAIL"), method = "tick")
private void onMoveTail(CallbackInfo ci) { private void onMoveTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.MOVEMENT_TAIL); TickTask.tickTasks(TickTask.TickAt.MOVEMENT_TAIL);
} }
} }

View file

@ -1,29 +1,29 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.listener.ServerPlayPacketListener; import net.minecraft.network.listener.ServerPlayPacketListener;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.time.Duration; import java.time.Duration;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
@Mixin(ClientPlayNetworkHandler.class) @Mixin(ClientPlayNetworkHandler.class)
public abstract class NetworkMixin { public abstract class NetworkMixin {
// @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V") // @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V")
// private void onSendPacket1Head(Packet<?> packet, // private void onSendPacket1Head(Packet<?> packet,
// CallbackInfo ci) { // CallbackInfo ci) {
// //
// } // }
// //
// @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;Ljava/util/function/BooleanSupplier;Ljava/time/Duration;)V") // @Inject(at = @At(value = "HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;Ljava/util/function/BooleanSupplier;Ljava/time/Duration;)V")
// private void onSendPacket2Head(Packet<ServerPlayPacketListener> packet, // private void onSendPacket2Head(Packet<ServerPlayPacketListener> packet,
// BooleanSupplier sendCondition, // BooleanSupplier sendCondition,
// Duration expirationTime, // Duration expirationTime,
// CallbackInfo ci) { // CallbackInfo ci) {
// //
// } // }
} }

View file

@ -1,18 +1,12 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.Entity;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import java.util.UUID;
@Mixin(ClientConnection.class) @Mixin(ClientConnection.class)
public abstract class PlayerMixin { public abstract class PlayerMixin {

View file

@ -1,21 +1,21 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.client.render.*; import net.minecraft.client.render.*;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.TickTask; import ru.themixray.repeating_mod.TickTask;
@Mixin(GameRenderer.class) @Mixin(GameRenderer.class)
public abstract class RendererMixin { public abstract class RendererMixin {
@Inject(at = @At(value = "HEAD"), method = "tick") @Inject(at = @At(value = "HEAD"), method = "tick")
private void onTickHead(CallbackInfo ci) { private void onTickHead(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.RENDER_HEAD); TickTask.tickTasks(TickTask.TickAt.RENDER_HEAD);
} }
@Inject(at = @At(value = "TAIL"), method = "tick") @Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(CallbackInfo ci) { private void onTickTail(CallbackInfo ci) {
TickTask.tickTasks(TickTask.TickAt.RENDER_TAIL); TickTask.tickTasks(TickTask.TickAt.RENDER_TAIL);
} }
} }

View file

@ -1,20 +1,15 @@
package themixray.repeating.mod.mixin; package ru.themixray.repeating_mod.mixin;
import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.AbstractParentElement;
import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.ParentElement;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.GameRenderer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.TickTask; import ru.themixray.repeating_mod.event.events.*;
import themixray.repeating.mod.event.events.*;
@Mixin(Screen.class) @Mixin(Screen.class)
public abstract class ScreenMixin extends AbstractParentElement implements Drawable { public abstract class ScreenMixin extends AbstractParentElement implements Drawable {
@ -80,11 +75,11 @@ public abstract class ScreenMixin extends AbstractParentElement implements Drawa
return super.mouseReleased(mouseX, mouseY, button); return super.mouseReleased(mouseX, mouseY, button);
} }
@Override // @Override
public boolean mouseScrolled(double mouseX, double mouseY, double amount) { // public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
if (Main.me.is_recording) { // if (Main.me.is_recording) {
// Main.me.now_record.addEvent(new GuiMouseScrollEvent(mouseX, mouseY, amount)); //// Main.me.now_record.addEvent(new GuiMouseScrollEvent(mouseX, mouseY, amount));
} // }
return super.mouseScrolled(mouseX, mouseY, amount); // return super.mouseScrolled(mouseX, mouseY, amount);
} // }
} }

View file

@ -1,10 +1,10 @@
package themixray.repeating.mod.render; package ru.themixray.repeating_mod.render;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.minecraft.util.math.Vec3d; import org.joml.Vector3f;
import themixray.repeating.mod.render.buffer.WorldBuffer; import ru.themixray.repeating_mod.render.buffer.WorldBuffer;
import themixray.repeating.mod.render.shader.ShaderManager; import ru.themixray.repeating_mod.render.shader.ShaderManager;
import java.awt.*; import java.awt.*;
@ -27,8 +27,8 @@ public class RenderHelper {
} }
public void drawLine(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, Color color) { public void drawLine(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, Color color) {
buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); buffer.vert(new Vector3f(x1, y1, z1), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); buffer.vert(new Vector3f(x2, y2, z2), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
} }
public static WorldBuffer startTri(WorldRenderContext context) { public static WorldBuffer startTri(WorldRenderContext context) {
@ -49,9 +49,9 @@ public class RenderHelper {
} }
public void drawTri(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, Color color) { public void drawTri(WorldBuffer buffer, float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, Color color) {
buffer.vert(x1, y1, z1, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); buffer.vert(new Vector3f(x1, y1, z1), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x2, y2, z2, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); buffer.vert(new Vector3f(x2, y2, z2), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
buffer.vert(x3, y3, z3, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); buffer.vert(new Vector3f(x3, y3, z3), color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
} }
public static void drawRectFromTri(WorldBuffer buffer, public static void drawRectFromTri(WorldBuffer buffer,

View file

@ -1,8 +1,8 @@
package themixray.repeating.mod.render; package ru.themixray.repeating_mod.render;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import themixray.repeating.mod.render.buffer.BufferManager; import ru.themixray.repeating_mod.render.buffer.BufferManager;
import themixray.repeating.mod.render.shader.ShaderManager; import ru.themixray.repeating_mod.render.shader.ShaderManager;
@UtilityClass @UtilityClass
public class RenderSystem { public class RenderSystem {

View file

@ -1,4 +1,4 @@
package themixray.repeating.mod.render.buffer; package ru.themixray.repeating_mod.render.buffer;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;

View file

@ -1,14 +1,11 @@
package themixray.repeating.mod.render.buffer; package ru.themixray.repeating_mod.render.buffer;
import lombok.Getter; import lombok.Getter;
import org.joml.Vector3f;
public class Vertex { public class Vertex {
@Getter @Getter
private float x; private Vector3f pos;
@Getter
private float y;
@Getter
private float z;
@Getter @Getter
private float r; private float r;
@Getter @Getter
@ -18,10 +15,8 @@ public class Vertex {
@Getter @Getter
private float a; private float a;
public Vertex(float x, float y, float z, float r, float g, float b, float a) { public Vertex(Vector3f pos, float r, float g, float b, float a) {
this.x = x; this.pos = pos;
this.y = y;
this.z = z;
this.r = r; this.r = r;
this.g = g; this.g = g;
this.b = b; this.b = b;

View file

@ -1,11 +1,12 @@
package themixray.repeating.mod.render.buffer; package ru.themixray.repeating_mod.render.buffer;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.minecraft.util.math.Vec3d;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.joml.Matrix4f; import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import themixray.repeating.mod.render.shader.Shader; import ru.themixray.repeating_mod.render.shader.Shader;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.util.ArrayList; import java.util.ArrayList;
@ -18,17 +19,19 @@ public class WorldBuffer {
private final int drawMode; private final int drawMode;
private final Shader shader; private final Shader shader;
private FloatBuffer projectionMatrix; private FloatBuffer projectionMatrix;
private final Vec3d cameraPos; private final Vector3f cameraPos;
private final Quaternionf cameraRot;
public WorldBuffer(int drawMode, Shader shader, WorldRenderContext worldRenderContext) { public WorldBuffer(int drawMode, Shader shader, WorldRenderContext worldRenderContext) {
this.drawMode = drawMode; this.drawMode = drawMode;
this.shader = shader; this.shader = shader;
this.cameraPos = worldRenderContext.camera().getPos(); this.cameraPos = worldRenderContext.camera().getPos().toVector3f();
makeProjectionMatrix(worldRenderContext.projectionMatrix(), worldRenderContext.matrixStack().peek().getPositionMatrix()); this.cameraRot = worldRenderContext.camera().getRotation().invert();
this.projectionMatrix = worldRenderContext.projectionMatrix().mul(worldRenderContext.matrixStack().peek().getPositionMatrix()).get(BufferUtils.createFloatBuffer(16));
} }
public void vert(float x, float y, float z, float r, float g, float b, float a) { public void vert(Vector3f pos, float r, float g, float b, float a) {
vertices.add(new Vertex(x - (float) cameraPos.x, y - (float) cameraPos.y, z - (float) cameraPos.z, r, g, b, a)); vertices.add(new Vertex(cameraRot.transform(pos.sub(cameraPos)), r, g, b, a));
} }
public void draw() { public void draw() {
@ -36,7 +39,7 @@ public class WorldBuffer {
BufferManager.bindBuffer(); BufferManager.bindBuffer();
BufferManager.writeBuffer(getBuffer()); BufferManager.writeBuffer(getBuffer());
applyProjectionMatrix(); shader.uniformMatrix4f("u_projection", projectionMatrix);
glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0); glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
@ -55,12 +58,12 @@ public class WorldBuffer {
private FloatBuffer getBuffer() { private FloatBuffer getBuffer() {
FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(vertices.size() * 7); FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(vertices.size() * 7);
ArrayList<Float> floats = new ArrayList<>(); ArrayList<Float> floats = new ArrayList<>();
for (Vertex vertex : vertices) { for (ru.themixray.repeating_mod.render.buffer.Vertex vertex : vertices) {
floats.add(vertex.getX()); floats.add(vertex.getPos().x);
floats.add(vertex.getY()); floats.add(vertex.getPos().y);
floats.add(vertex.getZ()); floats.add(vertex.getPos().z);
} }
for (Vertex vertex : vertices) { for (ru.themixray.repeating_mod.render.buffer.Vertex vertex : vertices) {
floats.add(vertex.getR()); floats.add(vertex.getR());
floats.add(vertex.getG()); floats.add(vertex.getG());
floats.add(vertex.getB()); floats.add(vertex.getB());
@ -71,12 +74,4 @@ public class WorldBuffer {
floatBuffer.put(ArrayUtils.toPrimitive(floatArray)); floatBuffer.put(ArrayUtils.toPrimitive(floatArray));
return floatBuffer.flip(); return floatBuffer.flip();
} }
private void makeProjectionMatrix(Matrix4f projectionMatrix, Matrix4f viewModelMatrix) {
this.projectionMatrix = projectionMatrix.mul(viewModelMatrix).get(BufferUtils.createFloatBuffer(16));
}
private void applyProjectionMatrix() {
shader.uniformMatrix4f("u_projection", projectionMatrix);
}
} }

View file

@ -1,4 +1,4 @@
package themixray.repeating.mod.render.shader; package ru.themixray.repeating_mod.render.shader;
import lombok.Getter; import lombok.Getter;
@ -12,8 +12,8 @@ public class Shader {
public Shader(String name) { public Shader(String name) {
int v = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.VERTEX); int v = ru.themixray.repeating_mod.render.shader.ShaderManager.loadShaderProgram(name, ru.themixray.repeating_mod.render.shader.ShaderManager.ShaderType.VERTEX);
int f = ShaderManager.loadShaderProgram(name, ShaderManager.ShaderType.FRAGMENT); int f = ru.themixray.repeating_mod.render.shader.ShaderManager.loadShaderProgram(name, ru.themixray.repeating_mod.render.shader.ShaderManager.ShaderType.FRAGMENT);
this.id = glCreateProgram(); this.id = glCreateProgram();
glAttachShader(id, v); glAttachShader(id, v);
glAttachShader(id, f); glAttachShader(id, f);

View file

@ -1,6 +1,6 @@
package themixray.repeating.mod.render.shader; package ru.themixray.repeating_mod.render.shader;
import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.platform.TextureUtil; import com.mojang.blaze3d.platform.TextureUtil;
import lombok.Getter; import lombok.Getter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@ -27,21 +27,21 @@ import static org.lwjgl.opengl.GL33.*;
@UtilityClass @UtilityClass
public class ShaderManager { public class ShaderManager {
@Getter @Getter
private Shader positionColorShader; private ru.themixray.repeating_mod.render.shader.Shader positionColorShader;
public void init() { public void init() {
ClientLifecycleEvents.CLIENT_STARTED.register(client -> loadShaders()); ClientLifecycleEvents.CLIENT_STARTED.register(client -> loadShaders());
} }
private void loadShaders() { private void loadShaders() {
positionColorShader = new Shader("position_color"); positionColorShader = new ru.themixray.repeating_mod.render.shader.Shader("position_color");
} }
public int loadShaderProgram(String name, ShaderType type) { public int loadShaderProgram(String name, ShaderType type) {
try { try {
boolean file_present = true; boolean file_present = true;
ResourceFactory resourceFactory = MinecraftClient.getInstance().getResourceManager(); ResourceFactory resourceFactory = MinecraftClient.getInstance().getResourceManager();
Optional<Resource> resource = resourceFactory.getResource(new Identifier("renderer", "shader/" + name + type.fileExtension)); Optional<Resource> resource = resourceFactory.getResource(Identifier.of("renderer", "shader/" + name + type.fileExtension));
int i = glCreateShader(type.glType); int i = glCreateShader(type.glType);
if (resource.isPresent()) { if (resource.isPresent()) {
GlStateManager.glShaderSource(i, new GlImportProcessor() { GlStateManager.glShaderSource(i, new GlImportProcessor() {
@ -51,7 +51,7 @@ public class ShaderManager {
public String loadImport(boolean inline, String name) { public String loadImport(boolean inline, String name) {
return IOUtils.toString(resource.get().getInputStream(), StandardCharsets.UTF_8); return IOUtils.toString(resource.get().getInputStream(), StandardCharsets.UTF_8);
} }
}.readSource(readResourceAsString(resource.get().getInputStream()))); }.readSource(readResourceAsString(resource.get().getInputStream())).getFirst());
} else file_present = false; } else file_present = false;
glCompileShader(i); glCompileShader(i);
if (glGetShaderi(i, GL_COMPILE_STATUS) == 0 || !file_present) { if (glGetShaderi(i, GL_COMPILE_STATUS) == 0 || !file_present) {

View file

@ -1,22 +1,14 @@
package themixray.repeating.mod.widget; package ru.themixray.repeating_mod.widget;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.*; import net.minecraft.client.gui.widget.*;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.RecordState; import ru.themixray.repeating_mod.RecordState;
import themixray.repeating.mod.RepeatingScreen; import ru.themixray.repeating_mod.RepeatingScreen;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
import java.util.function.Consumer;
public class RecordListWidget extends ScrollableWidget { public class RecordListWidget extends ScrollableWidget {
private LinkedList<RecordWidget> widgets = new LinkedList<>(); private LinkedList<RecordWidget> widgets = new LinkedList<>();
@ -34,27 +26,40 @@ public class RecordListWidget extends ScrollableWidget {
return res; return res;
} }
@Override
protected int getContentsHeightWithPadding() {
return !widgets.isEmpty() ? widgets.size() * 55 + (widgets.size() - 1) * 2 : 0;
}
@Override @Override
protected double getDeltaYPerScroll() { protected double getDeltaYPerScroll() {
return 10; return 10;
} }
@Override @Override
protected void renderContents(DrawContext ctx, int mouseX, int mouseY, float delta) { protected void renderWidget(DrawContext ctx, int mouseX, int mouseY, float delta) {
int y = 0; ctx.fill(this.getX(), this.getY(), this.getX() + this.getWidth(), this.getY() + this.getHeight(), 0xff000000);
ctx.enableScissor(this.getX(), this.getY(), this.getX() + this.getWidth(), this.getY() + this.getHeight());
int y = (int) -this.getScrollY();
for (RecordWidget wid: widgets) { for (RecordWidget wid: widgets) {
wid.setY(y); wid.setY(y);
wid.render(ctx, mouseX, (int) (mouseY + this.getScrollY()), delta); wid.render(ctx, mouseX, (int) (mouseY), delta);
y += wid.getHeight(); y += wid.getHeight();
y += 2; y += 2;
} }
ctx.disableScissor();
this.drawScrollbar(ctx);
} }
public void addWidget(RecordState record) { public void addWidget(RecordState record) {
RecordWidget widget = new RecordWidget(0, 0, width, 55, record, this); RecordWidget widget = new RecordWidget(0, 0, width - 6, 55, record, this);
widget.init(null); widget.init(null);
widgets.add(0, widget); widgets.addFirst(widget);
} }
public void removeWidget(RecordState record) { public void removeWidget(RecordState record) {
@ -71,11 +76,6 @@ public class RecordListWidget extends ScrollableWidget {
return focused; return focused;
} }
@Override
protected int getContentsHeight() {
return !widgets.isEmpty() ? widgets.size() * 55 + (widgets.size() - 1) * 2 : 0;
}
public void init(RepeatingScreen screen) { public void init(RepeatingScreen screen) {
for (RecordWidget widget : widgets) { for (RecordWidget widget : widgets) {
widget.init(screen); widget.init(screen);
@ -133,7 +133,7 @@ public class RecordListWidget extends ScrollableWidget {
@Override @Override
public boolean mouseClicked(double mouseX, double mouseY, int button) { public boolean mouseClicked(double mouseX, double mouseY, int button) {
return checkTransportNF(mouseX, mouseY + getScrollY(), button) || super.mouseClicked(mouseX, mouseY, button); return checkTransportNF(mouseX, mouseY, button) || super.checkScrollbarDragged(mouseX, mouseY, button);
} }
@Override @Override

View file

@ -1,17 +1,15 @@
package themixray.repeating.mod.widget; package ru.themixray.repeating_mod.widget;
import lombok.Getter;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.tooltip.Tooltip;
import net.minecraft.client.gui.widget.*; import net.minecraft.client.gui.widget.*;
import net.minecraft.text.Style;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.text.TextColor;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import themixray.repeating.mod.Main; import ru.themixray.repeating_mod.Main;
import themixray.repeating.mod.RecordState; import ru.themixray.repeating_mod.RecordState;
import themixray.repeating.mod.RenderListener; import ru.themixray.repeating_mod.RepeatingScreen;
import themixray.repeating.mod.RepeatingScreen;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
@ -21,6 +19,7 @@ import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
public class RecordWidget implements Drawable, Widget { public class RecordWidget implements Drawable, Widget {
@Getter
private RecordState record; private RecordState record;
private List<ClickableWidget> children; private List<ClickableWidget> children;
@ -134,7 +133,8 @@ public class RecordWidget implements Drawable, Widget {
children.add(export_button); children.add(export_button);
ButtonWidget replay_button = ButtonWidget.builder(Text.translatable("text.repeating-mod.start"), (i) -> { ButtonWidget replay_button = ButtonWidget.builder(Text.translatable("text.repeating-mod." +
(getRecord().equals(Main.me.now_record) && Main.me.is_replaying ? "stop" : "start")), (i) -> {
if (Main.me.is_replaying) { if (Main.me.is_replaying) {
Main.me.stopReplay(); Main.me.stopReplay();
if (getRecord().equals(Main.me.now_record)) { if (getRecord().equals(Main.me.now_record)) {
@ -143,7 +143,7 @@ public class RecordWidget implements Drawable, Widget {
} }
i.setMessage(Text.translatable("text.repeating-mod.stop")); i.setMessage(Text.translatable("text.repeating-mod.stop"));
Main.me.now_record = record; Main.me.now_record = getRecord();
Main.me.startReplay(); Main.me.startReplay();
Main.client.setScreen(null); Main.client.setScreen(null);
}).dimensions(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 28, 65, 13) }).dimensions(parent.getX() + getX() + 110,parent.getY() + getY() + 4 + 28, 65, 13)
@ -152,22 +152,13 @@ public class RecordWidget implements Drawable, Widget {
children.add(replay_button); children.add(replay_button);
} }
public RecordState getRecord() { public void drawText(int x, int y, DrawContext ctx, List<Text> lines, int line_height, boolean shadow) {
return record;
}
public void drawText(int x, int y, DrawContext ctx, List<Text> lines, float size, int line_height, boolean shadow) {
ctx.getMatrices().push();
ctx.getMatrices().scale(size, size, size);
int now_y = y; int now_y = y;
for (Text line : lines) { for (Text line : lines) {
ctx.drawText(Main.client.textRenderer, line, (int) (x / size), (int) (now_y / size), line.getStyle().getColor().getRgb(), shadow); ctx.drawText(Main.client.textRenderer, line, x, now_y, 0xff000000 + line.getStyle().getColor().getRgb(), shadow);
now_y += line_height; now_y += line_height;
} }
ctx.getMatrices().pop();
} }
@Override @Override
@ -192,7 +183,7 @@ public class RecordWidget implements Drawable, Widget {
.append(": ") .append(": ")
.styled((s) -> s.withColor(0xbbbbbb)), .styled((s) -> s.withColor(0xbbbbbb)),
Text.literal(record.getAuthor()).styled((s) -> s.withColor(0xffffff)) Text.literal(record.getAuthor()).styled((s) -> s.withColor(0xffffff))
), 1, ),
9, 9,
false); false);

View file

@ -1,103 +0,0 @@
package themixray.repeating.mod;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.io.File;
public class EasyConfig {
public final Path path;
public final File file;
public Map<String,String> data;
public EasyConfig(File f, Map<String,String> def) {
this.path = f.toPath();
this.file = f;
this.data = new HashMap<>();
if (!file.exists()) {
try {
file.createNewFile();
write(def);
} catch (IOException e) {
e.printStackTrace();
}
}
reload();
for (Map.Entry<String,String> m:def.entrySet())
if (!data.containsKey(m.getKey()))
data.put(m.getKey(),m.getValue());
save();
}
public EasyConfig(Path f, Map<String,String> def) {
this(f.toFile(),def);
}
public EasyConfig(String parent,String child,Map<String,String> def) {
this(new File(parent,child),def);
}
public EasyConfig(File parent,String child,Map<String,String> def) {
this(new File(parent,child),def);
}
public EasyConfig(Path parent,String child,Map<String,String> def) {
this(new File(parent.toFile(),child),def);
}
public EasyConfig(File f) {
this(f,new HashMap<>());
}
public EasyConfig(Path path) {
this(path.toFile(),new HashMap<>());
}
public EasyConfig(String parent,String child) {
this(new File(parent,child),new HashMap<>());
}
public EasyConfig(File parent,String child) {
this(new File(parent,child),new HashMap<>());
}
public EasyConfig(Path parent,String child) {
this(new File(parent.toFile(),child),new HashMap<>());
}
public void reload() {
data = read();
}
public void save() {
write(data);
}
private String toText(Map<String,String> p) {
StringBuilder t = new StringBuilder();
for (Map.Entry<String,String> e:p.entrySet())
t.append(e.getKey()).append("=").append(e.getValue()).append("\n");
return t.toString();
}
private Map<String,String> toMap(String j) {
Map<String,String> m = new HashMap<>();
for (String l:j.split("\n")) {
String s[] = l.split("=");
m.put(s[0],s[1]);
}
return m;
}
private Map<String,String> read() {
try {
return toMap(Files.readString(path));
} catch (IOException e) {
e.printStackTrace();
}
return new HashMap<>();
}
private void write(Map<String,String> p) {
try {
Files.write(path, toText(p).getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}

View file

@ -1,11 +0,0 @@
package themixray.repeating.mod;
import net.minecraft.client.gui.DrawContext;
public interface RenderListener {
default boolean beforeRender() {
return true;
}
void render(DrawContext context, int mouseX, int mouseY, float delta);
}

View file

@ -1,150 +0,0 @@
package themixray.repeating.mod.event.events;
import themixray.repeating.mod.Main;
import themixray.repeating.mod.event.RecordEvent;
public class InputEvent extends RecordEvent {
public Boolean sneaking;
public Boolean jumping;
public Boolean pressingForward;
public Boolean pressingBack;
public Boolean pressingLeft;
public Boolean pressingRight;
public Boolean sprinting;
public Float movementSideways;
public Float movementForward;
public float yaw;
public float head_yaw;
public float body_yaw;
public float pitch;
public float speed;
public InputEvent(Boolean sneaking,
Boolean jumping,
Float movementSideways,
Float movementForward,
Boolean pressingForward,
Boolean pressingBack,
Boolean pressingLeft,
Boolean pressingRight,
float head_yaw,
float body_yaw,
float head_pitch,
Boolean sprinting,
float yaw,
float speed) {
this.sneaking = sneaking;
this.jumping = jumping;
this.movementSideways = movementSideways;
this.movementForward = movementForward;
this.pressingForward = pressingForward;
this.pressingBack = pressingBack;
this.pressingLeft = pressingLeft;
this.pressingRight = pressingRight;
this.head_yaw = head_yaw;
this.body_yaw = body_yaw;
this.pitch = head_pitch;
this.sprinting = sprinting;
this.yaw = yaw;
this.speed = speed;
}
public static InputEvent deserialize(String[] a) {
return new InputEvent(
(a[0].equals("n") ? null : a[0].equals("1")),
(a[1].equals("n") ? null : a[1].equals("1")),
(a[2].equals("n") ? null : Float.parseFloat(a[2])),
(a[3].equals("n") ? null : Float.parseFloat(a[3])),
(a[4].equals("n") ? null : a[4].equals("1")),
(a[5].equals("n") ? null : a[5].equals("1")),
(a[6].equals("n") ? null : a[6].equals("1")),
(a[7].equals("n") ? null : a[7].equals("1")),
Float.parseFloat(a[8]), Float.parseFloat(a[9]),
Float.parseFloat(a[10]),
(a[11].equals("n") ? null : a[11].equals("1")),
Float.parseFloat(a[12]),
Float.parseFloat(a[13]));
}
protected String[] serializeArgs() {
return new String[] {
((sneaking == null) ? "n" : (sneaking ? "1" : "0")), // sneaking
((jumping == null) ? "n" : (jumping ? "1" : "0")), // jumping
((movementSideways == null) ? "n" : String.valueOf(movementSideways)), // movement sideways
((movementForward == null) ? "n" : String.valueOf(movementForward)), // movement forward
((pressingForward == null) ? "n" : (pressingForward ? "1" : "0")), // pressing forward
((pressingBack == null) ? "n" : (pressingBack ? "1" : "0")), // pressing back
((pressingLeft == null) ? "n" : (pressingLeft ? "1" : "0")), // pressing left
((pressingRight == null) ? "n" : (pressingRight ? "1" : "0")), // pressing right
String.valueOf(head_yaw), // head yaw
String.valueOf(body_yaw), // body yaw
String.valueOf(pitch), // pitch
((sprinting == null) ? "n" : (sprinting ? "1" : "0")), // sprinting
String.valueOf(yaw), // yaw
String.valueOf(speed) // speed
};
}
public void fillEmpty(InputEvent e) {
if (sneaking == null) sneaking = e.sneaking;
if (jumping == null) jumping = e.jumping;
if (movementSideways == null) movementSideways = e.movementSideways;
if (movementForward == null) movementForward = e.movementForward;
if (pressingForward == null) pressingForward = e.pressingForward;
if (pressingBack == null) pressingBack = e.pressingBack;
if (pressingLeft == null) pressingLeft = e.pressingLeft;
if (pressingRight == null) pressingRight = e.pressingRight;
if (sprinting == null) sprinting = e.sprinting;
}
public boolean isEmpty() {
return sneaking == null &&
jumping == null &&
movementSideways == null &&
movementForward == null &&
pressingForward == null &&
pressingBack == null &&
pressingLeft == null &&
pressingRight == null &&
sprinting == null;
}
public void replay() {
Main.input_replay = this;
}
public void inputCallback() {
if (Main.client.player != null) {
if (sprinting != null && Main.client.player.isSprinting() != sprinting)
Main.client.player.setSprinting(sprinting);
if (Main.client.player.getYaw() != yaw)
Main.client.player.setYaw(yaw);
if (Main.client.player.getHeadYaw() != head_yaw)
Main.client.player.setHeadYaw(head_yaw);
if (Main.client.player.getBodyYaw() != body_yaw)
Main.client.player.setBodyYaw(body_yaw);
if (Main.client.player.getPitch() != pitch)
Main.client.player.setPitch(pitch);
if (Main.client.player.getMovementSpeed() != speed)
Main.client.player.setMovementSpeed(speed);
if (sneaking != null && Main.client.player.input.sneaking != sneaking)
Main.client.player.input.sneaking = sneaking;
if (jumping != null && Main.client.player.input.jumping != jumping)
Main.client.player.input.jumping = jumping;
if (movementSideways != null && Main.client.player.input.movementSideways != movementSideways)
Main.client.player.input.movementSideways = movementSideways;
if (movementForward != null && Main.client.player.input.movementForward != movementForward)
Main.client.player.input.movementForward = movementForward;
if (pressingForward != null && Main.client.player.input.pressingForward != pressingForward)
Main.client.player.input.pressingForward = pressingForward;
if (pressingBack != null && Main.client.player.input.pressingBack != pressingBack)
Main.client.player.input.pressingBack = pressingBack;
if (pressingLeft != null && Main.client.player.input.pressingLeft != pressingLeft)
Main.client.player.input.pressingLeft = pressingLeft;
if (pressingRight != null && Main.client.player.input.pressingRight != pressingRight)
Main.client.player.input.pressingRight = pressingRight;
}
}
}

View file

@ -1,31 +0,0 @@
package themixray.repeating.mod.mixin;
import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main;
import java.util.UUID;
@Mixin(Entity.class)
public abstract class EntityMixin {
@Shadow public abstract UUID getUuid();
@Inject(at = @At(value = "HEAD"), method = "setSprinting", cancellable = true)
private void onSprint(boolean sprinting,CallbackInfo ci) {
if (Main.client.player != null) {
if (getUuid().equals(Main.client.player.getUuid())) {
if (Main.me.is_replaying) {
if (Main.input_replay != null &&
Main.input_replay.sprinting != null &&
Main.input_replay.sprinting != sprinting) {
ci.cancel();
}
}
}
}
}
}

View file

@ -1,20 +0,0 @@
package themixray.repeating.mod.mixin;
import net.minecraft.client.input.KeyboardInput;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import themixray.repeating.mod.Main;
@Mixin(KeyboardInput.class)
public abstract class InputMixin {
@Inject(at = @At(value = "TAIL"), method = "tick")
private void onTickTail(boolean slowDown, float f, CallbackInfo ci) {
if (Main.me.is_replaying) {
if (Main.input_replay != null) {
Main.input_replay.inputCallback();
}
}
}
}

View file

@ -1,48 +0,0 @@
package themixray.repeating.mod.render.buffer;
import lombok.experimental.UtilityClass;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import java.nio.FloatBuffer;
import static org.lwjgl.opengl.GL33.*;
@UtilityClass
public class BufferManager {
private int vao;
private int vbo;
private int prevVao;
public void init() {
ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
vao = glGenVertexArrays();
vbo = glGenBuffers();
});
}
public static void bindBuffer() {
glBindBuffer(GL_ARRAY_BUFFER, vbo);
}
public static void unbindBuffer() {
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
public static void writeBuffer(FloatBuffer buffer) {
glBufferData(GL_ARRAY_BUFFER, buffer, GL_STATIC_DRAW);
}
public static void draw(int drawMode, int verts) {
glDrawArrays(drawMode, 0, verts);
}
public static void bind() {
prevVao = glGetInteger(GL_VERTEX_ARRAY_BINDING);
glBindVertexArray(vao);
}
public static void unbind() {
glBindVertexArray(prevVao);
}
}

View file

@ -1,82 +0,0 @@
package themixray.repeating.mod.render.buffer;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.minecraft.util.math.Vec3d;
import org.apache.commons.lang3.ArrayUtils;
import org.joml.Matrix4f;
import org.lwjgl.BufferUtils;
import themixray.repeating.mod.render.shader.Shader;
import java.nio.FloatBuffer;
import java.util.ArrayList;
import java.util.List;
import static org.lwjgl.opengl.GL33.*;
public class WorldBuffer {
private final List<Vertex> vertices = new ArrayList<>();
private final int drawMode;
private final Shader shader;
private FloatBuffer projectionMatrix;
private final Vec3d cameraPos;
public WorldBuffer(int drawMode, Shader shader, WorldRenderContext worldRenderContext) {
this.drawMode = drawMode;
this.shader = shader;
this.cameraPos = worldRenderContext.camera().getPos();
makeProjectionMatrix(worldRenderContext.projectionMatrix(), worldRenderContext.matrixStack().peek().getPositionMatrix());
}
public void vert(float x, float y, float z, float r, float g, float b, float a) {
vertices.add(new Vertex(x - (float) cameraPos.x, y - (float) cameraPos.y, z - (float) cameraPos.z, r, g, b, a));
}
public void draw() {
BufferManager.bind();
BufferManager.bindBuffer();
BufferManager.writeBuffer(getBuffer());
applyProjectionMatrix();
glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
glEnableVertexAttribArray(0);
glVertexAttribPointer(1, 4, GL_FLOAT, false, 0, vertices.size() * 3 * 4L);
glEnableVertexAttribArray(1);
BufferManager.unbindBuffer();
shader.bind();
BufferManager.draw(drawMode, this.vertices.size());
shader.unbind();
BufferManager.unbind();
}
private FloatBuffer getBuffer() {
FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(vertices.size() * 7);
ArrayList<Float> floats = new ArrayList<>();
for (Vertex vertex : vertices) {
floats.add(vertex.getX());
floats.add(vertex.getY());
floats.add(vertex.getZ());
}
for (Vertex vertex : vertices) {
floats.add(vertex.getR());
floats.add(vertex.getG());
floats.add(vertex.getB());
floats.add(vertex.getA());
}
Float[] floatArray = new Float[floats.size()];
floats.toArray(floatArray);
floatBuffer.put(ArrayUtils.toPrimitive(floatArray));
return floatBuffer.flip();
}
private void makeProjectionMatrix(Matrix4f projectionMatrix, Matrix4f viewModelMatrix) {
this.projectionMatrix = projectionMatrix.mul(viewModelMatrix).get(BufferUtils.createFloatBuffer(16));
}
private void applyProjectionMatrix() {
shader.uniformMatrix4f("u_projection", projectionMatrix);
}
}

View file

@ -1,97 +0,0 @@
package themixray.repeating.mod.render.shader;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.platform.TextureUtil;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.GlImportProcessor;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceFactory;
import net.minecraft.util.Identifier;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.system.MemoryUtil;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
import static org.lwjgl.opengl.GL33.*;
@UtilityClass
public class ShaderManager {
@Getter
private Shader positionColorShader;
public void init() {
ClientLifecycleEvents.CLIENT_STARTED.register(client -> loadShaders());
}
private void loadShaders() {
positionColorShader = new Shader("position_color");
}
public int loadShaderProgram(String name, ShaderType type) {
try {
boolean file_present = true;
ResourceFactory resourceFactory = MinecraftClient.getInstance().getResourceManager();
Optional<Resource> resource = resourceFactory.getResource(new Identifier("renderer", "shader/" + name + type.fileExtension));
int i = glCreateShader(type.glType);
if (resource.isPresent()) {
GlStateManager.glShaderSource(i, new GlImportProcessor() {
@SneakyThrows
@Nullable
@Override
public String loadImport(boolean inline, String name) {
return IOUtils.toString(resource.get().getInputStream(), StandardCharsets.UTF_8);
}
}.readSource(readResourceAsString(resource.get().getInputStream())));
} else file_present = false;
glCompileShader(i);
if (glGetShaderi(i, GL_COMPILE_STATUS) == 0 || !file_present) {
String shaderInfo = StringUtils.trim(glGetShaderInfoLog(i, 32768));
throw new IOException("Couldn't compile " + type.name + " program (" + name + ") : " + shaderInfo);
}
return i;
} catch (IOException e) {
e.printStackTrace();
}
return 0;
}
private String readResourceAsString(InputStream inputStream) {
ByteBuffer byteBuffer = null;
try {
byteBuffer = TextureUtil.readResource(inputStream);
int i = byteBuffer.position();
byteBuffer.rewind();
return MemoryUtil.memASCII(byteBuffer, i);
} catch (IOException ignored) {
} finally {
if (byteBuffer != null) {
MemoryUtil.memFree(byteBuffer);
}
}
return null;
}
public enum ShaderType {
VERTEX("vertex", ".vsh", GL_VERTEX_SHADER),
FRAGMENT("fragment", ".fsh", GL_FRAGMENT_SHADER);
private final String name;
private final String fileExtension;
private final int glType;
ShaderType(String name, String fileExtension, int glType) {
this.name = name;
this.fileExtension = fileExtension;
this.glType = glType;
}
}
}

View file

@ -1,17 +1,17 @@
{ {
"providers": [ "providers": [
{ {
"file":"repeating-mod:ui/no-loop.png", "file":"repeating-mod:ui/no-loop.png",
"chars":["\ueffe"], "chars":["\ueffe"],
"height":16, "height":16,
"ascent":12, "ascent":12,
"type":"bitmap" "type":"bitmap"
},{ },{
"file":"repeating-mod:ui/loop.png", "file":"repeating-mod:ui/loop.png",
"chars":["\uefff"], "chars":["\uefff"],
"height":16, "height":16,
"ascent":12, "ascent":12,
"type":"bitmap" "type":"bitmap"
} }
] ]
} }

View file

@ -1,36 +1,36 @@
{ {
"key.repeating-mod.menu": "Repeating menu", "key.repeating-mod.menu": "Repeating menu",
"key.repeating-mod.toggle_replay": "Toggle replay", "key.repeating-mod.toggle_replay": "Toggle replay",
"key.repeating-mod.toggle_record": "Toggle recording", "key.repeating-mod.toggle_record": "Toggle recording",
"text.repeating-mod.name": "Repeating Mod", "text.repeating-mod.name": "Repeating Mod",
"text.repeating-mod.start_record": "Start record", "text.repeating-mod.start_record": "Start record",
"text.repeating-mod.stop_record": "Stop record", "text.repeating-mod.stop_record": "Stop record",
"text.repeating-mod.start_replay": "Start replay", "text.repeating-mod.start_replay": "Start replay",
"text.repeating-mod.stop_replay": "Stop replay", "text.repeating-mod.stop_replay": "Stop replay",
"text.repeating-mod.record_tooltip": "Start/stop recording all activities", "text.repeating-mod.record_tooltip": "Start/stop recording all activities",
"text.repeating-mod.replay_tooltip": "Start/stop repeating recorded actions", "text.repeating-mod.replay_tooltip": "Start/stop repeating recorded actions",
"text.repeating-mod.loop_tooltip": "Enable/disable repeating of recorded actions replay", "text.repeating-mod.loop_tooltip": "Enable/disable repeating of recorded actions replay",
"text.repeating-mod.export_record": "Export record", "text.repeating-mod.export_record": "Export record",
"text.repeating-mod.import": "Import record", "text.repeating-mod.import": "Import record",
"text.repeating-mod.export_tooltip": "Exporting a recording to a file", "text.repeating-mod.export_tooltip": "Exporting a recording to a file",
"text.repeating-mod.import_tooltip": "Importing a recording from a file", "text.repeating-mod.import_tooltip": "Importing a recording from a file",
"text.repeating-mod.dev": "In development...", "text.repeating-mod.dev": "In development...",
"text.repeating-mod.nan_pos_delay": "No pos timer", "text.repeating-mod.nan_pos_delay": "No pos timer",
"text.repeating-mod.pos_delay": "Pos timer: %s ticks", "text.repeating-mod.pos_delay": "Pos timer: %s ticks",
"text.repeating-mod.pos_delay_tooltip": "Timer after which the pos\nevent is added (20 ticks = 1 sec)", "text.repeating-mod.pos_delay_tooltip": "Timer after which the pos\nevent is added (20 ticks = 1 sec)",
"text.repeating-mod.unnamed": "Unnamed Record", "text.repeating-mod.unnamed": "Unnamed Record",
"text.repeating-mod.on_loop": "Enable repeat", "text.repeating-mod.on_loop": "Enable repeat",
"text.repeating-mod.off_loop": "Disable repeat", "text.repeating-mod.off_loop": "Disable repeat",
"text.repeating-mod.recorded_at": "Recorded at", "text.repeating-mod.recorded_at": "Recorded at",
"text.repeating-mod.author": "Author", "text.repeating-mod.author": "Author",
"text.repeating-mod.delete": "Delete", "text.repeating-mod.delete": "Delete",
"text.repeating-mod.start": "Start", "text.repeating-mod.start": "Start",
"text.repeating-mod.stop": "Stop", "text.repeating-mod.stop": "Stop",
"text.repeating-mod.export": "Export", "text.repeating-mod.export": "Export",
"message.repeating-mod.replay_start": "Replay started", "message.repeating-mod.replay_start": "Replay started",
"message.repeating-mod.replay_stop": "Replay finished", "message.repeating-mod.replay_stop": "Replay finished",
"message.repeating-mod.record_start": "Record started", "message.repeating-mod.record_start": "Record started",
"message.repeating-mod.record_stop": "Record finished" "message.repeating-mod.record_stop": "Record finished"
} }

View file

@ -1,38 +1,38 @@
{ {
"key.repeating-mod.menu": "Меню репитинга", "key.repeating-mod.menu": "Меню репитинга",
"key.repeating-mod.toggle_replay": "Вкл/выкл повтор", "key.repeating-mod.toggle_replay": "Вкл/выкл повтор",
"key.repeating-mod.toggle_record": "Вкл/выкл запись", "key.repeating-mod.toggle_record": "Вкл/выкл запись",
"text.repeating-mod.name": "Репитинг Мод", "text.repeating-mod.name": "Репитинг Мод",
"text.repeating-mod.start_record": "Начать запись", "text.repeating-mod.start_record": "Начать запись",
"text.repeating-mod.stop_record": "Остановить запись", "text.repeating-mod.stop_record": "Остановить запись",
"text.repeating-mod.start_replay": "Начать повтор", "text.repeating-mod.start_replay": "Начать повтор",
"text.repeating-mod.stop_replay": "Остановить повтор", "text.repeating-mod.stop_replay": "Остановить повтор",
"text.repeating-mod.record_tooltip": "Начать/остановить запись всех действий", "text.repeating-mod.record_tooltip": "Начать/остановить запись всех действий",
"text.repeating-mod.replay_tooltip": "Начать/остановить повтор записанных действий", "text.repeating-mod.replay_tooltip": "Начать/остановить повтор записанных действий",
"text.repeating-mod.loop_tooltip": "Вкл/выкл повтор записи", "text.repeating-mod.loop_tooltip": "Вкл/выкл повтор записи",
"text.repeating-mod.import": "Импорт записи", "text.repeating-mod.import": "Импорт записи",
"text.repeating-mod.export_tooltip": "Экспорт записи в файл", "text.repeating-mod.export_tooltip": "Экспорт записи в файл",
"text.repeating-mod.import_tooltip": "Импорт записи из файла", "text.repeating-mod.import_tooltip": "Импорт записи из файла",
"text.repeating-mod.dev": "В разработке...", "text.repeating-mod.dev": "В разработке...",
"text.repeating-mod.nan_pos_delay": "Таймера позиции нету", "text.repeating-mod.nan_pos_delay": "Таймера позиции нету",
"text.repeating-mod.pos_delay": "Таймер позиции: %s тиков", "text.repeating-mod.pos_delay": "Таймер позиции: %s тиков",
"text.repeating-mod.pos_delay_tooltip": "Таймер, после которой добавляется\nивент позиции (20 тиков = 1 сек)", "text.repeating-mod.pos_delay_tooltip": "Таймер, после которой добавляется\nивент позиции (20 тиков = 1 сек)",
"text.repeating-mod.unnamed": "Безымянная Запись", "text.repeating-mod.unnamed": "Безымянная Запись",
"text.repeating-mod.on_loop": "Включить повторение", "text.repeating-mod.on_loop": "Включить повторение",
"text.repeating-mod.off_loop": "Выключить повторение", "text.repeating-mod.off_loop": "Выключить повторение",
"text.repeating-mod.recorded_at": "Записано в", "text.repeating-mod.recorded_at": "Записано в",
"text.repeating-mod.author": "Автор", "text.repeating-mod.author": "Автор",
"message.repeating-mod.replay_start": "Повтор начат", "message.repeating-mod.replay_start": "Повтор начат",
"message.repeating-mod.replay_stop": "Повтор закончен", "message.repeating-mod.replay_stop": "Повтор закончен",
"message.repeating-mod.record_start": "Запись начата", "message.repeating-mod.record_start": "Запись начата",
"message.repeating-mod.record_stop": "Запись закончена", "message.repeating-mod.record_stop": "Запись закончена",
"text.repeating-mod.export_record": "Экпорт записи", "text.repeating-mod.export_record": "Экпорт записи",
"text.repeating-mod.export": "Экспорт", "text.repeating-mod.export": "Экспорт",
"text.repeating-mod.delete": "Удалить", "text.repeating-mod.delete": "Удалить",
"text.repeating-mod.start": "Старт", "text.repeating-mod.start": "Старт",
"text.repeating-mod.stop": "Стоп" "text.repeating-mod.stop": "Стоп"
} }

View file

@ -1,38 +1,38 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"id": "repeating-mod", "id": "repeating-mod",
"version": "${version}", "version": "${version}",
"name": "Repeating Mod", "name": "Repeating Mod",
"description": "Mod that repeats your recorded actions. ", "description": "Mod that repeats your recorded actions. ",
"authors": [ "authors": [
"TheMixRay" "TheMixRay"
], ],
"contact": { "contact": {
"homepage": "https://modrinth.com/mod/repeating-mod", "homepage": "https://modrinth.com/mod/repeating-mod",
"sources": "https://github.com/MeexReay/repeating-mod" "sources": "https://github.com/MeexReay/repeating-mod"
}, },
"license": "CC0-1.0", "license": "WTFPL",
"icon": "icon.png", "icon": "icon.png",
"environment": "client", "environment": "client",
"entrypoints": { "entrypoints": {
"client": [ "client": [
"themixray.repeating.mod.Main" "ru.themixray.repeating_mod.Main"
] ]
}, },
"mixins": [ "mixins": [
"repeating-mod.mixins.json" "repeating-mod.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.14", "fabricloader": ">=0.14.14",
"fabric-api": "*", "fabric-api": "*",
"minecraft": ">=1.20", "minecraft": ">=1.21.4",
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {
"another-mod": "*" "another-mod": "*"
} }
} }

View file

@ -1,20 +1,20 @@
{ {
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "themixray.repeating.mod.mixin", "package": "ru.themixray.repeating_mod.mixin",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
], ],
"client": [ "client": [
"MovementMixin", "MovementMixin",
"InputMixin", "InputMixin",
"RendererMixin", "RendererMixin",
"EntityMixin", "EntityMixin",
"ClientMixin", "ClientMixin",
"ScreenMixin", "ScreenMixin",
"PlayerMixin" "PlayerMixin"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1
} }
} }