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

Bee keeper robot upgrade #3530

Open
wants to merge 5 commits into
base: master-MC1.7.10
Choose a base branch
from

Conversation

repo-alt
Copy link
Contributor

I had to add gendustry dev binary to the libs because I didn't find any maven hosting 1.7.10 gendustry. That probably needs fixing, any ideas?

@asiekierka
Copy link
Contributor

I'll add any such JARs to a repository just fine.

Does this work and/or fail gracefully with a non-GTNH Gendustry build?

@repo-alt
Copy link
Contributor Author

We didn't make any API changes in gendustry, just a few bug fixes, so any version should work.

@@ -244,6 +244,11 @@ batteryUpgrade3 {
["oc:capacitor", chipDiamond, "oc:capacitor"]
[nuggetIron, "oc:capacitor", nuggetIron]]
}
beekeeperUpgrade {
input: [[ingotGold, blockGlass, ingotGold]
["oc:circuitChip3", {item="Forestry:beealyzer"}, "oc:circuitChip3"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't this use tier 3 components in a tier 2 upgrade? Whichever is the intended tier, it should be adjusted.

}
else result(false, "No inventory?")

@Callback(doc = """function(side:number):boolean -- Swap the queen from the selected slot with the apiary at the specified side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number):boolean -- Swap the queen from the selected slot with the apiary at the specified side.""")
@Callback(doc = """function(side:number):boolean -- Swap the queen from the selected slot with the apiary on the specified side.""")

})
}

@Callback(doc = """function(side:number):boolean -- Swap the drone from the selected slot with the apiary at the specified side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number):boolean -- Swap the drone from the selected slot with the apiary at the specified side.""")
@Callback(doc = """function(side:number):boolean -- Swap the drone from the selected slot with the apiary on the specified side.""")

})
}

@Callback(doc = """function(side:number):number -- Get current progress percent for the apiary at the specified side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number):number -- Get current progress percent for the apiary at the specified side.""")
@Callback(doc = """function(side:number):number -- Get current progress percent for the apiary on the specified side.""")

withApiary(facing, housing => result(housing.getBeekeepingLogic.getBeeProgressPercent))
}

@Callback(doc = """function(side:number):boolean -- Checks if current bee in the apiary at the specified side can work now.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number):boolean -- Checks if current bee in the apiary at the specified side can work now.""")
@Callback(doc = """function(side:number):boolean -- Checks if current bee in the apiary on the specified side can work now.""")

return result(false, "No honey!")

val individual = BeeManager.beeRoot.getMember(specimen)
if (!individual.isAnalyzed) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think in addition to consuming honey, this function should also consume a reasonable amount of energy, to make it similar to other "scanning" components in the mod such as the geolyzer.

0
}

@Callback(doc = """function(side:number):boolean -- Tries to add industrial upgrade from the selected slot to industrial apiary at the given side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be nice if these callbacks were only available if gendustry is installed. I believe this can be done using the FilteredEnvironment interface.

0
}

@Callback(doc = """function(side:number):boolean -- Tries to add industrial upgrade from the selected slot to industrial apiary at the given side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number):boolean -- Tries to add industrial upgrade from the selected slot to industrial apiary at the given side.""")
@Callback(doc = """function(side:number):boolean -- Tries to add industrial upgrade from the selected slot to industrial apiary on the specified side.""")

case _ => result(false, "Not facing an industrial apiary")
}
}
@Callback(doc = """function(side:number, slot: number):table -- Get industrial upgrade in the given slot of the industrial apiary at the given side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number, slot: number):table -- Get industrial upgrade in the given slot of the industrial apiary at the given side.""")
@Callback(doc = """function(side:number, slot: number):table -- Get industrial upgrade in the given slot of the industrial apiary on the specified side.""")

case _ => result(Unit, "Not facing an industrial apiary")
}
}
@Callback(doc = """function(side:number, slot: number):boolean -- Remove industrial upgrade from the given slot of the industrial apiary at the given side.""")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@Callback(doc = """function(side:number, slot: number):boolean -- Remove industrial upgrade from the given slot of the industrial apiary at the given side.""")
@Callback(doc = """function(side:number, slot: number):boolean -- Remove industrial upgrade from the given slot of the industrial apiary on the specified side.""")

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.

None yet

3 participants