Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

addFacade with an ItemStack of 0 would create a facade recipe without a block

Browse source 
fixed some spelling mistakes in build.grade
added IDEA project files to .gitignore
This commit is contained in:
Cisien 2014-02-23 15:24:49 -08:00
parent 30207353d3
commit b039726ef1
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -6,6 +6,8 @@ bin
#idea
*.iml
*.ipr
*.iws
.idea
out
@ -13,3 +15,5 @@ out
build
.gradle
#runtime
run

21
build.gradle
View file

@ -1,5 +1,5 @@
// DONT TOUCH THE BUILDSCTPT[] BLOCK
// its special, and it is only there to make forgegradle work correctly.
// DON'T TOUCH THE BUILDSCTPT[] BLOCK
// its special, and it is only there to make ForgeGradle work correctly.
buildscript {
repositories {
@ -18,8 +18,8 @@ buildscript {
}
}
apply plugin: 'forge' // adds the forge cuntionality
apply plugin: 'maven' // for uploading to a mnven repo
apply plugin: 'forge' // adds the forge dependency
apply plugin: 'maven' // for uploading to a maven repo
// grab buildNumber
ext.buildnumber = 0 // this will be referenced as simply project.buildnumber from now on.
@ -36,7 +36,7 @@ archivesBaseName = "buildcraft" // the name that all artifacts will use as a bas
minecraft {
version = "1.7.2-10.12.0.1029" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually.
assetDir = "run/assets" // the palce for FOrgegradle to download the assets. The assets that the launcher gets and stuff
assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff
// replacing stuff in the source
replace '@VERSION@', project.version
@ -58,7 +58,6 @@ sourceSets {
exclude '**/.md' // exclude readme from localization repo
// exclude 'some exclusion'
// include 'some inclusion'
}
}
}
@ -70,11 +69,11 @@ processResources
include 'mcmod.info'
// replace version and mcversion
// ${version} and ${mcversion} are the exact strings bieng replaced
// ${version} and ${mcversion} are the exact strings being replaced
expand 'version':project.version, 'mcversion':project.minecraft.version, 'buildnumber':project.buildnumber
}
// copy everything else, thats not the mcmod.info
// copy everything else, that's not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
@ -84,7 +83,7 @@ processResources
// extra jar section
// -------------------
// for the benfit of the jars, we will now now add the buildnumber to the jars
// for the benefit of the jars, we will now now add the buildnumber to the jars
project.version += '.' + project.buildnumber
// add a source jar
@ -124,7 +123,7 @@ dependencies {
// specify artifacts to be uploaded
artifacts {
// the default jar is already here by defualt
// the default jar is already here by default
archives sourceJar
archives javadocJar
archives deobfJar
@ -156,7 +155,7 @@ uploadArchives {
project {
name project.archivesBaseName
packaging 'jar'
description 'A Minecraft mod adding all sourts of machinery'
description 'A Minecraft mod adding all sorts of machinery'
url 'http://www.mod-buildcraft.com/'
scm {

5
common/buildcraft/transport/ItemFacade.java
View file

@ -233,6 +233,10 @@ public class ItemFacade extends ItemBuildCraft {
}
public static void addFacade(ItemStack itemStack) {
if(itemStack.stackSize == 0) {
itemStack.stackSize = 1;
}
ItemStack facade = getStack(Block.getBlockFromItem(itemStack.getItem()), itemStack.getItemDamage());
if(!allFacades.contains(facade)) {
allFacades.add(facade);
@ -240,6 +244,7 @@ public class ItemFacade extends ItemBuildCraft {
ItemStack facade6 = facade.copy();
facade6.stackSize = 6;
System.out.println("Facade added for "+ itemStack.toString());
// 3 Structurepipes + this block makes 6 facades
BuildcraftRecipes.assemblyTable.addRecipe(8000, facade6, new ItemStack(BuildCraftTransport.pipeStructureCobblestone, 3), itemStack);
}