Merge pull request 'guiFactory 指向真实的类' (#26) from fix/guifactory into main

src/main/java/com/pengu/api/thaumicadditions/worldgen/StructureDefiner.java

@@ -19,7 +19,7 @@ public class StructureDefiner {
 
    public final Map<ChunkCoordinates, BlockStack> map = new HashMap();
    public final Map<ChunkCoordinates, NBTTagCompound> nbts = new HashMap();
-   public String Clazz = "mrdimka.api.thaumicadditions.worldgen.BasicStructure";
+   public String Clazz = "com.pengu.api.thaumicadditions.worldgen.BasicStructure";
 
 
    public void gatherData(BufferedReader r) {

src/main/java/com/pengu/thaumcraft/additions/TA.java

@@ -63,7 +63,7 @@ import thaumcraft.api.wands.WandRod;
    modid = "thaumicadditions",
    version = "0.41",
    name = "Thaumic Additions",
-   guiFactory = "mrdimka.thaumcraft.additions.config.ConfigurationGuiFactory",
+   guiFactory = "com.pengu.thaumcraft.additions.config.ConfigurationGuiFactory",
    dependencies = "required-after:Thaumcraft@[4.2.3.5,);required-after:Forge@[10.13.3.137,);required-after:Baubles@[1.0.1.10,)"
 )
 public class TA {
@@ -138,7 +138,7 @@ public class TA {
       proxy.init();
       NetworkRegistry.INSTANCE.registerGuiHandler(Reference.instance, new GUIHandler());
       if(Loader.isModLoaded("Botania")) {
-         this.accessClass("mrdimka.thaumcraft.additions.api.others.Botania").init();
+         this.accessClass("com.pengu.thaumcraft.additions.api.others.Botania").init();
       }
 
       BlockDispenser.dispenseBehaviorRegistry.putObject(All.singularity, new BehaviorDispenseSingularity());
@@ -167,7 +167,7 @@ public class TA {
       adaminitewood_staff.setGlowing(true);
       adaminitewood_staff.setRunes(true);
       if(Loader.isModLoaded("Botania")) {
-         this.accessClass("mrdimka.thaumcraft.additions.api.others.Botania").postInit();
+         this.accessClass("com.pengu.thaumcraft.additions.api.others.Botania").postInit();
       }
 
       All.initVoidChestLoot();

src/main/java/com/pengu/thaumcraft/additions/config/ModConfigurationGui.java

@@ -2,12 +2,32 @@ package com.pengu.thaumcraft.additions.config;
 
 import com.pengu.thaumcraft.additions.config.modcfg;
 import cpw.mods.fml.client.config.GuiConfig;
+import cpw.mods.fml.client.config.IConfigElement;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.ConfigElement;
+import net.minecraftforge.common.config.Configuration;
 
 public class ModConfigurationGui extends GuiConfig {
 
    public ModConfigurationGui(GuiScreen gui) {
-      super(gui, (new ConfigElement(modcfg.getConfiguration().getCategory("general"))).getChildElements(), "thaumicadditions", true, true, GuiConfig.getAbridgedConfigPath(modcfg.getConfiguration().toString()));
+      super(gui, getCategoryElements(), "thaumicadditions", true, true, GuiConfig.getAbridgedConfigPath(modcfg.getConfiguration().toString()));
+   }
+
+   // 选项都在 Customization、misc、ClientSide 里，general 是空的，所以按实际分类列出来。
+   private static List<IConfigElement> getCategoryElements() {
+      Configuration cfg = modcfg.getConfiguration();
+      List<IConfigElement> elements = new ArrayList<IConfigElement>();
+
+      for(String name : cfg.getCategoryNames()) {
+         ConfigCategory category = cfg.getCategory(name);
+         if(!category.getValues().isEmpty()) {
+            elements.add(new ConfigElement(category));
+         }
+      }
+
+      return elements;
    }
 }