Skip to content

Commit

Permalink
added 25ish new farts
Browse files Browse the repository at this point in the history
  • Loading branch information
NicosaurusRex99 committed Feb 21, 2018
1 parent d144d28 commit eb75dfc
Show file tree
Hide file tree
Showing 32 changed files with 231 additions and 64 deletions.
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

15 changes: 2 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
108 changes: 62 additions & 46 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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";
}
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'
}
}
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/main/java/naturix/farts/FartsMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/naturix/farts/init/ModSounds.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,29 @@ public static List<SoundEvent> 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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/naturix/farts/utils/FartUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
138 changes: 138 additions & 0 deletions src/main/resources/assets/farts/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"screenshots": [],
"dependencies": []
}
]
]

0 comments on commit eb75dfc

Please sign in to comment.