Skip to content

Commit c501f15

Browse files
authored
capitalize blockMaterial (#364)
1 parent 9a9c4b6 commit c501f15

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

examples/postInit/generated/erebus_generated.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ log 'mod \'erebus\' detected, running script'
99
// any Blocks using the valid Materials to be converted, and the Registry contains any valid ItemStacks. The conversion
1010
// takes 10 seconds, and is fueled by erebus wall plants.
1111

12-
mods.erebus.composter.removeFromMaterial(blockmaterial('sponge'))
12+
mods.erebus.composter.removeFromMaterial(blockMaterial('sponge'))
1313
mods.erebus.composter.removeFromRegistry(item('minecraft:stick'))
1414
// mods.erebus.composter.removeFromBlacklist(item('erebus:wall_plants', 1))
1515
// mods.erebus.composter.removeAllFromMaterial()
1616
// mods.erebus.composter.removeAllFromRegistry()
1717
// mods.erebus.composter.removeAllFromBlacklist()
1818

19-
mods.erebus.composter.addMaterial(blockmaterial('tnt'))
19+
mods.erebus.composter.addMaterial(blockMaterial('tnt'))
2020
mods.erebus.composter.addRegistry(item('minecraft:gold_ingot'))
2121
mods.erebus.composter.addBlacklist(item('erebus:wall_plants', 7))
2222
mods.erebus.composter.addBlacklist(item('erebus:wall_plants_cultivated', 7))

src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void onReload() {
5151
@Override
5252
public void afterScriptLoad() {}
5353

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

72-
@MethodDescription(example = @Example("blockmaterial('sponge')"))
72+
@MethodDescription(example = @Example("blockMaterial('sponge')"))
7373
public boolean removeFromMaterial(Material material) {
7474
return getMaterial().removeIf(r -> material == r && materialStorage.addBackup(r));
7575
}

src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static void init() {
128128
.toGroovyCode(x -> GroovyScriptCodeConverter.asGroovyCode(x, false))
129129
.textureBinder(TextureBinder.of(ItemStack::new, TextureBinder.ofItem()))
130130
.register();
131-
ObjectMapper.builder("blockmaterial", Material.class)
131+
ObjectMapper.builder("blockMaterial", Material.class)
132132
.parser(IObjectParser.wrapStringGetter(ObjectParserHelper.materials::get))
133133
.completerOfNames(ObjectParserHelper.materials::keySet)
134134
.docOfType("block material")

0 commit comments

Comments
 (0)