Skip to content

Commit

Permalink
fixed uncrafting message not clearing when shift-clicking from output…
Browse files Browse the repository at this point in the history
… grid
  • Loading branch information
crazysnailboy committed Jul 13, 2017
1 parent 4dd4704 commit ba92d57
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge'


version = "1.8-beta3"
version = "1.8-beta4"
group = "org.jglrxavpok.mods.decraft"
archivesBaseName = "[1.12]UncraftingTable"

Expand All @@ -21,9 +21,9 @@ compileJava {
}

minecraft {
version = "1.12-14.21.0.2363"
version = "1.12-14.21.1.2387"
runDir = "run"
mappings = "snapshot_20170625"
mappings = "snapshot_20170629"
makeObfSourceJar = false

replace "\${version}", project.version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,14 @@ else if (inventory == uncraftIn)
if (this.uncraftingResult.resultType != ResultType.UNCRAFTED)
{
// update the uncrafting result type for the updated input stack
UncraftingManager.recalculateResultType(uncraftingResult, playerInventory.player, uncraftIn.getStackInSlot(0));
if (this.uncraftingResult.resultType == ResultType.INACTIVE)
{
this.uncraftingResult = UncraftingManager.getUncraftingResult(playerInventory.player, inputStack);
}
else
{
UncraftingManager.recalculateResultType(uncraftingResult, playerInventory.player, inputStack);
}

// if the item in the input stack can be uncrafted...
if (this.uncraftingResult.canPopulateInventory())
Expand Down Expand Up @@ -527,6 +534,12 @@ else if (slot.inventory.equals(uncraftOut))
// clear the slot
slot.putStack(ItemStack.EMPTY);

if (uncraftOut.isEmpty())
{
this.uncraftingResult = new UncraftingResult();
}


return stack;
}
else
Expand Down
5 changes: 3 additions & 2 deletions update.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"homepage": "https://minecraft.curseforge.com/projects/jglrxavpoks-uncrafting-table/files/",
"promos": {
"1.12-latest": "1.8-beta3",
"1.12-recommended": "1.8-beta3"
"1.12-latest": "1.8-beta4",
"1.12-recommended": "1.8-beta4"
},
"1.12": {
"1.8-beta4": "Converted recipes to JSON, minor bug fixes",
"1.8-beta3": "Changed registrations to work with Forge 2363 and later",
"1.8-beta2": "Changed recipe registration to work with Forge 2324 and later",
"1.8-beta1": "Initial 1.12 release"
Expand Down

0 comments on commit ba92d57

Please sign in to comment.