Rename Liquid Textures #3758

Ghost · 2023-05-24T10:56:33+02:00

Ghost commented

2023-05-24 10:56:33 +02:00

First-time contributor

This pull request renames the textures of water and lava to more closely follow the MineClone 2 naming convention.

The code has also been changed to now reflect these new names.

This pull request renames the textures of water and lava to more closely follow the MineClone 2 naming convention. The code has also been changed to now reflect these new names.

Ghost added the

nodes

code quality

enhancement

labels 2023-05-24 10:56:33 +02:00

ancientmarinerdev requested changes 2023-06-13 18:10:06 +02:00

ancientmarinerdev left a comment

I'm not seeing changes in the colours or the csv file. Please search the file name in the whole project and ensure you catch them all. Thanks

kneekoo commented

2023-06-14 03:15:34 +02:00

nicu@Nicu-PC:~/.minetest/games/mineclone2$ grep -niR default_water_source_animated.png
mods/ITEMS/mcl_mangrove/init.lua:314:local water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4"
mods/ITEMS/mcl_mangrove/init.lua:325:		{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}}
mods/ITEMS/mcl_mangrove/init.lua:330:			name="default_water_source_animated.png",
mods/ITEMS/mcl_mangrove/init.lua:376:water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
mods/ITEMS/mcl_maps/colors.json:4667:  "default_water_source_animated.png": [
mods/ITEMS/mcl_cauldrons/init.lua:70:		water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
mods/ITEMS/mcl_cauldrons/init.lua:75:		water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4"
mods/ITEMS/mcl_core/nodes_liquid.lua:74:		{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}
mods/ITEMS/mcl_core/nodes_liquid.lua:79:			name="default_water_source_animated.png",
mods/ENTITIES/mcl_dripping/README.md:24:	texture  = "default_water_source_animated.png",
mods/ENTITIES/mcl_dripping/init.lua:85:	texture  = "default_water_source_animated.png",
tools/Conversion_Table.csv:190:/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,default_water_source_animated.png,,,,,,,

mcl_dripping also has a README file that should be updated.

``` nicu@Nicu-PC:~/.minetest/games/mineclone2$ grep -niR default_water_source_animated.png mods/ITEMS/mcl_mangrove/init.lua:314:local water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4" mods/ITEMS/mcl_mangrove/init.lua:325: {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}} mods/ITEMS/mcl_mangrove/init.lua:330: name="default_water_source_animated.png", mods/ITEMS/mcl_mangrove/init.lua:376:water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF" mods/ITEMS/mcl_maps/colors.json:4667: "default_water_source_animated.png": [ mods/ITEMS/mcl_cauldrons/init.lua:70: water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF" mods/ITEMS/mcl_cauldrons/init.lua:75: water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4" mods/ITEMS/mcl_core/nodes_liquid.lua:74: {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}} mods/ITEMS/mcl_core/nodes_liquid.lua:79: name="default_water_source_animated.png", mods/ENTITIES/mcl_dripping/README.md:24: texture = "default_water_source_animated.png", mods/ENTITIES/mcl_dripping/init.lua:85: texture = "default_water_source_animated.png", tools/Conversion_Table.csv:190:/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,default_water_source_animated.png,,,,,,, ``` `mcl_dripping` also has a README file that should be updated.

Ghost requested review from ancientmarinerdev 2023-06-15 09:33:33 +02:00

kneekoo commented

2023-06-15 13:45:49 +02:00

tools/Conversion_Table.csv also has to be updated.

`tools/Conversion_Table.csv` also has to be updated.

Ghost commented

2023-06-16 16:34:02 +02:00

First-time contributor

I have done that, but why is there a conflict with the target branch now?

ryvnf referenced this pull request

2023-06-16 17:45:39 +02:00

Reconsider the renaming of texture files #3802

ancientmarinerdev commented

2023-06-18 20:02:24 +02:00

I have done that, but why is there a conflict with the target branch now?

Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them?

https://stackoverflow.com/questions/1552749/difference-between-cr-lf-lf-and-cr-line-break-types

Not sure if this is playing a part:

https://stackoverflow.com/questions/10418975/how-to-change-line-ending-settings

When Smokey changed it, he only changed 1 line:

https://git.minetest.land/MineClone2/MineClone2/pulls/3783/files

As his changed it, and yours, it doesn't know what is the correct change.

> I have done that, but why is there a conflict with the target branch now? Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them? https://stackoverflow.com/questions/1552749/difference-between-cr-lf-lf-and-cr-line-break-types Not sure if this is playing a part: https://stackoverflow.com/questions/10418975/how-to-change-line-ending-settings When Smokey changed it, he only changed 1 line: https://git.minetest.land/MineClone2/MineClone2/pulls/3783/files As his changed it, and yours, it doesn't know what is the correct change.

Ghost commented

2023-06-19 08:04:53 +02:00

First-time contributor

Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them?

I used the Find & Replace function of WPS Spreadsheets to replace those lines. I don't know of any better way to work with .csv files. Did that somehow mess those lines up?

As his changed it, and yours, it doesn't know what is the correct change.

How would I go about fixing this? I used to just revert the conflicting changes, merge master into this branch, and then add the changes back again, but since merging master into pull request branches seems like a no-no, I don't really know how to go about doing this now.

>Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them? I used the `Find & Replace` function of WPS Spreadsheets to replace those lines. I don't know of any better way to work with .csv files. Did that somehow mess those lines up? >As his changed it, and yours, it doesn't know what is the correct change. How would I go about fixing this? I used to just revert the conflicting changes, merge master into this branch, and then add the changes back again, but since merging master into pull request branches seems like a no-no, I don't really know how to go about doing this now.

ancientmarinerdev commented

2023-06-19 14:04:02 +02:00

Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them?

I used the Find & Replace function of WPS Spreadsheets to replace those lines. I don't know of any better way to work with .csv files. Did that somehow mess those lines up?

As his changed it, and yours, it doesn't know what is the correct change.

How would I go about fixing this? I used to just revert the conflicting changes, merge master into this branch, and then add the changes back again, but since merging master into pull request branches seems like a no-no, I don't really know how to go about doing this now.

2 ways. Before you start, backup your branch:

git checkout -b branch_name_bak

An interactive rebase is how I would personally do it.

git checkout master
git pull origin master
git checkout <branc_name>
git rebase -i master

Then find the commit which has you altering that file, and delete that line (it'll be removed from history) and the conflict no longer exists. Next time you push, you'll have to do a force push as you've rewritten history locally and it'll need to be reflected on our repository branch (git prevent history rewrite without a force push for safety reasons):

git push -f <branch_name>

From an ease perspective, first thing is revert your commit. Pull from master (not ideal, but you need Smokey's change on your branch) and deal with any conflict manually if there is one. Then make your change on the file as a raw text file. Maybe open in notepad (a csv isn't strictly a spreadsheet, it's values separated by commas) or something that doesn't alter the formatting, and search for the image name and change it there. If I squash this commit, it'll probably delete those character changes from history.

> >Looking at the diff, you've changed every line. I'm wondering if the line endings have been auto changed. Are you using windows? What program did you use to change them? > > I used the `Find & Replace` function of WPS Spreadsheets to replace those lines. I don't know of any better way to work with .csv files. Did that somehow mess those lines up? > > >As his changed it, and yours, it doesn't know what is the correct change. > > How would I go about fixing this? I used to just revert the conflicting changes, merge master into this branch, and then add the changes back again, but since merging master into pull request branches seems like a no-no, I don't really know how to go about doing this now. 2 ways. Before you start, backup your branch: git checkout -b branch_name_bak An interactive rebase is how I would personally do it. git checkout master git pull origin master git checkout <branc_name> git rebase -i master Then find the commit which has you altering that file, and delete that line (it'll be removed from history) and the conflict no longer exists. Next time you push, you'll have to do a force push as you've rewritten history locally and it'll need to be reflected on our repository branch (git prevent history rewrite without a force push for safety reasons): git push -f <branch_name> From an ease perspective, first thing is revert your commit. Pull from master (not ideal, but you need Smokey's change on your branch) and deal with any conflict manually if there is one. Then make your change on the file as a raw text file. Maybe open in notepad (a csv isn't strictly a spreadsheet, it's values separated by commas) or something that doesn't alter the formatting, and search for the image name and change it there. If I squash this commit, it'll probably delete those character changes from history.

Ghost commented

2023-06-19 14:36:12 +02:00

First-time contributor

I have never used Git to do things in MineClone 2, so if someone knows of any good command-line Gitea tutorials or some sort of better GUI to commit things, feel free to suggest these.

ancientmarinerdev commented

2023-06-19 19:38:17 +02:00

I have never used Git to do things in MineClone 2, so if someone knows of any good command-line Gitea tutorials or some sort of better GUI to commit things, feel free to suggest these.

I've told you the commands. A GUI just does those commands with pretty buttons. If there are any you don't understand, search for it, or ask, and I'll explain.

The more you understand git, the more confident you are to solve those problems and it feels good.

It may seem tricky at first and there is a little learning curve at first, once you learn it, you'll understand it and how to get yourself out of most problems.

This is all git stuff. Gitea is just a server hosting a remote git repo like Github or Gitlab is. You create the pr's on it, but under the covers, it's all git.

> I have never used Git to do things in MineClone 2, so if someone knows of any good command-line Gitea tutorials or some sort of better GUI to commit things, feel free to suggest these. I've told you the commands. A GUI just does those commands with pretty buttons. If there are any you don't understand, search for it, or ask, and I'll explain. The more you understand git, the more confident you are to solve those problems and it feels good. It may seem tricky at first and there is a little learning curve at first, once you learn it, you'll understand it and how to get yourself out of most problems. This is all git stuff. Gitea is just a server hosting a remote git repo like Github or Gitlab is. You create the pr's on it, but under the covers, it's all git.

ancientmarinerdev commented

2023-06-19 19:40:33 +02:00

For example, update your local master:

git checkout master
git pull origin master

Checkout your branch:

git checkout <branc_name>

Rebase your commits on your branch on top of master (-i = interactive, where you can reorder them, squash them, delete them from history like they never happened (a revert is actually a change, and a change back), fixup (squash while retaining the oldest commit message).

git rebase -i master

Push your branch to the remote repo (-f = force, and you should never do this unless you have rewrote history, if you rebase on a branch with 3 commits, those 3 commits get played on top of master with new commit hashes. The force says I know those old commits are no longer needed as the new ones are intentional, please replace them):

git push -f <branch_name>

For example, update your local master: git checkout master git pull origin master Checkout your branch: git checkout <branc_name> Rebase your commits on your branch on top of master (-i = interactive, where you can reorder them, squash them, delete them from history like they never happened (a revert is actually a change, and a change back), fixup (squash while retaining the oldest commit message). git rebase -i master Push your branch to the remote repo (-f = force, and you should never do this unless you have rewrote history, if you rebase on a branch with 3 commits, those 3 commits get played on top of master with new commit hashes. The force says I know those old commits are no longer needed as the new ones are intentional, please replace them): git push -f <branch_name>

Ghost commented

2023-06-20 16:18:02 +02:00

First-time contributor

But how can you even do something like that? Don't you need to "log in" or something among the lines of that?

ancientmarinerdev commented

2023-06-20 16:23:54 +02:00

But how can you even do something like that? Don't you need to "log in" or something among the lines of that?

When you clone a repo, it'll be cloned in read only. You can alter your local copy all your wish without authorisation as it's your copy, but when you push to origin (our gitea instance), you will need to authorise.

You have 2 choices. If you cloned as https and you can type a password every time you push etc. or otherwise you can generate a SSH key and upload it to Gitea from Settings -> SSH / GPG Keys and that will be used as authorisation. There is a link on that page to the github guides on the topic that are pretty good:

https://docs.github.com/en/authentication/connecting-to-github-with-ssh

> But how can you even do something like that? Don't you need to "log in" or something among the lines of that? When you clone a repo, it'll be cloned in read only. You can alter your local copy all your wish without authorisation as it's your copy, but when you push to origin (our gitea instance), you will need to authorise. You have 2 choices. If you cloned as https and you can type a password every time you push etc. or otherwise you can generate a SSH key and upload it to Gitea from Settings -> SSH / GPG Keys and that will be used as authorisation. There is a link on that page to the github guides on the topic that are pretty good: https://docs.github.com/en/authentication/connecting-to-github-with-ssh

Ghost force-pushed liquids_rename from f46c7d3aac to 3347e9b42b

2023-06-20 17:14:26 +02:00

Compare

Ghost added 1 commit 2023-06-20 17:23:58 +02:00

fa08bc89e7 Rename liquid and bucket textures

Ghost commented

2023-06-20 17:26:18 +02:00

First-time contributor

@ancientmarinerdev I have finally figured this stuff out somewhat with the help of git-cola and some tutorials. This should hopefully be okay to merge now.

@ancientmarinerdev I have finally figured this stuff out somewhat with the help of `git-cola` and some tutorials. This should hopefully be okay to merge now.

👍 1

Ghost referenced this pull request

2023-06-21 07:12:17 +02:00

Door Fixes & Improvements #3479

Ghost referenced this pull request

2023-06-28 09:13:24 +02:00

Release 0.84 #3820

ancientmarinerdev referenced this pull request

2023-06-28 20:28:35 +02:00

Release 0.84 #3820

the-real-herowl added the

Testing / Retest