Skip to content

Consistently Capitalize as blockMaterial #364

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.

Sign up for GitHub

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

Open
WaitingIdly wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Consistently Capitalize as blockMaterial #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/postInit/generated/erebus_generated.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ log 'mod \'erebus\' detected, running script'
// any Blocks using the valid Materials to be converted, and the Registry contains any valid ItemStacks. The conversion
// takes 10 seconds, and is fueled by erebus wall plants.

mods.erebus.composter.removeFromMaterial(blockmaterial('sponge'))
mods.erebus.composter.removeFromMaterial(blockMaterial('sponge'))
mods.erebus.composter.removeFromRegistry(item('minecraft:stick'))
// mods.erebus.composter.removeFromBlacklist(item('erebus:wall_plants', 1))
// mods.erebus.composter.removeAllFromMaterial()
// mods.erebus.composter.removeAllFromRegistry()
// mods.erebus.composter.removeAllFromBlacklist()

mods.erebus.composter.addMaterial(blockmaterial('tnt'))
mods.erebus.composter.addMaterial(blockMaterial('tnt'))
mods.erebus.composter.addRegistry(item('minecraft:gold_ingot'))
mods.erebus.composter.addBlacklist(item('erebus:wall_plants', 7))
mods.erebus.composter.addBlacklist(item('erebus:wall_plants_cultivated', 7))
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void onReload() {
@Override
public void afterScriptLoad() {}

@MethodDescription(type = MethodDescription.Type.ADDITION, example = @Example("blockmaterial('tnt')"))
@MethodDescription(type = MethodDescription.Type.ADDITION, example = @Example("blockMaterial('tnt')"))
public boolean addMaterial(Material material) {
return getMaterial().add(material) && materialStorage.addScripted(material);
}
Expand All @@ -69,7 +69,7 @@ public boolean addBlacklist(ItemStack stack) {
return getBlacklist().add(stack) && blacklistStorage.addScripted(stack);
}

@MethodDescription(example = @Example("blockmaterial('sponge')"))
@MethodDescription(example = @Example("blockMaterial('sponge')"))
public boolean removeFromMaterial(Material material) {
return getMaterial().removeIf(r -> material == r && materialStorage.addBackup(r));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static void init() {
.toGroovyCode(x -> GroovyScriptCodeConverter.asGroovyCode(x, false))
.textureBinder(TextureBinder.of(ItemStack::new, TextureBinder.ofItem()))
.register();
ObjectMapper.builder("blockmaterial", Material.class)
ObjectMapper.builder("blockMaterial", Material.class)
.parser(IObjectParser.wrapStringGetter(ObjectParserHelper.materials::get))
.completerOfNames(ObjectParserHelper.materials::keySet)
.docOfType("block material")
Expand Down