-
-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
Open
Loqor
wants to merge
57
commits into
main
Choose a base branch
from
feat/roundels
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Roundels! #1460
Changes from all commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
ed06ee8
feat: roundel builder
Loqor d61cd54
Merge branch 'main' into feat/roundels
Loqor c7124c9
feat: more work done on the roundels, they dont work yet at all but i…
Loqor 1e7cf5c
fix: renders roundelpatterns properly now I think
Loqor 3976f06
<
8000
div class="text-emphasized css-truncate css-truncate-target">
feat: roundel textures! nothing works because the game black screens …
65bddfe
fmt
Loqor 09181c7
feat: it works!! kinda
Loqor 56beba3
feat: RAHH THEY WORK NOW
Loqor c04ad7c
fix: half holes
Loqor a0afb2a
feat: dynamic textures (cant test bcs black screen)
Loqor bea5ccd
feat: rotational roundel block
Loqor 55e0aa3
feat: more patterns!!!
Loqor e332132
fix: hopefully dynamic NOWWW
Loqor 2ecbe11
fix: dynamic tex
Loqor f355275
no more println
Loqor 7ec3018
feat: you can now set the roundel block to be any block!
Loqor 713770c
feat: you can now set the roundel block to be any block for real now!
Loqor ec146a8
fix: roundel culling
Loqor 738d5b9
fix: stuff
Saturnorsomthing 0acc9cc
fix: roundel block translation
Addi3 ae88440
feat: more roundel stuff (turning them into blocks)
Loqor f055a13
Merge branch 'main' into feat/roundels
Loqor bb34c74
Fixed Block Model texture not working
RedaKarimi 215f6bc
Merge remote-tracking branch 'origin/feat/roundels' into feat/roundels
Loqor 5f6debf
feat: NO MORE LAG WITH ROUNDELS!!!
Loqor 8734fa3
fix: they save their data properly now
Loqor 917296c
remove RoundelBlockEntityRenderer.java
Loqor fb3e521
Merge branch 'main' into feat/roundels
Loqor 6ecb587
fix: going brrrr and wotn buoild
Loqor 289f5a5
feat: roundelType record as opposed to Pair<RoundelPattern, DyeColor>…
Loqor 9dd0b23
fix: forgor to remove bool
Loqor e91e77e
fix: emissive boolean stuff
Loqor c45aab4
fix: roundel item rendering
Loqor b1b74ea
Merge branch 'main' into feat/roundels
Loqor d1b02bf
item is borked
Loqor 2a3cd7f
Merge branch 'main' into feat/roundels
Loqor db2cc48
Merge branch 'main' into feat/roundels
Loqor e24f52a
feat: lord have mercy upon us, so many roundels, bassicly all of them…
Saturnorsomthing 1541c1b
feat: secondary interior roundel patterns (like 2-4 textures per roun…
Addi3 0258ee7
feat: chorus roundel texture
Addi3 3fd085b
beginning on color wheel
Loqor 78ec2c3
feat: COLOR PICKER FOR THE ROUNDELS!
Loqor 043d205
Merge branch 'main' into feat/roundels
Loqor 784ed6c
feat: more dyability + cursor + hex input
Loqor 942621c
Merge branch 'main' into feat/roundels
Loqor 3c21eea
fixing item rendering
Loqor 4504248
Merge branch 'main' into feat/roundels
Loqor 2627a0a
feat: roundel fabricator texture update
Loqor d2d462f
Merge branch 'main' into feat/roundels
Loqor 6f7b594
Merge branch 'main' into feat/roundels
Loqor 4f2e5fe
fix: all of theo's nitpicks
Loqor 453d4fd
Merge branch 'main' into feat/roundels
Loqor 5742578
fix: roundel blocks render layer's weren't having a great time
Loqor 164e654
Merge branch 'main' into feat/roundels
Loqor 8adbbef
Merge branch 'main' into feat/roundels
Loqor 2e93d3d
replace getInteriorWorld() with worldRef().get()
Loqor 9d4640a
Merge branch 'main' into feat/roundels
Loqor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package dev.amble.ait.client; | ||
|
||
import net.fabricmc.api.EnvType; | ||
import net.fabricmc.api.Environment; | ||
import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; | ||
import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier; | ||
|
||
import net.minecraft.client.render.model.UnbakedModel; | ||
import net.minecraft.util.Identifier; | ||
|
||
import dev.amble.ait.AITMod; | ||
import dev.amble.ait.client.models.RoundelModel; | ||
|
||
@Environment(EnvType.CLIENT) | ||
public class AITModelPlugin implements ModelLoadingPlugin, ModelModifier.OnLoad { | ||
public static final Identifier ROUNDEL_MODEL = AITMod.id("roundel"); | ||
|
||
@Override | ||
public void onInitializeModelLoader(ModelLoadingPlugin.Context pluginContext) { | ||
pluginContext.modifyModelOnLoad().register(this); | ||
} | ||
|
||
@Override | ||
public UnbakedModel modifyModelOnLoad(UnbakedModel model, ModelModifier.OnLoad.Context context) { | ||
Identifier id = context.id(); | ||
// This is EXCEPTIONALLY stupid. But so is Mojang. So, in conclusion, fuck you. - Loqor | ||
if (id != null && ( | ||
id.toString().contains("ait:roundel#") && !id.toString().contains("ait:roundel_fabricator"))) { | ||
return new RoundelModel(); | ||
} | ||
return model; | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i mean
if it contains "ait:roundel#" it cant contain "ait:roundel_fabricator".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i assume the # checks for everything after that so
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
????