Pr/1

.gitignore

@@ -19,6 +19,7 @@ local.properties
 gradle/
 build/
 eclipse/
+run/
 CREDITS-fml.txt
 forge-*.txt
 LICENSE-fml.txt
@@ -228,4 +229,7 @@ pip-log.txt
 #Idea
 *.iml
 *.ipr
-*.iws
+*.iws
+gradlew
+
+gradlew.bat

README.md

@@ -0,0 +1,5 @@
+# StellarSky
+Stellar Sky, Real Constellations in Minecraft!
+
+(This github is divided to 2 branches: 1.7 and 1.8
+master branch won't be used.)

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "v0.1.10[1.7.10]"
+version = "v0.1.18[1.7.10]"
 group= "stellarium" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Stellar Sky"
 

src/main/java/stellarium/ClientProxy.java

@@ -1,39 +1,45 @@
 package stellarium;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
+import stellarium.config.EnumViewMode;
+import stellarium.config.IConfigHandler;
+import stellarium.stellars.Optics;
 import stellarium.stellars.StellarManager;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.relauncher.Side;
 
 public class ClientProxy extends CommonProxy implements IProxy {
 
+	private static final String clientConfigCategory = "clientconfig";
+	private static final String clientConfigOpticsCategory = "clientconfig.optics";
+
 	@Override
-	public void preInit(FMLPreInitializationEvent event) throws IOException {
+	public void preInit(FMLPreInitializationEvent event) {
 		manager = new StellarManager(Side.CLIENT);
 
-    	//Initialize Objects
-        config = new Configuration(event.getSuggestedConfigurationFile());
-
-        config.load();
-        setupConfig();
-        config.save();
+        this.setupConfigManager(event.getSuggestedConfigurationFile());
 
-		manager.InitializeStars();
-
+		MinecraftForge.EVENT_BUS.register(new StellarClientHook());
+		FMLCommonHandler.instance().bus().register(new StellarKeyHook());
 	}
 
 	@Override
-	public void load(FMLInitializationEvent event) {
+	public void load(FMLInitializationEvent event) throws IOException {
 		super.load(event);
+
+		manager.initializeStars();
 	}
 
 	@Override
@@ -42,25 +48,80 @@ public void postInit(FMLPostInitializationEvent event) {
 	}
 
 	@Override
-	public void setupConfig() {
-        super.setupConfig();
-
-        Property Mag_Limit=config.get(Configuration.CATEGORY_GENERAL, "Mag_Limit", 5.0);
-        Mag_Limit.comment="Limit of magnitude can be seen on naked eye.\n" +
-        		"If you want to increase FPS, you can set this property a bit little (e.g. 0.3)\n" +
-        		"and FPS will be exponentially improved";
-        manager.Mag_Limit=(float)Mag_Limit.getDouble(5.0);
+	public void setupConfigManager(File file) {
+		super.setupConfigManager(file);
+		cfgManager.register(clientConfigCategory, new IConfigHandler() {
+
+			Property mag_Limit, turb, moon_Frac, minuteLength, hourToMinute, viewMode;
+
+			@Override
+			public void setupConfig(Configuration config, String category) {
+		        config.setCategoryComment(category, "Configurations for client modifications.\n"
+		        		+ "Most of them are for rendering/view.");
+		        config.setCategoryLanguageKey(category, "config.category.client");
+		        config.setCategoryRequiresMcRestart(category, false);
+
+		        mag_Limit=config.get(category, "Mag_Limit", 5.0);
+		        mag_Limit.comment="Limit of magnitude can be seen on naked eye.\n" +
+		        		"If you want to increase FPS, you can set this property a bit little (e.g. 0.3)\n" +
+		        		"and FPS will be exponentially improved";
+		        mag_Limit.setRequiresMcRestart(false);
+		        mag_Limit.setLanguageKey("config.property.client.maglimit");
 
-        Property turb=config.get(Configuration.CATEGORY_GENERAL, "Twinkling(Turbulance)", 0.3);
-        turb.comment="Degree of the twinkling effect of star.\n"
-        		+ "It determines the turbulance of atmosphere, which actually cause the twinkling effect";
-        manager.Turb=(float)turb.getDouble(0.3);
-
-        Property Moon_Frac=config.get(Configuration.CATEGORY_GENERAL, "Moon_Fragments_Number", 16);
-        Moon_Frac.comment="Moon is drawn with fragments\n" +
-        		"Less fragments will increase FPS, but the moon become more defective\n";
-        manager.ImgFrac=Moon_Frac.getInt(16);
-   	}
+		        turb=config.get(category, "Twinkling(Turbulance)", 1.0);
+		        turb.comment="Degree of the twinkling effect of star.\n"
+		        		+ "It determines the turbulance of atmosphere, which actually cause the twinkling effect";
+		        turb.setRequiresMcRestart(false);
+		        turb.setLanguageKey("config.property.client.turbulance");
+
+		        moon_Frac=config.get(category, "Moon_Fragments_Number", 16);
+		        moon_Frac.comment="Moon is drawn with fragments\n" +
+		        		"Less fragments will increase FPS, but the moon become more defective";
+		        moon_Frac.setRequiresMcRestart(false);
+		        moon_Frac.setLanguageKey("config.property.client.moonfrac");
+
+		        minuteLength = config.get(category, "Minute_Length", 20.0);
+		        minuteLength.comment = "Length of minute in tick. (The minute & hour is displayed on HUD as HH:MM format)";
+		        minuteLength.setRequiresMcRestart(false);
+		        minuteLength.setLanguageKey("config.property.client.minutelength");
+
+		        hourToMinute = config.get(category, "Hour_Length", 60);
+		        hourToMinute.comment = "Length of hour in minute. (The minute & hour is displayed on HUD as HH:MM format)";
+		        hourToMinute.setRequiresMcRestart(false);
+		        hourToMinute.setLanguageKey("config.property.client.hourlength");
+
+		        viewMode = config.get(category, "Mode_HUD_Time_View", "empty")
+		        		.setValidValues(EnumViewMode.names);
+		        viewMode.comment = "Mode for HUD time view.\n"
+		        		+ " 3 modes available: empty, hhmm, tick.\n"
+		        		+ "Can also be changed in-game using key.";
+		        viewMode.setRequiresMcRestart(false);
+		        viewMode.setLanguageKey("config.property.client.modeview");
+
+		        viewMode.setValue(manager.getViewMode().getName());
+
+
+		        List<String> propNameList = Arrays.asList(mag_Limit.getName(),
+		        		moon_Frac.getName(), turb.getName(), viewMode.getName(),
+		        		minuteLength.getName(), hourToMinute.getName());
+		        config.setCategoryPropertyOrder(category, propNameList);
+			}
+
+			@Override
+			public void loadFromConfig(Configuration config, String category) {
+		        manager.mag_Limit=(float)mag_Limit.getDouble();
+		        manager.turb=(float)turb.getDouble();
+		        manager.imgFrac=moon_Frac.getInt();
+		        manager.minuteLength = minuteLength.getDouble();
+		        manager.anHourToMinute = hourToMinute.getInt();
+
+		        manager.setViewMode(EnumViewMode.getModeForName(viewMode.getString()));
+			}
+
+		});
+
+		cfgManager.register(clientConfigOpticsCategory, Optics.instance);
+	}
 
 	@Override
 	public World getDefWorld() {