Skip to content

Commit

Permalink
Ported v1.4.0 from morefuelsmod-bleeding to morefuelsmod-1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
defnotanalt committed Jul 18, 2016
1 parent 9eaff28 commit 87c9324
Show file tree
Hide file tree
Showing 335 changed files with 24,661 additions and 0 deletions.
67 changes: 67 additions & 0 deletions .classpath

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .gitignore
@@ -0,0 +1,9 @@
/MinecraftForge-Credits.txt
/MinecraftForge-License.txt
/Paulscode SoundSystem CodecIBXM License.txt
/Paulscode IBXM Library License.txt
/LICENSE-fml.txt
/CREDITS-fml.txt
/morefuelsmod-1.9_Server.launch
/morefuelsmod-1.9_Client.launch
/forge-1.9.4-12.17.0.1976-changelog.txt
1 change: 1 addition & 0 deletions .gradle/2.7/taskArtifacts/cache.properties
@@ -0,0 +1 @@
#Mon Jul 18 01:21:11 EDT 2016
Binary file added .gradle/2.7/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file added .gradle/2.7/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file added .gradle/2.7/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file added .gradle/2.7/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file added .gradle/2.7/taskArtifacts/taskArtifacts.bin
Binary file not shown.
34 changes: 34 additions & 0 deletions .gradle/gradle.log
@@ -0,0 +1,34 @@
#################################################
ForgeGradle 2.2-SNAPSHOT-0447b4e
https://github.com/MinecraftForge/ForgeGradle
#################################################
Powered by MCP unknown
http://modcoderpack.com
by: Searge, ProfMobius, Fesh0r,
R4wk, ZeuX, IngisKahn, bspkrs
#################################################
:deobfCompileDummyTask
:deobfProvidedDummyTask
:eclipseClasspath
:eclipseJdt
:eclipseProject
:getVersionJson
:extractNatives SKIPPED
:extractUserdev UP-TO-DATE
:getAssetIndex UP-TO-DATE
:getAssets
Current status: 282/1049 26%
Current status: 365/1049 34%
Current status: 452/1049 43%
Current status: 608/1049 57%
Current status: 820/1049 78%
Current status: 879/1049 83%
Current status: 1039/1049 99%
:makeStart
:makeEclipseCleanRunClient UP-TO-DATE
:makeEclipseCleanRunServer UP-TO-DATE
:eclipse

BUILD SUCCESSFUL

Total time: 13.487 secs
24 changes: 24 additions & 0 deletions .project
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>morefuelsmod-1.9</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
<link>
<name>.link1</name>
<type>2</type>
<location>C:/Users/Noah/.gradle/caches/minecraft/net/minecraftforge/forge/1.9.4-12.17.0.1976/start</location>
</link>
</linkedResources>
</projectDescription>
13 changes: 13 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
#
#Mon Jul 18 01:29:07 EDT 2016
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
59 changes: 59 additions & 0 deletions README.txt
@@ -0,0 +1,59 @@
-------------------------------------------
Source installation information for modders
-------------------------------------------
This code follows the Minecraft Forge installation methodology. It will apply
some small patches to the vanilla MCP source code, giving you and it access
to some of the data and functions you need to build a successful mod.

Note also that the patches are built against "unrenamed" MCP source code (aka
srgnames) - this means that you will not be able to read them directly against
normal code.

Source pack installation information:

Standalone source installation
==============================

Step 1: Open your command-line and browse to the folder where you extracted the zip file.

Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:

Windows: "gradlew setupDecompWorkspace"
Linux/Mac OS: "./gradlew setupDecompWorkspace"

Step 3: After all that finished, you're left with a choice.
For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)

If you preffer to use IntelliJ, steps are a little different.
1. Open IDEA, and import project.
2. Select your build.gradle file and have it import.
3. Once it's finished you must close IntelliJ and run the following command:

"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)

Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)

If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again.

