diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/.gitignore b/.gitignore index 30dbaa6..06f4704 100644 --- a/.gitignore +++ b/.gitignore @@ -20,23 +20,12 @@ build # other eclipse run -Build Mod.bat +*.bat CREDITS-fml.txt +forge-1.12.2-14.23.2.2615-changelog.txt forge-1.12.2-14.23.1.2584-changelog.txt -gradle.properties -gradle/wrapper/gradle-wrapper.jar -gradle/wrapper/gradle-wrapper.properties -gradle/wrapper/gradle-wrapper.jar -gradle/wrapper/gradle-wrapper.properties -gradlew LICENSE-new.txt MinecraftForge-Credits.txt Paulscode IBXM Library License.txt Paulscode SoundSystem CodecIBXM License.txt README.txt -setupCleanCache.bat -setupDecomp.bat -setupEclipse.bat -gradlew -gradle/wrapper/gradle-wrapper.properties -gradlew diff --git a/build.gradle b/build.gradle index bc00b12..e73318a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,61 +1,77 @@ buildscript { repositories { jcenter() - mavenLocal() - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } + maven { url = "http://files.minecraftforge.net/maven" } } - dependencies { + 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. + -group = "naturix.farts" -version = "1.12-" + getVersion("VERSION") -archivesBaseName = "Farts" -sourceCompatibility = targetCompatibility = "1.8" +version = "1.12.2.3" +group = "naturix.farts" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "farts" + +sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. +compileJava { + sourceCompatibility = targetCompatibility = '1.8' +} minecraft { - version = "1.12.2-14.23.1.2584" - mappings = "snapshot_20171003" - runDir = "run" + version = "1.12.2-14.23.2.2615" + runDir = "run" + + // the mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD snapshot are built nightly. + // stable_# stables are built at the discretion of the MCP team. + // Use non-default mappings at your own risk. they may not always work. + // simply re-run your setup task after changing the mappings to update your workspace. + mappings = "snapshot_20171003" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } -processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - from (sourceSets.main.resources.srcDirs) { - include "mcmod.info" - expand "version": project.version, "mcversion": project.minecraft.version - } - - from (sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } +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 + + // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, + // except that these dependencies get remapped to your current MCP mappings + //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' + //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // for more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + } -String getVersion(String type) { - String major = "0"; - String revision = "0"; - String patch = "0"; - String prefix = "public static final String $type = \""; - File file = file("src/main/java/naturix/farts/FartsMod.java") - file.eachLine { String s -> - s = s.trim(); - if (s.startsWith(prefix)) { - s = s.substring(prefix.length(), s.length() - 2); - String[] pts = s.split("\\."); - - major = pts[0]; - revision = pts[1]; - patch = pts[2]; - } - } - return "$major.$revision.$patch"; -} \ No newline at end of file +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' + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..6cd4c20 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +# 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=-Xmx6G diff --git a/src/main/java/naturix/farts/FartsMod.java b/src/main/java/naturix/farts/FartsMod.java index 258d338..4b25472 100644 --- a/src/main/java/naturix/farts/FartsMod.java +++ b/src/main/java/naturix/farts/FartsMod.java @@ -10,7 +10,7 @@ @Mod(modid = FartsMod.MODID, version = FartsMod.VERSION, name = FartsMod.NAME) public class FartsMod { public static final String MODID = "farts"; - public static final String VERSION = "1.12.2.2"; + public static final String VERSION = "1.12.2.3"; public static final String NAME = "Farts"; @SidedProxy(serverSide = "naturix.farts.proxy.CommonProxy", clientSide = "naturix.farts.proxy.ClientProxy") diff --git a/src/main/java/naturix/farts/init/ModSounds.java b/src/main/java/naturix/farts/init/ModSounds.java index a688b78..c87717f 100644 --- a/src/main/java/naturix/farts/init/ModSounds.java +++ b/src/main/java/naturix/farts/init/ModSounds.java @@ -30,6 +30,29 @@ public static List getList() { registerSound("fartsound11"); registerSound("fartsound12"); registerSound("fartsound13"); + registerSound("fartsound14"); + registerSound("fartsound15"); + registerSound("fartsound16"); + registerSound("fartsound17"); + registerSound("fartsound18"); + registerSound("fartsound19"); + registerSound("fartsound20"); + registerSound("fartsound21"); + registerSound("fartsound22"); + registerSound("fartsound23"); + registerSound("fartsound24"); + registerSound("fartsound25"); + registerSound("fartsound26"); + registerSound("fartsound27"); + registerSound("fartsound28"); + registerSound("fartsound29"); + registerSound("fartsound30"); + registerSound("fartsound31"); + registerSound("fartsound32"); + registerSound("fartsound33"); + registerSound("fartsound34"); + registerSound("fartsound35"); + registerSound("fartsound36"); } return FARTS_LIST; } diff --git a/src/main/java/naturix/farts/utils/FartUtils.java b/src/main/java/naturix/farts/utils/FartUtils.java index 50f54b6..934b966 100644 --- a/src/main/java/naturix/farts/utils/FartUtils.java +++ b/src/main/java/naturix/farts/utils/FartUtils.java @@ -12,7 +12,7 @@ public class FartUtils { public static SoundEvent getRandomFart(Random rand) { - int num = rand.nextInt(13); + int num = rand.nextInt(36); return ModSounds.getList().get(num); } diff --git a/src/main/resources/assets/farts/sounds.json b/src/main/resources/assets/farts/sounds.json index 7677f8f..cb8d459 100644 --- a/src/main/resources/assets/farts/sounds.json +++ b/src/main/resources/assets/farts/sounds.json @@ -76,5 +76,143 @@ "sounds": ["farts:fartsound13"], "subtitle": "farts.subtitle.fartsound" , "stream": true + }, + "fartsound14": { + "category": "player", + "sounds": ["farts:fartsound14"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound15": { + "category": "player", + "sounds": ["farts:fartsound15"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound16": { + "category": "player", + "sounds": ["farts:fartsound16"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound17": { + "category": "player", + "sounds": ["farts:fartsound17"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound18": { + "category": "player", + "sounds": ["farts:fartsound18"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound19": { + "category": "player", + "sounds": ["farts:fartsound19"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound20": { + "category": "player", + "sounds": ["farts:fartsound20"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound21": { + "category": "player", + "sounds": ["farts:fartsound21"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound22": { + "category": "player", + "sounds": ["farts:fartsound22"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound23": { + "category": "player", + "sounds": ["farts:fartsound23"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound24": { + "category": "player", + "sounds": ["farts:fartsound24"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound25": { + "category": "player", + "sounds": ["farts:fartsound25"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound26": { + "category": "player", + "sounds": ["farts:fartsound26"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound27": { + "category": "player", + "sounds": ["farts:fartsound27"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound28": { + "category": "player", + "sounds": ["farts:fartsound28"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound29": { + "category": "player", + "sounds": ["farts:fartsound29"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound30": { + "category": "player", + "sounds": ["farts:fartsound30"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound31": { + "category": "player", + "sounds": ["farts:fartsound31"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound32": { + "category": "player", + "sounds": ["farts:fartsound32"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound33": { + "category": "player", + "sounds": ["farts:fartsound33"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound34": { + "category": "player", + "sounds": ["farts:fartsound34"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound35": { + "category": "player", + "sounds": ["farts:fartsound35"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true + }, + "fartsound36": { + "category": "player", + "sounds": ["farts:fartsound36"], + "subtitle": "farts.subtitle.fartsound" , + "stream": true } } \ No newline at end of file diff --git a/src/main/resources/assets/farts/sounds/fartsound14.ogg b/src/main/resources/assets/farts/sounds/fartsound14.ogg new file mode 100644 index 0000000..dddc1ad Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound14.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound15.ogg b/src/main/resources/assets/farts/sounds/fartsound15.ogg new file mode 100644 index 0000000..fde3f1e Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound15.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound16.ogg b/src/main/resources/assets/farts/sounds/fartsound16.ogg new file mode 100644 index 0000000..2706415 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound16.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound17.ogg b/src/main/resources/assets/farts/sounds/fartsound17.ogg new file mode 100644 index 0000000..efa658a Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound17.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound18.ogg b/src/main/resources/assets/farts/sounds/fartsound18.ogg new file mode 100644 index 0000000..4e471c5 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound18.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound19.ogg b/src/main/resources/assets/farts/sounds/fartsound19.ogg new file mode 100644 index 0000000..39bbc8d Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound19.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound20.ogg b/src/main/resources/assets/farts/sounds/fartsound20.ogg new file mode 100644 index 0000000..9abc2bd Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound20.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound21.ogg b/src/main/resources/assets/farts/sounds/fartsound21.ogg new file mode 100644 index 0000000..b94a7c4 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound21.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound22.ogg b/src/main/resources/assets/farts/sounds/fartsound22.ogg new file mode 100644 index 0000000..c87600c Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound22.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound23.ogg b/src/main/resources/assets/farts/sounds/fartsound23.ogg new file mode 100644 index 0000000..98f7946 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound23.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound24.ogg b/src/main/resources/assets/farts/sounds/fartsound24.ogg new file mode 100644 index 0000000..6e0c32f Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound24.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound25.ogg b/src/main/resources/assets/farts/sounds/fartsound25.ogg new file mode 100644 index 0000000..f0eb119 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound25.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound26.ogg b/src/main/resources/assets/farts/sounds/fartsound26.ogg new file mode 100644 index 0000000..b66ad18 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound26.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound27.ogg b/src/main/resources/assets/farts/sounds/fartsound27.ogg new file mode 100644 index 0000000..bd0c1e7 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound27.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound28.ogg b/src/main/resources/assets/farts/sounds/fartsound28.ogg new file mode 100644 index 0000000..3208cd5 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound28.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound29.ogg b/src/main/resources/assets/farts/sounds/fartsound29.ogg new file mode 100644 index 0000000..fa5b633 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound29.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound30.ogg b/src/main/resources/assets/farts/sounds/fartsound30.ogg new file mode 100644 index 0000000..a45ba35 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound30.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound31.ogg b/src/main/resources/assets/farts/sounds/fartsound31.ogg new file mode 100644 index 0000000..649fad1 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound31.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound32.ogg b/src/main/resources/assets/farts/sounds/fartsound32.ogg new file mode 100644 index 0000000..5f1cd57 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound32.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound33.ogg b/src/main/resources/assets/farts/sounds/fartsound33.ogg new file mode 100644 index 0000000..5518ab4 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound33.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound34.ogg b/src/main/resources/assets/farts/sounds/fartsound34.ogg new file mode 100644 index 0000000..616584b Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound34.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound35.ogg b/src/main/resources/assets/farts/sounds/fartsound35.ogg new file mode 100644 index 0000000..d0177fb Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound35.ogg differ diff --git a/src/main/resources/assets/farts/sounds/fartsound36.ogg b/src/main/resources/assets/farts/sounds/fartsound36.ogg new file mode 100644 index 0000000..5969508 Binary files /dev/null and b/src/main/resources/assets/farts/sounds/fartsound36.ogg differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d346417..0cf48ef 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -13,4 +13,4 @@ "screenshots": [], "dependencies": [] } -] +] \ No newline at end of file