Skip to content
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

Backport Froglights + Additional Froglights #48

Merged
merged 8 commits into from
May 13, 2024

Conversation

GirixK
Copy link

@GirixK GirixK commented Mar 26, 2024

Adding the vanilla Pearlescent, Ocher, and Verdant froglights

As well as adding 6 new ones, based on the following materials, in no particular order:
Osmium, Tungstensteel, Iron, Titanium, Aluminium, and Grisium.

image

These blocks offer several slight variations based on various metals and alloys
They fill the purpose of "natural" feeling full-block light sources

I could add more in the future, but for now I didn't want to overdo it, as most of these didn't exactly have a great deal effort put into them, I mostly just felt there was a gap that could be filled using this block.
I might revisit and re-do some of the less clear textures in the future, but for the time being, I'm personally satisfied.

GirixK and others added 4 commits March 26, 2024 19:50
Backported 3 froglights and added 6 more

Pearlescent, Ochre, Veridium, and the 6 custom ones meant to look like Osmium, Tungstensteel, Iron, Titanium, Aluminium, and Grisium
@chochem chochem added the ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Mar 26, 2024
Copy link
Member

@glowredman glowredman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the first three textures the same as in modern MC? If so, we can't include them in the mod.

src/main/resources/assets/chisel/lang/en_US.lang Outdated Show resolved Hide resolved
@Caedis
Copy link
Member

Caedis commented Mar 26, 2024

How does EFR get around the reuse of modern resources? Is it because EFR is LGPL while this is only GPL?

https://github.com/Roadhog360/Et-Futurum-Requiem/tree/master/src/main/resources/assets/minecraft/textures

@EnderProyects
Copy link

Its ok if you modify some pixels so its not the original texture?.., or how it works the license of textures?

@glowredman
Copy link
Member

How does EFR get around the reuse of modern resources? Is it because EFR is LGPL while this is only GPL?

https://github.com/Roadhog360/Et-Futurum-Requiem/tree/master/src/main/resources/assets/minecraft/textures

See https://www.minecraft.net/en-us/usage-guidelines: "Do not redistribute our games or any alterations of our games or game files". IANAL but to me that sounds like "do your own textures". Alterations of official textures may count as fair-use but again, IANAL.

@GirixK
Copy link
Author

GirixK commented Mar 26, 2024

Are the first three textures the same as in modern MC? If so, we can't include them in the mod.

I never actually considered licensing, will have to be more careful with that in the future I guess.
Anyway, since we're under feature freeze I have plenty of time to work on my own rendition of froglights, will update that to comply with the license in the near future

@GirixK
Copy link
Author

GirixK commented Mar 27, 2024

@glowredman I changed the bottom-left lamp to have a different texture, do you think this is different enough to fall under fair use? If so, I can polish it up a bit more and change the rest
image

GirixK and others added 2 commits March 28, 2024 19:15
- Removed assets for variations 0-8
- Replaced 0-8 with different themed assets
- Added variation 9
Change former assets to comply with minecraft's EULA
@GirixK GirixK requested a review from glowredman March 28, 2024 18:17
@GirixK
Copy link
Author

GirixK commented Mar 28, 2024

Forgot to actually include an image of the new textures
image

@Dream-Master Dream-Master removed the ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Apr 28, 2024
@Dream-Master
Copy link
Member

@GirixK are you still working on this ? Feature freeze is over

@GirixK
Copy link
Author

GirixK commented May 12, 2024

@GirixK are you still working on this ? Feature freeze is over

As far as I'm concerned, I believe it's done, I feel like the currently colors are varied enough to fit plenty of themes and sceneries

Only things I'm not sure about is incrementing the version number, as well as potentially a cheaper assembler recipe, but I don't actually know how to properly do the assembler recipe

@Dream-Master
Copy link
Member

the recipes can be easy added in the core mod. But i need to know what about the graphic licens? We need to take care that we not get into copyright issues @GirixK

@GirixK
Copy link
Author

GirixK commented May 12, 2024

The first screenshot in this pr is the one which violates the license, the latest image is the (current) assets I've heavily modified and should no longer violate the license, so I'm fairly certain it's free to use 👍

@Dream-Master
Copy link
Member

Forgot to actually include an image of the new textures image

so you mean this @GirixK ?

@Dream-Master
Copy link
Member

Adding the vanilla Pearlescent, Ocher, and Verdant froglights

As well as adding 6 new ones, based on the following materials, in no particular order: Osmium, Tungstensteel, Iron, Titanium, Aluminium, and Grisium.

image

These blocks offer several slight variations based on various metals and alloys They fill the purpose of "natural" feeling full-block light sources

I could add more in the future, but for now I didn't want to overdo it, as most of these didn't exactly have a great deal effort put into them, I mostly just felt there was a gap that could be filled using this block. I might revisit and re-do some of the less clear textures in the future, but for the time being, I'm personally satisfied.

This are the original ones @GirixK ?

@Dream-Master
Copy link
Member

if so what do you think ? @glowredman @mitchej123 @boubou19

@GirixK
Copy link
Author

GirixK commented May 12, 2024

Yes, the 3x3 is mojang assets
The 2x5 with the signs are my assets, which I heavily modified, and they should now fall under fair use

Copy link
Member

@glowredman glowredman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Dream-Master Dream-Master merged commit 691d3a2 into GTNewHorizons:master May 13, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants