Merge pull request #22 from HTTYMD-Team/experimental

1.1.0 Release

Author: Spartan322

.gitignore

@@ -4,7 +4,6 @@
 .project
 .classpath
 bin/
-libs/
 classes/
 minecraft/
 HTTYMD.iml

CONTRIBUTING.md

@@ -5,6 +5,25 @@ To build this workspace:
 1. Fork this repository
 * run `gradlew setupDecompWorkspace`
 * Prepare your preferred IDE
-  * For Eclipse, you can either install the Gradle plugin and point to build.gradle or you can run `gradlew.bat setupDecompWorkspace eclipse` and import this folder
+  * For Eclipse, you can either install the Gradle plugin and point to build.gradle or you can run `gradlew.bat setupDecompWorkspace` and import this folder
   * TODO: give basic Intellij instructions
 * Start developing
+
+#### Code Guidelines
+- Use Hard Tabs (not spaces)
+- Minimize Wrapping
+- No Comment Wrapping
+- Indent once for each block level
+- Constants must be UPPERCASED
+- For one line if statements, omit brackets ('{' and '}')
+- Documented code is highly recommended (high use code must be documented)
+- For heavy Battlegear 2 manipulation, use the bg2 package
+- Removal of public or protected methods and classes is now forbidden until major version bump. Deprecate only. See [Semantic Versioning](http://semver.org)
+- It is suggested to mark probable changes between upcomming MC versions
+
+#### Issue Submission Guidelines
+- Use [pastebin](http://pastebin.com), [gist](https://gist.github.com/), or another paste site for logs (DON'T SUBMIT LOGS DIRECTLY INTO ISSUE)
+- Name your issue descriptively (like "Hitting dragon with shield crashes", not "Help" or "Dragon crash")
+- In the issue body, describe your problem and provide a link to the log (if available)
+- Describe how to replicate the issue (descretion is expected)
+- (For crashes) No logs, no help

build.bat

@@ -0,0 +1 @@
+gradlew.bat build

build.gradle

@@ -1,80 +1,97 @@
 buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
+	repositories {
+		mavenCentral()
+		maven {
+			name = "forge"
+			url = "http://files.minecraftforge.net/maven"
+		}
+		maven {
+			name = "sonatype"
+			url = "https://oss.sonatype.org/content/repositories/snapshots/"
+		}
+	}
+	dependencies {
+		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+
+		classpath fileTree(dir: 'libs', include: '*.jar')
+	}
 }
 
 apply plugin: 'idea'
 idea {
-    module {
-        inheritOutputDirs = true
-    }
+	module {
+		inheritOutputDirs = true
+	}
 }
 
 apply plugin: 'forge'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+ext.configFile = file "mod.prop"
+configFile.withReader {
+	// Load config. Can be referenced as config
+	def prop = new Properties()
+	prop.load(it)
+	ext.config = new ConfigSlurper().parse prop
+}
 
-version = "1.7.10-10.13.2.1230F-1.0.2R"
+version = config.mcversion+"-"+config.forgeversion+"F-"+config.modversion //"1.7.10-10.13.2.1230F-1.0.2R"
 group= "com.httymd" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "HTTYMD"
 
 minecraft {
-    version = "1.7.10-10.13.2.1230"
-    runDir = "minecraft"
+	version = config.mcversion+"-"+config.forgeversion //"1.7.10-10.13.2.1230"
+	runDir = "minecraft"
+}
+
+
+sourceSets {
+	main {
+		java { srcDir 'java' }
+		resources { srcDir 'resources' include('**') }
+	}
 }
 
 processResources
 {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
+	// this will ensure that this task is redone when the versions change.
+	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft.version
+
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'
+		// replace version and mcversion
+		expand 'version':config.modversion, 'mcversion':config.mcversion
+	}
 }
 
