objectMapper() -> objectMapperBuilder()

CleanroomMC · Jun 10, 2024 · f5899a0 · f5899a0
1 parent 7d67f75
commit f5899a0
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/GroovyContainer.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/GroovyContainer.java
@@ -45,7 +45,7 @@ public void addPropertiesOfFields(Object o, boolean privateToo) {
         }
     }
 
-    public <V> ObjectMapper.Builder<V> objectMapper(String name, Class<V> returnType) {
+    public <V> ObjectMapper.Builder<V> objectMapperBuilder(String name, Class<V> returnType) {
         return new ObjectMapper.Builder<>(name, returnType).mod(this);
     }
 }
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Alchemistry.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/alchemistry/Alchemistry.java
@@ -22,7 +22,7 @@ public class Alchemistry extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("element", ItemStack.class)
+        container.objectMapperBuilder("element", ItemStack.class)
                 .parser((s, args) -> {
                     String parsedName = s.trim().toLowerCase().replace(" ", "_");
                     ChemicalCompound compound = CompoundRegistry.INSTANCE.get(parsedName);

diff --git a/...ava/com/cleanroommc/groovyscript/compat/mods/appliedenergistics2/AppliedEnergistics2.java b/...ava/com/cleanroommc/groovyscript/compat/mods/appliedenergistics2/AppliedEnergistics2.java
@@ -18,7 +18,7 @@ public class AppliedEnergistics2 extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("tunnel", TunnelType.class)
+        container.objectMapperBuilder("tunnel", TunnelType.class)
                 .parser(IObjectParser.wrapEnum(TunnelType.class, false))
                 .completerOfNamed(() -> Arrays.asList(TunnelType.values()), v -> v.name().toUpperCase(Locale.ROOT))
                 .docOfType("P2P tunnel type")

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/astralsorcery/AstralSorcery.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/astralsorcery/AstralSorcery.java
@@ -36,7 +36,7 @@ public class AstralSorcery extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("constellation", IConstellation.class)
+        container.objectMapperBuilder("constellation", IConstellation.class)
                 .parser((s, args) -> {
                     for (IConstellation constellation : ConstellationRegistryAccessor.getConstellationList()) {
                         if (constellation.getSimpleName().equalsIgnoreCase(s)) {

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/Botania.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/Botania.java
@@ -39,7 +39,7 @@ public static LexiconEntry getEntry(String name) {
     @SuppressWarnings("Convert2MethodRef")
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("brew", vazkii.botania.api.brew.Brew.class)
+        container.objectMapperBuilder("brew", vazkii.botania.api.brew.Brew.class)
                 .parser(IObjectParser.wrapStringGetter(val -> BotaniaAPI.brewMap.get(val), false))
                 .completerOfNames(() -> BotaniaAPI.brewMap.keySet())
                 .defaultValue(() -> BotaniaAPI.fallbackBrew)

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/EvilCraft.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/EvilCraft.java
@@ -16,7 +16,7 @@ public class EvilCraft extends GroovyPropertyContainer {
     @Override
     public void initialize(GroovyContainer<?> container) {
         final List<String> weatherTypes = Arrays.asList("any", "clear", "rain", "lightning");
-        container.objectMapper("weather", WeatherType.class)
+        container.objectMapperBuilder("weather", WeatherType.class)
                 .parser(IObjectParser.wrapStringGetter(WeatherType::valueOf, true))
                 .completerOfNames(() -> weatherTypes) // elements don't have names
                 .defaultValue(() -> WeatherType.ANY)

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/forestry/Forestry.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/forestry/Forestry.java
@@ -50,7 +50,7 @@ protected static String getNormalName(String name) {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("species", AlleleBeeSpecies.class)
+        container.objectMapperBuilder("species", AlleleBeeSpecies.class)
                 .parser(Forestry::parseSpecies)
                 .completerOfNamed(() -> AlleleManager.alleleRegistry.getRegisteredAlleles().keySet(), s -> s.replace('.', ':')) // elements don't have names
                 .docOfType("allele bee species")

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/mekanism/Mekanism.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/mekanism/Mekanism.java
@@ -40,15 +40,15 @@ public class Mekanism extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("gas", GasStack.class)
+        container.objectMapperBuilder("gas", GasStack.class)
                 .parser((s, args) -> {
                     Gas gas = GasRegistry.getGas(s);
                     return gas == null ? Result.error() : Result.some(new GasStack(gas, 1));
                 })
                 .completerOfNamed(GasRegistry::getRegisteredGasses, Gas::getName)
                 .docOfType("gas stack")
                 .register();
-        container.objectMapper("infusionType", InfuseType.class) // infusion clashes with infusion field
+        container.objectMapperBuilder("infusionType", InfuseType.class) // infusion clashes with infusion field
                 .parser(IObjectParser.wrapStringGetter(InfuseRegistry::get, true))
                 .completerOfNames(InfuseRegistry.getInfuseMap()::keySet)
                 .docOfType("infusion type")

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/roots/Roots.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/roots/Roots.java
@@ -41,28 +41,28 @@ public class Roots extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("ritual", RitualBase.class)
+        container.objectMapperBuilder("ritual", RitualBase.class)
                 .parser(IObjectParser.wrapStringGetter(RitualRegistry::getRitual))
                 .completerOfNames(() -> RitualRegistry.ritualRegistry.keySet())
                 .docOfType("ritual")
                 .register();
-        container.objectMapper("herb", Herb.class)
+        container.objectMapperBuilder("herb", Herb.class)
                 .parser(IObjectParser.wrapStringGetter(HerbRegistry::getHerbByName))
                 .completerOfNames(HerbRegistry.registry::keySet)
                 .docOfType("herb")
                 .register();
-        container.objectMapper("cost", CostType.class)
+        container.objectMapperBuilder("cost", CostType.class)
                 .parser(IObjectParser.wrapEnum(CostType.class, false))
                 .completerOfEnum(CostType.class, false)
                 .docOfType("cost")
                 .register();
-        container.objectMapper("spell", SpellBase.class)
+        container.objectMapperBuilder("spell", SpellBase.class)
                 .parser(Roots::getSpell)
                 .completer(SpellRegistry.spellRegistry::keySet)
                 .defaultValueSup(() -> Result.some(FakeSpell.INSTANCE))  // crashes otherwise
                 .docOfType("spell")
                 .register();
-        container.objectMapper("modifier", Modifier.class)
+        container.objectMapperBuilder("modifier", Modifier.class)
                 .parser(Roots::getModifier)
                 .completerOfNamed(ModifierRegistry::getModifiers, v -> v.getRegistryName().toString())
                 .docOfType("modifier")

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/Thaumcraft.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/Thaumcraft.java
@@ -34,12 +34,12 @@ public class Thaumcraft extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("aspect", AspectStack.class)
+        container.objectMapperBuilder("aspect", AspectStack.class)
                 .parser(IObjectParser.wrapStringGetter(Thaumcraft::getAspect, AspectStack::new))
                 .completerOfNames(thaumcraft.api.aspects.Aspect.aspects::keySet)
                 .docOfType("aspect stack")
                 .register();
-        container.objectMapper("crystal", ItemStack.class)
+        container.objectMapperBuilder("crystal", ItemStack.class)
                 .parser(IObjectParser.wrapStringGetter(Thaumcraft::getAspect, ThaumcraftApiHelper::makeCrystal))
                 .completerOfNames(thaumcraft.api.aspects.Aspect.aspects::keySet)
                 .defaultValue(() -> ItemStack.EMPTY)

diff --git a/...main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/TinkersConstruct.java b/...main/java/com/cleanroommc/groovyscript/compat/mods/tinkersconstruct/TinkersConstruct.java
@@ -25,17 +25,17 @@ public class TinkersConstruct extends GroovyPropertyContainer {
 
     @Override
     public void initialize(GroovyContainer<?> container) {
-        container.objectMapper("toolMaterial", Material.class)
+        container.objectMapperBuilder("toolMaterial", Material.class)
                 .parser(IObjectParser.wrapStringGetter(TinkerRegistryAccessor.getMaterials()::get))
                 .completerOfNames(TinkerRegistryAccessor.getMaterials()::keySet)
                 .docOfType("tool material")
                 .register();
-        container.objectMapper("toolTrait", ITrait.class)
+        container.objectMapperBuilder("toolTrait", ITrait.class)
                 .parser(IObjectParser.wrapStringGetter(TinkerRegistryAccessor.getTraits()::get))
                 .completerOfNamed(TinkerRegistryAccessor.getTraits()::keySet, v -> v.endsWith("_armor") ? null : v) // only suggest non armor traits
                 .docOfType("tool trait")
                 .register();
-        container.objectMapper("armorTrait", ITrait.class)
+        container.objectMapperBuilder("armorTrait", ITrait.class)
                 .parser(IObjectParser.wrapStringGetter(s -> TinkerRegistryAccessor.getTraits().get(s + "_armor")))
                 .completerOfNamed(TinkerRegistryAccessor.getTraits()::keySet,
                                   v -> v.endsWith("_armor") ? v.substring(0, v.length() - 6) : null) // only suggest armor traits