amendment mod selectors; bumblezone amendment

CHANGELOG-LATEST.md

···
 ### Technical
 - The mod now makes use of data generation, improving consistency between versions.
 - Payload-related code is compartmentalised, which should not affect anything observable to the user but might spawn unknown bugs.
+- Amendments can now use excluding mod selectors, i.e. "!minecraft" to affect everything except vanilla minecraft content.
 
 ### Fixes
 - Corals no longer crash world generation. (Cass)
-- Custom packets are correctly registered on the client. (Cass, 1.21.1 Neoforge)
+- Custom packets are correctly registered on the client. (Cass, 1.21.1 Neoforge)
+- The 11th amendment was changed to blacklist bumblezone biomes instead of structures.

src/main/java/net/lerariemann/infinity/compat/cloth/AmendmentConfigFactory.java

···
 import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
 import net.lerariemann.infinity.util.core.CommonIO;
 import net.lerariemann.infinity.util.core.NbtUtils;
+import net.lerariemann.infinity.util.platform.InfinityPlatform;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
+
+import java.io.File;
 import java.util.*;
 
+import static net.lerariemann.infinity.InfinityMod.LOGGER;
+import static net.lerariemann.infinity.InfinityMod.configPath;
 import static net.lerariemann.infinity.compat.cloth.ClothConfigFactory.*;
 
 public class AmendmentConfigFactory {
···
     boolean edited = false;
     ConfigCategory amendmentCategory;
     ConfigBuilder builder;
+    public static List<String> allModIds;
 
     AmendmentConfigFactory(ConfigBuilder builder) {
         this.builder = builder;
···
 
         void build() {
             var area = addStringDropdownOption("area", always,
-                    Lists.newArrayList("blocks", "fluids", "items", "structures", "trees", "mobs"));
-            addStringOption("mod", always);
+                    Lists.newArrayList("blocks", "fluids", "items", "structures", "biomes", "trees", "mobs"));
+
+            var v = configPath.resolve("modular").toFile().listFiles(File::isDirectory);
+            if (v != null) allModIds = Arrays.stream(v).map(File::getName).toList();
+            else allModIds = InfinityPlatform.INSTANCE.getModsLoaded();
+            List<String> res = new ArrayList<>();
+            res.add("all");
+            res.add("!minecraft");
+            res.addAll(allModIds);
+            allModIds.forEach(s -> {
+                if (!s.equals("minecraft")) res.add("!" + s);
+            });
+            addStringDropdownOption("mod", always, res);
 
             var selector = addStringDropdownOption("selector", always,
                     Lists.newArrayList("all", "matching", "matching_any", "matching_block_tag", "containing"));

src/main/java/net/lerariemann/infinity/compat/cloth/ClothConfigFactory.java

···
 package net.lerariemann.infinity.compat.cloth;
 
-
 import com.google.gson.*;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;

src/main/java/net/lerariemann/infinity/util/config/Amendment.java

···
         if (mod.equals("all")) {
             modSelector = new UniversalModSelector();
         }
+        else if (mod.startsWith("!")) {
+            String notMod = mod.substring(1);
+            if (!InfinityPlatform.INSTANCE.isModLoaded(notMod)) modSelector = new UniversalModSelector();
+            else modSelector = new ExceptModSelector(notMod);
+        }
         else if (!InfinityPlatform.INSTANCE.isModLoaded(mod)) return null;
         else modSelector = new MatchingModSelector(mod);
 
···
         @Override
         public boolean applies(String modId) {
             return modId.equals(this.mod);
+        }
+    }
+    public record ExceptModSelector(String mod) implements ModSelector {
+        @Override
+        public boolean applies(String modId) {
+            return !modId.equals(this.mod);
         }
     }
 

src/main/java/net/lerariemann/infinity/util/platform/InfinityPlatform.java

···
  *///?}
 
 import java.nio.file.Path;
+import java.util.List;
 
 public interface InfinityPlatform {
     int version =
···
      *///?}
 
     boolean isModLoaded(String modid);
+    List<String> getModsLoaded();
     String loader();
     Path getConfigFolder();
     boolean isDevelopment();

src/main/java/net/lerariemann/infinity/util/platform/fabric/FabricPlatformImpl.java

···
 import net.minecraft.world.level.material.MapColor;
 
 import java.nio.file.Path;
+import java.util.List;
 
 public class FabricPlatformImpl implements InfinityPlatform {
 
     @Override
     public boolean isModLoaded(String modid) {
         return FabricLoader.getInstance().isModLoaded(modid);
+    }
+
+    @Override
+    public List<String> getModsLoaded() {
+        return FabricLoader.getInstance().getAllMods().stream().map(c -> c.getMetadata().getId()).toList();
     }
 
     @Override

src/main/java/net/lerariemann/infinity/util/platform/forge/ForgePlatformImpl.java

···
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.forgespi.language.IModInfo;
 
 import java.nio.file.Path;
+import java.util.List;
 
 public class ForgePlatformImpl implements InfinityPlatform {
     @Override
     public boolean isModLoaded(String modid) {
         return ModList.get().isLoaded(modid);
+    }
+
+    @Override
+    public List<String> getModsLoaded() {
+        return ModList.get().getMods().stream().map(IModInfo::getModId).toList();
     }
 
     @Override

src/main/java/net/lerariemann/infinity/util/platform/neoforge/InfinityModNeoForgeClient.java

···
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
 //? if >1.21.4 {
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
+/^import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.lerariemann.infinity.item.tint.InfinityTintSource;
 
-//?}
+^///?}
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.BlockAndTintGetter;
···
         event.register(InfinityMethods::getBookBoxColor, ModBlocks.BOOK_BOX.get());
     }
     //? if <1.21.4 {
-    /^@SubscribeEvent
+    @SubscribeEvent
     public static void registerItemColorHandlers(RegisterColorHandlersEvent.Item event) {
         event.register(InfinityMethods::getOverlayColorFromComponents,
                 ModItems.TRANSFINITE_KEY.get(),
···
         event.register(InfinityMethods::getDiscColorFromComponents,
                 ModItems.DISC.get());
     }
-    ^///?} else {
-    @SubscribeEvent
+    //?} else {
+    /^@SubscribeEvent
     public static void registerItemColorHandlers(RegisterColorHandlersEvent.ItemTintSources event) {
         event.register(InfinityMethods.getId("color"), InfinityTintSource.MAP_CODEC);
     }
-    //?}
+    ^///?}
     @SubscribeEvent
     public static void registerMenuScreens(RegisterMenuScreensEvent event) {
         event.register(ModScreenHandlers.F4.get(), F4Screen::new);
···
     @SubscribeEvent
     public static void registerFluidRenderLayers(FMLClientSetupEvent event) {
         //? if >1.21.4 {
-        ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceStill().get(), ChunkSectionLayer.TRANSLUCENT);
+        /^ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceStill().get(), ChunkSectionLayer.TRANSLUCENT);
         ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceFlowing().get(), ChunkSectionLayer.TRANSLUCENT);
-        //?} else {
-        /^ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceStill().get(), RenderType.translucent());
+        ^///?} else {
+        ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceStill().get(), RenderType.translucent());
         ItemBlockRenderTypes.setRenderLayer(InfinityPlatform.INSTANCE.getIridescenceFlowing().get(), RenderType.translucent());
-        ^///?}
+        //?}
     }
 
     @SubscribeEvent