-sourceSets {
-    main {
-        java { srcDir 'java' }
-        resources { srcDir 'resources' }
-    }
+dependencies {
 }
 
 
-dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+task deobfJar(type: Jar) {
+	from sourceSets.main.output
+	classifier = 'deobf'
+	destinationDir = file 'releases/API'
+}
 
+task sourceJar(type: Jar) {
+	from sourceSets.main.allSource
+	classifier = 'sources'
+	destinationDir = file 'releases/API'
 }
 
+jar {
+	//Place jar into distribution folder
+	destinationDir = file 'releases'
+	//Keep the jar as clean as possible
+	includeEmptyDirs = false
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
 
+artifacts {
+	archives deobfJar
+	archives sourceJar
+	archives jar
+}

java/com/httymd/Config.java

@@ -1,62 +1,131 @@
 package com.httymd;
 
-import com.httymd.util.Utils;
+import java.util.HashMap;
+
+import com.httymd.entity.EntityTameableFlying;
 
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraftforge.common.config.Configuration;
 
 public class Config {
 
+	public static String CATEGORYS[] = {"dragons", "testing", "bg2"};
+	private static final String STRING_PREFIX = "config."+HTTYMDMod.ID+":";
+	
+	static {
+		for(int i = 0; i < CATEGORYS.length; i++)
+			CATEGORYS[i] = STRING_PREFIX+"category."+CATEGORYS[i];
+	}
+	
 	private final Configuration config;
-	private static final String STRING_PREFIX = "config.";
 	private int startEntityID = -1;
+	/////////////////
+	// Dragons Cat
+	/////////////////
+	private boolean verticalDragonRiding = true;
 	private boolean canOwnMultipleDragons = true;
+	private boolean feedHealsDragons = true;
+	private String forcedTameable = "";
+	/////////////////
+	// Testing Cat
+	/////////////////
 	private boolean debugMode = false;
 	private boolean experimentalMode = false;
+	/////////////////
+	// BG2 Cat
+	/////////////////
+	private boolean useBG2 = true;
+	private boolean useBg2Daggers = true;
+	private boolean useBg2ForWarhammer = true;
+	
+	private HashMap<Class<? extends EntityLivingBase>, Boolean> forcedTameCache = new HashMap<Class<? extends EntityLivingBase>, Boolean>();
 
 	public Config(FMLPreInitializationEvent evt) {
-		config = new Configuration(evt.getSuggestedConfigurationFile());
+		this.config = new Configuration(evt.getSuggestedConfigurationFile());
 
-		syncConfig();
+		this.syncConfig();
 	}
 
-	public void syncConfig() {
-
-		startEntityID = config.getInt("DragonEntityID", Configuration.CATEGORY_GENERAL, startEntityID, -1, 255,
-				"Overrides the entity ID for dragons to fix problems with manual IDs from other mods.\nSet to -1 for automatic assignment (recommended).\nWarning: wrong values may cause crashes and loss of data! Must restart Minecraft to take effect",
-				getLocalKey("startEntityID"));
-		canOwnMultipleDragons = config.getBoolean("MultiDragonOwnership", Configuration.CATEGORY_GENERAL, true,
-				"Provides ability to own multiple dragons", getLocalKey("multiDragonOwnership"));
-		debugMode = config.getBoolean("DebugMode", Configuration.CATEGORY_GENERAL, false,
-				"Enable debug mode, developers recommended", getLocalKey("debugMode"));
-		experimentalMode = config.getBoolean("ExperimentalMode", Configuration.CATEGORY_GENERAL, false,
-				"Enable an experimental version (warning: may be less stable)", getLocalKey("experimentalMode"));
-
-		if (config.hasChanged())
-			config.save();
+	public Configuration getConfig() {
+		return this.config;
 	}
 
 	protected String getLocalKey(String ending) {
-		return Utils.getLocalString(STRING_PREFIX + ending);
+		return STRING_PREFIX + ending;
 	}
-
-	public Configuration getConfig() {
-		return config;
+	
+	public boolean getVerticalDragonRiding() {
+		return this.verticalDragonRiding;
 	}
 
-	public int getStartEntityID() {
-		return startEntityID;
+	public boolean getMultiDragonOwnership() {
+		return this.canOwnMultipleDragons;
 	}
 
-	public boolean getMultiDragonOwnership() {
-		return canOwnMultipleDragons;
+	public int getStartEntityID() {
+		return this.startEntityID;
 	}
 
 	public boolean isDebugMode() {
-		return debugMode;
+		return this.debugMode;
 	}
 
 	public boolean isExperimental() {
-		return experimentalMode;
+		return this.experimentalMode;
+	}
+	
+	public boolean canUseBg2() {
+		return this.useBG2;
+	}
+	
+	public boolean useBg2Daggers() {
+		return this.useBg2Daggers;
+	}
+	
+	public boolean useBg2ForWarhammer() {
+		return this.useBg2ForWarhammer;
+	}
+	
+	public boolean isTameable(EntityTameableFlying e) {
+		Boolean result = this.forcedTameCache.get(e.getClass());
+		if(result != null) return result.booleanValue();
+		String name = EntityList.getEntityString(e).replace(" ", "").replace(HTTYMDMod.ID+".", "").toLowerCase();
+		String checkStr = this.forcedTameable.replace(" ", "").toLowerCase();
+		result = checkStr.indexOf(name) != -1;
+		this.forcedTameCache.put(e.getClass(), result);
+		return result;
+	}
+	
+	public boolean canFeedHeal() {
+		return this.feedHealsDragons;
+	}
+
+	public void syncConfig() {
+
+		/*this.startEntityID = this.config.getInt("DragonEntityID", Configuration.CATEGORY_GENERAL, this.startEntityID, -1, 255,
+				"Overrides the entity ID for dragons to fix problems with manual IDs from other mods.\nSet to -1 for automatic assignment (recommended).\nWarning: wrong values may cause crashes and loss of data! Must restart Minecraft to take effect",
+				this.getLocalKey("startEntityID"));*/
+		
+		String cat = Configuration.CATEGORY_GENERAL;
+		
+		cat = CATEGORYS[0];
+		this.verticalDragonRiding = this.config.getBoolean("Vertical Riding", cat, true, "Enable the vertical climb when riding by looking up or down", this.getLocalKey("verticalDragonRiding"));
+		this.canOwnMultipleDragons = this.config.getBoolean("Multi Ownership", cat, true, "Provides ability to own multiple dragons", this.getLocalKey("multiOwn"));
+		this.feedHealsDragons = this.config.getBoolean("Feed Heals", cat, true, "Determines whether feeding dragons heals them", this.getLocalKey("feedHeals"));
+		this.forcedTameable = this.config.getString("Force Tameable", cat, "", "A list of entity names which are forced to be tameable (seperator may be anything ths isn't a space)", this.getLocalKey("forcedTameable"));
+		
+		cat = CATEGORYS[1];
+		this.debugMode = this.config.getBoolean("Debug Mode", cat, false, "Enable debug mode, developers recommended", this.getLocalKey("debugMode"));
+		this.experimentalMode = this.config.getBoolean("Experimental Mode", cat, false, "Enable an experimental version (warning: may be less stable)", this.getLocalKey("experimentalMode"));
+		
+		cat = CATEGORYS[2];
+		this.useBG2 = this.config.getBoolean("Use BG2", cat, true, "Enables the use of BG2 (if installed)", this.getLocalKey("useBG2"));
+		this.useBg2Daggers = this.config.getBoolean("Use BG2 Daggers", cat, true, "Allows you to specifiy whether to use Battlegear 2 to replace HTTYMD dagger behavior with BG2 dagger behavior", this.getLocalKey("useBg2Daggers"));
+		this.useBg2ForWarhammer  = this.config.getBoolean("Use BG2 Warhammers", cat, true, "Allows you to specifiy whether to use Battlegear 2 for HTTYMD Warhammers", this.getLocalKey("useBg2ForWarhammer"));
+		
+		if (this.config.hasChanged())
+			this.config.save();
 	}
 }