Skip to content

Roundels! #1460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open

Roundels! #1460

wants to merge 64 commits into from

Conversation

Loqor
Copy link
Member

@Loqor Loqor commented Apr 23, 2025 •
edited by duzos
Loading

About the PR

Added Roundels, Roundel Fabricator, and a new datapack system for patterns.

Why / Balance

I'll explain later

Technical details

Media

Requirements

Breaking changes

Changelog

Loqor and others added 30 commits April 11, 2025 18:55
@Loqor
feat: roundel builder
ed06ee8
@Loqor
Merge branch 'main' into feat/roundels
d61cd54
@Loqor
feat: more work done on the roundels, they dont work yet at all but i…
c7124c9 
… have schoolwork to do
@Loqor
fix: renders roundelpatterns properly now I think
1e7cf5c
@Loqor
feat: roundel textures! nothing works because the game black screens …
3976f06 
…immediately..
@Loqor
fmt
65bddfe
@Loqor
feat: it works!! kinda
09181c7
@Loqor
feat: RAHH THEY WORK NOW
56beba3
@Loqor
fix: half holes
c04ad7c
@Loqor
feat: dynamic textures (cant test bcs black screen)
a0afb2a
@Loqor
feat: rotational roundel block
bea5ccd
@Loqor
feat: more patterns!!!
55e0aa3 
fix: dynamicy
@Loqor
fix: hopefully dynamic NOWWW
e332132 
fix: fabricator no more on ground
@Loqor
fix: dynamic tex
2ecbe11
@Loqor
no more println
f355275
@Loqor
feat: you can now set the roundel block to be any block!
7ec3018
@Loqor
feat: you can now set the roundel block to be any block for real now!
713770c
@Loqor
fix: roundel culling
ec146a8
@Saturnorsomthing
fix: stuff
738d5b9
@Addi3
fix: roundel block translation
0acc9cc
@Loqor
feat: more roundel stuff (turning them into blocks)
ae88440
@Loqor
Merge branch 'main' into feat/roundels
f055a13
@RedaKarimi
Fixed Block Model texture not working
bb34c74
@Loqor
Merge remote-tracking branch 'origin/feat/roundels' into feat/roundels
215f6bc
@Loqor
feat: NO MORE LAG WITH ROUNDELS!!!
5f6debf
@Loqor
fix: they save their data properly now
8734fa3 
fix: emission is now constant and not dumb
@Loqor
remove RoundelBlockEntityRenderer.java
917296c
@Loqor
Merge branch 'main' into feat/roundels
fb3e521
@Loqor
fix: going brrrr and wotn buoild
6ecb587
@Loqor
feat: roundelType record as opposed to Pair<RoundelPattern, DyeColor>…
289f5a5 
… that includes the emissive boolean that can be set via the roundel fabricator (currently is simply set to true for testing)
@github-actions github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted. label Apr 24, 2025
@drtheodor
Copy link
Member

Theo we cant reply to some of your coments

Skill issue, clearly

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Jun 1, 2025
@github-actions
Copy link

github-actions bot commented Jun 1, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Jun 10, 2025
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Aug 7, 2025
@github-actions
Copy link

github-actions bot commented Aug 7, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Loqor added 3 commits August 12, 2025 20:41
@Loqor
Merge branch 'main' into feat/roundels
26ff635 
# Conflicts:
#	src/main/java/dev/amble/ait/AITMod.java
#	src/main/java/dev/amble/ait/client/AITModClient.java
@Loqor
Merge branch 'main' into feat/roundels
0d28ef4
@Loqor
pull from main fix other bugs
b5b93e6
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Aug 15, 2025
@github-actions github-actions bot added size/M Denotes a PR that changes 100-999 lines. size/L Denotes a PR that changes 1000-4999 lines. A: Console Area: Tardis console. and removed size/L Denotes a PR that changes 1000-4999 lines. size/M Denotes a PR that changes 100-999 lines. labels Aug 15, 2025
@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Aug 15, 2025
@github-actions github-actions bot added size/M Denotes a PR that changes 100-999 lines. and removed size/L Denotes a PR that changes 1000-4999 lines. labels Aug 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@duzos duzos Awaiting requested review from duzos

@drtheodor drtheodor Awaiting requested review from drtheodor drtheodor is a code owner

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

A: Console Area: Tardis console. A: Datagen Area: Datagen implementation & API. A: Tardis Components Area: Tardis components & manager. C: Textures Changes: Might require knowledge of spriting or visual design. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. S: Needs Review Status: Requires additional reviews before being fully accepted. size/M Denotes a PR that changes 100-999 lines.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Loqor @duzos @drtheodor @Saturnorsomthing @Addi3 @RedaKarimi