Add support for fabric and newer versions

README.md

@@ -1,4 +1,15 @@
 # Sound-Physics
 A Minecraft mod that provides realistic sound attenuation, reverberation, and absorption through blocks.
 
-This is a fork! TODO: There is still some cleanup left! Sonic Ether's original source code was very messy!
+Downloads are in the [releases tab](https://github.com/djpadbit/Sound-Physics/releases)
+
+This is a fork of a fork! I forked it from daipenger who forked it from sonicether, daipenger ported it to 1.12.2 and cleaned up the codebase, i just added some stuff.
+
+The stuff added in this fork:
+* Automatic stero to mono downmixing of sounds (So the original resourcepack is not needed anymore)
+* More compatibility with mods (Computronics & Immersive Railroading)
+* Server-side support (right position for entity and computronics sounds and higher distance before sound cutoff)
+
+Todo:
+* Rewrite Dynamic environement evaluation (feature removed for now)
+* More mod compatibility ? I'm open to suggestions

build.gradle

@@ -1,54 +1,60 @@
 buildscript {
-    repositories {
-        jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-    }
+	repositories {
+		jcenter()
+		maven { url = "http://files.minecraftforge.net/maven" }
+	}
+	dependencies {
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+	}
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
-version = "1.12.2"
+version = "${mc_version}-${mod_version}"
+group = "com.sonicether.soundphysics"
 archivesBaseName = "Sound-Physics"
 
 jar {
 	manifest {
-        attributes 'FMLCorePlugin': 'com.sonicether.soundphysics.CoreModLoader'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
-    }
+		attributes 'FMLCorePlugin': 'com.sonicether.soundphysics.CoreModLoader'
+		attributes 'FMLCorePluginContainsFMLMod': 'true'
+		attributes 'FMLAT': 'soundphysics_at.cfg'
+	}
 }
 
 sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
+	sourceCompatibility = targetCompatibility = '1.8'
 }
 
 minecraft {
-    version = "1.12.2-14.23.0.2542"
-    runDir = "run"
-    mappings = "snapshot_20171003"
+	version = "${mc_version}-${forge_version}"
+	runDir = "run"
+	mappings = mcp_mappings
+
+	replace '${version}', mod_version
+	replace '${mc_version}', mc_version
+	replaceIn "SoundPhysics.java"
 }
 
 dependencies {
 }
 
 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 except 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", mod_version
+	inputs.property "mc_version", mc_version
+
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'
+
+		// replace version and mcversion
+		expand 'version':mod_version, 'mc_version':mc_version
+	}
+
+	// copy everything else except the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
+	}
 }

gradle.properties

@@ -1,3 +1,9 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
+
+forge_version=14.23.5.2847
+mcp_mappings=snapshot_20180814
+
+mc_version=1.12.2
+mod_version=1.0.10-1

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

src/main/java/com/sonicether/soundphysics/Config.java

@@ -1,5 +1,7 @@
 package com.sonicether.soundphysics;
 
