From 4ac1775f67f3b5ffec2723fe192b31c6be598e91 Mon Sep 17 00:00:00 2001 From: Waiting Idly <25394029+WaitingIdly@users.noreply.github.com> Date: Tue, 23 Dec 2025 21:14:47 -0800 Subject: [PATCH] capitalize blockMaterial --- examples/postInit/generated/erebus_generated.groovy | 4 ++-- .../groovyscript/compat/mods/erebus/Composter.java | 4 ++-- .../cleanroommc/groovyscript/mapper/ObjectMapperManager.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/postInit/generated/erebus_generated.groovy b/examples/postInit/generated/erebus_generated.groovy index 9f2315486..5fb06dd54 100644 --- a/examples/postInit/generated/erebus_generated.groovy +++ b/examples/postInit/generated/erebus_generated.groovy @@ -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)) diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java index dc2797ad7..e0f84d0b0 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/erebus/Composter.java @@ -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); } @@ -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)); } diff --git a/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java b/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java index 67ef9bf58..1f31730f9 100644 --- a/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java +++ b/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapperManager.java @@ -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")