Should it still not work,
Refer to #ForgeGradle on EsperNet for more information about the gradle environment.

Tip:
If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code.
"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.

Tip:
When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE.

Forge source installation
=========================
MinecraftForge ships with this code and installs it as part of the forge
installation process, no further action is required on your part.

LexManos' Install Video
=======================
https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be

For more details update more often refer to the Forge Forums:
http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
16 changes: 16 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/blockstates/cokeBlock.json
@@ -0,0 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"all": "morefuelsmod-1.9.4:blocks/cokeBlock"
}
},
"variants": {
"normal": {
"model": "cube_all"
},
"inventory": {
"model": "cube_all"
}
}
}
@@ -0,0 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"all": "morefuelsmod-1.9.4:blocks/concentratedPelletBlock"
}
},
"variants": {
"normal": {
"model": "cube_all"
},
"inventory": {
"model": "cube_all"
}
}
}
16 changes: 16 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/blockstates/pelletBlock.json
@@ -0,0 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"all": "morefuelsmod-1.9.4:blocks/pelletBlock"
}
},
"variants": {
"normal": {
"model": "cube_all"
},
"inventory": {
"model": "cube_all"
}
}
}
17 changes: 17 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/lang/en_US.lang
@@ -0,0 +1,17 @@
#Items
item.pelletsFuel.name=Fuel Pellets
item.concentratedPelletsFuel.name=Concentrated Fuel Pellets
item.coke.name=Coke
item.bituminousCoal.name=Bituminous Coal
item.canSlimoline.name=Can of Slimoline
item.dustCoal.name=Coal Dust
item.bitumen.name=Bitumen

#Blocks
tile.pelletBlock.name=Block of Pellet Fuel
tile.concentratedPelletBlock.name=Block of Concentrated Pellet Fuel
tile.cokeBlock.name=Block of Coke

#Tabs

itemGroup.morefuelsmod-1.9.4=More Fuels Mod
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/bitumen.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/bitumen"
}
}
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/bituminousCoal.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/bituminousCoal"
}
}
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/canSlimoline.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/canSlimoline"
}
}
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/coke.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/coke"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/concentratedPelletsFuel"
}
}
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/dustCoal.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/dustCoal"
}
}
6 changes: 6 additions & 0 deletions bin/assets/morefuelsmod-1.9.4/models/item/pelletsFuel.json
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "morefuelsmod-1.9.4:items/pelletsFuel"
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/com/bored/morefuelsmod/Fuels.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/Main.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/ModCrafting.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/ModSmelting.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/RFtL.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/block/BlockBase.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/block/BlockOre.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/block/ModBlocks.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/client/MoreFuelsTab.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/item/ItemBase.class
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/item/ModItems.class
Binary file not shown.
Binary file not shown.
Binary file added bin/com/bored/morefuelsmod/proxy/CommonProxy.class
Binary file not shown.
15 changes: 15 additions & 0 deletions bin/mcmod.info
@@ -0,0 +1,15 @@
[
{
"modid": "morefuelsmod-1.9.4",
"name": "§4More Fuels Mod",
"description": "§4§oA mod that makes more items usable as fuel as well as adds some fuel storage items and blocks.",
"version": "",
"mcversion": "${mcversion}",
"url": "http://tinyurl.com/MoreFuelsMod",
"updateUrl": "",
"authorList": ["§6Noah §4Martino"],
"logoFile": "mf-logo.png",
"screenshots": [],
"dependencies": ["mod_Forge"]
}
]
Binary file added bin/mf-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 82 additions & 0 deletions build.gradle
@@ -0,0 +1,82 @@

// For those who want the bleeding edge
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'

/*
// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "1.4.0"
group= "com.bored.morefuelsmod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "morefuelsmod-1.9.4"

minecraft {
version = "1.9.4-12.17.0.1976"
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 allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20160518"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

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

}

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'
}
}

0 comments on commit 87c9324

Please sign in to comment.