Skip to content

Made recipes removeable by crafttweaker #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 1.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 4 additions & 47 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ repositories {
url 'http://dvs1.progwml6.com/files/maven'
}
maven {
name "IC2"
url "http://maven.ic2.player.to/"
name "Curse Maven"
url "http://cursemaven.com"
}
}

dependencies {
compile 'net.industrial-craft:industrialcraft-2:2.8.27-ex112:dev'
compile 'curse.maven:ic2-242638:3838713'
deobfCompile "mezz.jei:jei_1.12.2:4.8.0.+"
//compile fileTree(dir: 'libs', include: ['*.jar'])
}
Expand All @@ -60,9 +60,6 @@ minecraft {
runDir = "run"
}

// CompactSolars uses git tagging to mark major versions. This sets up the project version to that version data
def versionInfo = getGitVersion()
version = "${project.minecraft.version}-${versionInfo['CompactSolars.version']}"



Expand Down Expand Up @@ -96,15 +93,6 @@ processResources
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}

// generate version.properties file from the git version data earlier
doLast {
def propsFile = new File(destinationDir, 'version.properties')
def properties = new Properties()
properties.putAll(versionInfo)
properties['CompactSolars.build.mcversion'] = project.minecraft.version
properties.store(propsFile.newWriter(), null)
}
}

// this sets our output jar to have a 'tag' of 'universal' on it
Expand Down Expand Up @@ -175,35 +163,4 @@ uploadArchives {
}
}
}
}

// This is a special task for pulling the version information from git and the environment (for BUILD_NUMBER)
def getGitVersion()
{
def out = [:]

// call git command.
def outStream = new ByteArrayOutputStream()
def result = exec {
executable = 'git'
args = [ 'describe', '--long', "--match=[^(jenkins)]*"]
standardOutput = outStream
}

def fullVersion = outStream.toString().trim()
def matcher = fullVersion =~ /(\d+).(\d+)-(\d+)-(.*)/

def maj = matcher[0][1]
def min = matcher[0][2]
def rev = matcher[0][3]
def bn = System.getenv("BUILD_NUMBER") ?: "1"

out['CompactSolars.build.major.number'] = maj.toString()
out['CompactSolars.build.minor.number'] = min.toString()
out['CompactSolars.build.revision.number'] = rev.toString()
out['CompactSolars.build.githash'] = matcher[0][4].toString()
out['CompactSolars.build.number' ] = bn.toString()
out['CompactSolars.version' ] = "${maj}.${min}.${rev}.${bn}".toString()

return out
}
}
5 changes: 3 additions & 2 deletions src/main/java/cpw/mods/compactsolars/CompactSolars.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,14 @@ public static void registerItems(Register<Item> event)
public void init(FMLInitializationEvent init)
{
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
CompactSolarType.generateRecipes(compactSolarBlock);
CompactSolarType.generateHatRecipes(compactSolarBlock);
}

@EventHandler
public void postInit(FMLPostInitializationEvent postinit)
{
CompactSolarType.generateRecipes(compactSolarBlock);
CompactSolarType.generateHatRecipes(compactSolarBlock);

}

@EventHandler
Expand Down