+import java.io.File;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,12 +22,18 @@ public class Config {
 	// general
 	public static float rolloffFactor;
 	public static float globalReverbGain;
+	public static float globalVolumeMultiplier;
 	public static float globalReverbBrightness;
 	public static float soundDistanceAllowance;
 	public static float globalBlockAbsorption;
 	public static float globalBlockReflectance;
 	public static float airAbsorption;
+	public static float snowAirAbsorptionFactor;
 	public static float underwaterFilter;
+	public static boolean noteBlockEnable;
+	public static float maxDistance;
+	public static boolean volumeMulOnlyAffected;
+	public static float globalEchoMultiplier;
 
 	// performance
 	public static boolean skipRainOcclusionTracing;
@@ -43,19 +51,38 @@ public class Config {
 	public static float sandReflectivity;
 	public static float snowReflectivity;
 
+	// compatibility
+	public static boolean computronicsPatching;
+	public static boolean irPatching;
+	public static boolean dsPatching;
+	public static boolean midnightPatching;
+	public static boolean midnightPatchingFix;
+	public static boolean ic2Patching;
+	public static boolean glibyVCPatching;
+	public static boolean glibyVCSrcPatching;
+	public static boolean autoSteroDownmix;
+
+	// misc
+	public static boolean autoSteroDownmixLogging;
+	public static boolean injectorLogging;
+
 	private static final String categoryGeneral = "General";
 	private static final String categoryPerformance = "Performance";
 	private static final String categoryMaterialProperties = "Material properties";
+	private static final String categoryCompatibility = "Compatibility";
+	private static final String categoryMisc = "Misc";
 
 	static {
 		instance = new Config();
 	}
 
 	private Config() {
+		this.forgeConfig = new Configuration(new File(new File(CoreModLoader.mcDir, "config"), SoundPhysics.modid+".cfg"));
+		syncConfig();
 	}
 
 	public void preInit(final FMLPreInitializationEvent event) {
-		this.forgeConfig = new Configuration(event.getSuggestedConfigurationFile());
+		//this.forgeConfig = new Configuration(event.getSuggestedConfigurationFile());
 		syncConfig();
 	}
 
@@ -76,6 +103,8 @@ public List<IConfigElement> getConfigElements() {
 		list.add(new ConfigElement(this.forgeConfig.getCategory(Config.categoryGeneral)));
 		list.add(new ConfigElement(this.forgeConfig.getCategory(Config.categoryPerformance)));
 		list.add(new ConfigElement(this.forgeConfig.getCategory(Config.categoryMaterialProperties)));
+		list.add(new ConfigElement(this.forgeConfig.getCategory(Config.categoryCompatibility)));
+		list.add(new ConfigElement(this.forgeConfig.getCategory(Config.categoryMisc)));
 
 		return list;
 	}
@@ -84,6 +113,8 @@ private void syncConfig() {
 		// General
 		rolloffFactor = this.forgeConfig.getFloat("Attenuation Factor", categoryGeneral, 1.0f, 0.2f, 1.0f,
 				"Affects how quiet a sound gets based on distance. Lower values mean distant sounds are louder. 1.0 is the physically correct value.");
+		globalVolumeMultiplier = this.forgeConfig.getFloat("Global Volume Multiplier", categoryGeneral, 4.0f, 0.1f, 8.0f,
+				"The global volume multiplier of all sounds.");
 		globalReverbGain = this.forgeConfig.getFloat("Global Reverb Gain", categoryGeneral, 1.0f, 0.1f, 2.0f,
 				"The global volume of simulated reverberations.");
 		globalReverbBrightness = this.forgeConfig.getFloat("Global Reverb Brightness", categoryGeneral, 1.0f, 0.1f,
@@ -99,8 +130,18 @@ private void syncConfig() {
 				"Minecraft won't allow sounds to play past a certain distance. This parameter is a multiplier for how far away a sound source is allowed to be in order for it to actually play. Values too high can cause polyphony issues.");
 		airAbsorption = this.forgeConfig.getFloat("Air Absorption", categoryGeneral, 1.0f, 0.0f, 5.0f,
 				"A value controlling the amount that air absorbs high frequencies with distance. A value of 1.0 is physically correct for air with normal humidity and temperature. Higher values mean air will absorb more high frequencies with distance. 0 disables this effect.");
+		snowAirAbsorptionFactor = this.forgeConfig.getFloat("Max Snow Air Absorption Factor", categoryGeneral, 5.0f, 0.0f, 10.0f,
+				"The maximum air absorption factor when it's snowing. The real absorption factor will depend on the snow's intensity. Set to 1 or lower to disable");
 		underwaterFilter = this.forgeConfig.getFloat("Underwater Filter", categoryGeneral, 0.8f, 0.0f, 1.0f,
 				"How much sound is filtered when the player is underwater. 0.0 means no filter. 1.0 means fully filtered.");
+		noteBlockEnable = this.forgeConfig.getBoolean("Affect Note Blocks", categoryGeneral, true,
+				"If true, note blocks will be processed.");
+		maxDistance = this.forgeConfig.getFloat("Max ray distance", categoryGeneral, 256.0f, 1.0f, 8192.0f,
+				"How far the rays should be traced.");
+		volumeMulOnlyAffected = this.forgeConfig.getBoolean("Volume Multiplier Only On Affected", categoryGeneral, true,
+				"If true, the global volume multiplier will only be applied to affected sounds (so not to the ui sounds for example).");
+		globalEchoMultiplier = this.forgeConfig.getFloat("Global Echo Multiplier", categoryGeneral, 1.0f, 0.0f, 2.0f,
+				"The global volume multiplier of the echos, put to 0 to disable echos all together");
 
 		// performance
 		skipRainOcclusionTracing = this.forgeConfig.getBoolean("Skip Rain Occlusion Tracing", categoryPerformance, true,
@@ -132,9 +173,35 @@ private void syncConfig() {
 		snowReflectivity = this.forgeConfig.getFloat("Snow Reflectivity", categoryMaterialProperties, 0.2f, 0.0f, 1.0f,
 				"Sound reflectivity for snow blocks.");
 
+		// compatibility
+		computronicsPatching = this.forgeConfig.getBoolean("Patch Computronics", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches the Computronics sound sources so it works with Sound Physics.");
+		irPatching = this.forgeConfig.getBoolean("Patch Immersive Railroading", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches the Immersive Railroading sound sources so it works with Sound Physics.");
+		dsPatching = this.forgeConfig.getBoolean("Patch Dynamic Surroundings", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches Dynamic Surroundings to fix some bugs with Sound Physics.");
+		midnightPatching = this.forgeConfig.getBoolean("Patch The Midnight", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches The Midnight to disable redundant functionality that causes some problems.");
+		midnightPatchingFix = this.forgeConfig.getBoolean("Readd The Midnight Reverb", categoryCompatibility, true,
+				"If true, readds The Midnight reverb that is removed with the patch.");
+		ic2Patching = this.forgeConfig.getBoolean("Patch IC2", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches IC2 audio to better work with Sound Physics.");
+		glibyVCPatching = this.forgeConfig.getBoolean("Patch Gliby's Voice Chat", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches Gliby's VC's copied soundsystem classes to restore Sound Physics.");
+		glibyVCSrcPatching = this.forgeConfig.getBoolean("Patch Gliby's VC sources", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, patches Gliby's VC sources to work with Sound Physics.");
+		autoSteroDownmix = this.forgeConfig.getBoolean("Auto Stereo Downmix", categoryCompatibility, true,
+				"REQUIRES RESTART. If true, Automatically downmix stereo sounds that are loaded to mono");
+
+		// misc
+		autoSteroDownmixLogging = this.forgeConfig.getBoolean("Stereo downmix Logging", categoryMisc, false,
+				"If true, Prints sound name and format of the sounds that get converted");
+		injectorLogging = this.forgeConfig.getBoolean("Injector Logging", categoryMisc, false,
+				"If true, Logs debug info about the injector");
+
+		SoundPhysics.applyConfigChanges();
 		if (this.forgeConfig.hasChanged()) {
 			this.forgeConfig.save();
-			SoundPhysics.applyConfigChanges();
 		}
 	}