mrkubax10/industrialtest
1
2
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases 6 Wiki Activity

Hopper compatibility and iron furnace fix #11

Merged
mrkubax10 merged 4 commits from HandfulOfFrogs/industrialtest:master into master 2024-05-10 21:38:37 +02:00
Conversation 5 Commits 4 Files Changed 2 +33 -2
HandfulOfFrogs commented 2024-05-10 10:33:55 +02:00
Contributor
Copy Link
  1. Fixes iron furnaces being unbreakable
  2. Adds hopper compatibility for basic machines
1. Fixes iron furnaces being unbreakable 2. Adds hopper compatibility for basic machines
HandfulOfFrogs added 2 commits 2024-05-10 10:33:58 +02:00
HandfulOfFrogs added 1 commit 2024-05-10 10:56:42 +02:00
HandfulOfFrogs changed title from WIP: Changes from my fork to Changes from my fork 2024-05-10 10:58:03 +02:00
HandfulOfFrogs changed title from Changes from my fork to Hopper compatibility and iron furnace fix 2024-05-10 10:58:19 +02:00
mrkubax10 added the
enhancement
 label 2024-05-10 14:42:39 +02:00
mrkubax10 requested changes 2024-05-10 14:46:14 +02:00
Dismissed
machines/common.lua Outdated
@ -363,0 +378,4 @@
return inv, "src", mcl_util.select_stack(hop_inv, hop_list, inv, "src")
end
definition._mcl_hoppers_on_after_push=function(pos)
minetest.get_node_timer(pos):start(1.0)
mrkubax10 commented 2024-05-10 14:43:44 +02:00
Owner
Copy Link

Use industrialtest.updateDelay instead of hardcoding 1.0.

Use `industrialtest.updateDelay` instead of hardcoding `1.0`.
mrkubax10 marked this conversation as resolved
machines/iron_furnace.lua Outdated
@ -301,0 +305,4 @@
definition._mcl_hoppers_on_try_pull = mcl_furnaces.hoppers_on_try_pull
definition._mcl_hoppers_on_try_push = mcl_furnaces.hoppers_on_try_push
definition._mcl_hoppers_on_after_push = function(pos)
minetest.get_node_timer(pos):start(1.0)
mrkubax10 commented 2024-05-10 14:44:51 +02:00
Owner
Copy Link

Same as above.

Same as above.
mrkubax10 marked this conversation as resolved
HandfulOfFrogs added 1 commit 2024-05-10 14:52:42 +02:00
mrkubax10 reviewed 2024-05-10 15:15:24 +02:00
machines/common.lua Outdated
@ -361,2 +363,4 @@
}
definition._mcl_blast_resistance=3.5
definition._mcl_hardness=3.9
definition._mcl_hoppers_on_try_pull=function(pos, hop_pos, hop_inv, hop_list)
mrkubax10 commented 2024-05-10 15:15:24 +02:00
Owner
Copy Link

Problem with this code is that not every machine has dst or src slots. For example Canning Machine has target slot instead of dst.

Problem with this code is that not every machine has `dst` or `src` slots. For example Canning Machine has `target` slot instead of `dst`.
HandfulOfFrogs commented 2024-05-10 15:20:22 +02:00
Author
Contributor
Copy Link

I see, maybe this can be moved into registerSimpleElectricItemProcessor specifically?

I see, maybe this can be moved into `registerSimpleElectricItemProcessor` specifically?
HandfulOfFrogs commented 2024-05-10 15:21:06 +02:00
Author
Contributor
Copy Link

Or, rather, have canning machine use dst slot too

Or, rather, have canning machine use dst slot too
mrkubax10 commented 2024-05-10 15:44:42 +02:00
Owner
Copy Link

Yeah this seems like a better solution though fact that src and dst are "special" should be documented somehow.

Yeah this seems like a better solution though fact that `src` and `dst` are "special" should be documented somehow.
mrkubax10 commented 2024-05-10 19:13:02 +02:00
Owner
Copy Link

Alright I renamed inventory list names to src and dst where it was making sense in 2669b7bc27.

Alright I renamed inventory list names to `src` and `dst` where it was making sense in 2669b7bc27.
HandfulOfFrogs commented 2024-05-10 20:46:01 +02:00
Author
Contributor
Copy Link

Oh, great!

Oh, great!
mrkubax10 marked this conversation as resolved
HandfulOfFrogs added 9 commits 2024-05-10 20:41:30 +02:00 
Fixes #17
(whoops! thought it was lead!)
HandfulOfFrogs commented 2024-05-10 20:42:57 +02:00
Author
Contributor
Copy Link

I think I accidentally frogged up this merge request by merging upstream into my branch, let me see if I can fix it, or i'll just open a new one

I think I accidentally frogged up this merge request by merging upstream into my branch, let me see if I can fix it, or i'll just open a new one
HandfulOfFrogs force-pushed master from 804b40e2bd to 2d4fa3b68b 2024-05-10 20:45:23 +02:00 Compare
HandfulOfFrogs commented 2024-05-10 20:46:24 +02:00
Author
Contributor
Copy Link

There we go, should be fine now

There we go, should be fine now
mrkubax10 approved these changes 2024-05-10 21:32:10 +02:00
mrkubax10 merged commit a844b4f982 into master 2024-05-10 21:38:37 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
mrkubax10
Labels
Clear labels
bug
Something is not working
compat-mode:mineclone2
compat-mode:minetest_game
crash
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
question
More information is needed
wontfix
This won't be fixed
No Label
enhancement
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mrkubax10/industrialtest#11
No description provided.
Delete Branch "HandfulOfFrogs/industrialtest:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?