Bamboo Piston Fix. #3424

Michieal · 2023-02-09T03:51:10+01:00

Michieal commented

2023-02-09 03:51:10 +01:00

Fix merge / rebase crossing massacre.

[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.

Tell us about your pull request! Reference related issues, if necessary
This pull request is to make Bamboo breakable by pistons, so that farms work properly.
Positive side effect of this is that removing nodes under bamboo plants should cause the bamboo to break on the next grow cycle.

Testing

Put a piston on a block of stone, with a lever or button next to the piston, to where the piston will impact one of the segments of a bamboo stalk. Trigger the piston, and watch the bamboo break.

Fix merge / rebase crossing massacre. [Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation. [Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons. [Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes. [Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons. Probably not the most elegant, but hey. It works. [Michieal] 76507025d9 Cleaned up the global function to match the current ABM. [Michieal] a5bdc8a166 fix bamboo mosaic recipe. [Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps [Michieal] f81d530912 Update init.lua to register dropper callback. --- Tell us about your pull request! Reference related issues, if necessary This pull request is to make Bamboo breakable by pistons, so that farms work properly. Positive side effect of this is that removing nodes under bamboo plants should cause the bamboo to break on the next grow cycle. ### Testing Put a piston on a block of stone, with a lever or button next to the piston, to where the piston will impact one of the segments of a bamboo stalk. Trigger the piston, and watch the bamboo break.

Michieal commented

2023-02-09 03:55:42 +01:00

This pull request fixes #3399

Ghost commented

2023-02-09 19:20:21 +01:00

First-time contributor

. . .

git checkout master
git fetch origin
git merge origin/master
git checkout Bamboo_Piston_fix
git rebase master

Fix any issues that git alerts you about.

git push origin Bamboo_Piston_fix --force

. . . ``` git checkout master git fetch origin git merge origin/master git checkout Bamboo_Piston_fix git rebase master ``` Fix any issues that git alerts you about. ``` git push origin Bamboo_Piston_fix --force ```

👍 1

ancientmarinerdev commented

2023-02-09 19:27:44 +01:00

. . .

git checkout master
git fetch origin
git merge origin/master
git checkout Bamboo_Piston_fix
git rebase master

Fix any issues that git alerts you about.

git push origin Bamboo_Piston_fix --force

Only ever force push if you have rebased and you know it's fine. Git has the safety rails on at all times. A force push is you removing the safety rails and saying I know this could be a destructive change, but I know what I am doing. This should only ever be done on a feature branch. :)

Also works as: git push -f origin branch_name

> . . . > > ``` > git checkout master > git fetch origin > git merge origin/master > git checkout Bamboo_Piston_fix > git rebase master > ``` > Fix any issues that git alerts you about. > ``` > git push origin Bamboo_Piston_fix --force > ``` Only ever force push if you have rebased and you know it's fine. Git has the safety rails on at all times. A force push is you removing the safety rails and saying I know this could be a destructive change, but I know what I am doing. This should only ever be done on a feature branch. :) Also works as: git push -f origin branch_name

👍 1

ancientmarinerdev reviewed 2023-02-10 03:30:55 +01:00

mods/ITEMS/mcl_bamboo/globals.lua Outdated

					
				@ -70,0 +70,4 @@

				-- For when I learn more about the pistons...

				function mcl_bamboo.break_orphaned(pos)

					mcl_bamboo.mcl_log("Break_Orphaned called.")

						local node_below = minetest.get_node(vector.offset(pos, 0, -1, 0))