src/main/java/net/lerariemann/infinity/util/platform/neoforge/InfinityModNeoforge.java

···
 //? neoforge {
 /*import net.lerariemann.infinity.InfinityMod;
 //? if >1.21.4 {
-import net.lerariemann.infinity.compat.ModCompat;
+/^import net.lerariemann.infinity.compat.ModCompat;
 import net.lerariemann.infinity.compat.rrv.RrvIntegration;
-//?}
+^///?}
 import net.lerariemann.infinity.registry.core.ModBlocks;
 import net.lerariemann.infinity.registry.core.ModEntities;
 import net.lerariemann.infinity.registry.core.ModItemFunctions;
···
         ModFluidsNeoforge.registerModFluids();
         ModEffectsNeoforge.register(eventBus);
         //? if <1.21.2 {
-        /^if (InfinityPlatform.INSTANCE.isModLoaded("create"))
+        if (InfinityPlatform.INSTANCE.isModLoaded("create"))
             net.lerariemann.infinity.compat.CreateCompat.register();
-        ^///?}
+        //?}
     }
 
     @SubscribeEvent
···
         ModItemFunctions.registerDispenserBehaviour();
         // this is less than ideal but i cannot figure out why the proper solution isn't working
         //? if >1.21.4 {
-        if (ModCompat.RRV)
+        /^if (ModCompat.RRV)
             RrvIntegration.initialize();
-        //?}
+        ^///?}
     }
 
     @SubscribeEvent

src/main/java/net/lerariemann/infinity/util/platform/neoforge/NeoForgePlatformImpl.java

···
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.fml.loading.FMLPaths;
 //? if >1.21.4 {
-import net.neoforged.neoforge.client.network.ClientPacketDistributor;
-//?}
+/^import net.neoforged.neoforge.client.network.ClientPacketDistributor;
+^///?}
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
+import net.neoforged.neoforgespi.language.IModInfo;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.function.Supplier;
 
 public class NeoForgePlatformImpl implements InfinityPlatform {
     @Override
     public boolean isModLoaded(String modid) {
         return ModList.get().isLoaded(modid);
+    }
+    @Override
+    public List<String> getModsLoaded() {
+        return ModList.get().getMods().stream().map(IModInfo::getModId).toList();
     }
 
     @Override
···
     @Override
     public void sendC2SPayload(FriendlyPacket payload) {
         //? <1.21.2 {
-        /^PacketDistributor.sendToServer(payload);
-        ^///?} else {
-        ClientPacketDistributor.sendToServer(payload);
-         //?}
+        PacketDistributor.sendToServer(payload);
+        //?} else {
+        /^ClientPacketDistributor.sendToServer(payload);
+         ^///?}
     }
 
     /^*
···
     public RegistrySupplier<LiquidBlock> getIridBlockForReg() {
         var properties = VersionMethods.copyBlockProperties(Blocks.WATER).mapColor(MapColor.COLOR_MAGENTA)
                 //? if >1.21.2
-                .setId(ModBlocks.registryKey("iridescence"))
+                /^.setId(ModBlocks.registryKey("iridescence"))^/
                 ;
         return ModBlocks.BLOCKS.register("iridescence", () ->
                 new IridescenceLiquidBlockNeoforge(InfinityPlatform.INSTANCE.getIridescenceStill(), properties));
···
     public Item.Properties deferredIntComponent(String id, RegistrySupplier<DataComponentType<Integer>> componentTypeSupplier, int i) {
         return new Item.Properties().component(componentTypeSupplier, i)
                 //? if >1.21.4
-                .setId(ModItems.registryKey(id))
+                /^.setId(ModItems.registryKey(id))^/
                 ;
     }
     @Override
     public ItemEnchantments getEnchantments(ItemStack weapon, MinecraftServer s) {
         return weapon.getAllEnchantments(s.registryAccess()
                 //? if >1.21.4 {
-                .lookupOrThrow(Registries.ENCHANTMENT));
-                 //?} else {
                 /^.lookupOrThrow(Registries.ENCHANTMENT));
-        ^///?}
+                 ^///?} else {
+                .lookupOrThrow(Registries.ENCHANTMENT));
+        //?}
     }
 
     @Override

src/main/resources/config/common/amendments.json

···
 {
-  "amendment_version": 3,
+  "amendment_version": 4,
   "elements": [
     {
       "area": "fluids",
···
       "value": 0.1
     },
     {
-      "area": "structures",
+      "area": "biomes",
       "mod": "the_bumblezone",
       "selector": "all",
       "results": "erase"