Skip to content

Commit

Permalink
Craftguide fix (AGAIN!!!)
Browse files Browse the repository at this point in the history
I found out that kiln recipes will crash craftguide if the dropped id isn't set in the recipe ingredient block
  • Loading branch information
Spicy-Boy committed Jun 20, 2024
1 parent adb07b7 commit 6f7af52
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
minecraft/uristqwerty
minecraft/net/minecraft/src/CraftGuide_Vanilla.java
minecraft/net/minecraft/src/GuiAchievement.java
8 changes: 8 additions & 0 deletions minecraft/net/minecraft/src/DecoBlockTerracottaUnfired.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ public int GetCookTimeMultiplierInKiln( IBlockAccess blockAccess, int i, int j,
{
return 4; //same as bricks
}

@Override
public int GetItemIndexDroppedWhenCookedByKiln( IBlockAccess blockAccess, int i, int j, int k )
{
return SuperBTWDefinitions.terracotta.blockID;
}

//TODO: Packing! How do I add complex packing that considers 2 different ingredients, though?

Expand All @@ -54,4 +60,6 @@ public void RenderBlockSecondPass(RenderBlocks var1, int var2, int var3, int var
{
this.RenderCookingByKilnOverlay(var1, var2, var3, var4, var5);
}


}
7 changes: 2 additions & 5 deletions minecraft/net/minecraft/src/SuperBTWRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,6 @@ private static void addMiscRecipes()
new ItemStack[] { new ItemStack(FCBetterThanWolves.fcItemTannedLeatherCut) });
}




// branch recipes!
FCRecipes.AddShapelessRecipe(new ItemStack(FCBetterThanWolves.fcBlockTorchFiniteUnlit, 1),
new ItemStack[] { new ItemStack(Item.coal), new ItemStack(SuperBTWDefinitions.branch) });
Expand Down Expand Up @@ -570,7 +567,7 @@ private static void addMiscRecipes()
new ItemStack( SuperBTWDefinitions.chunkIronSintered, 1 ),
new ItemStack[] {
new ItemStack( FCBetterThanWolves.fcItemPileIronOre, 1 ),
new ItemStack( FCBetterThanWolves.fcItemCoalDust, 1 )
new ItemStack( FCBetterThanWolves.fcItemCoalDust, 1 ),
} );
AddRecipe( new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage ), new Object[] {
"###",
Expand All @@ -580,7 +577,7 @@ private static void addMiscRecipes()
} );

AddShapelessRecipe( new ItemStack( SuperBTWDefinitions.chunkIronSintered, 9 ), new Object[] {
new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage )
new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage ),
} );

FurnaceRecipes.smelting().addSmelting( SuperBTWDefinitions.chunkIronSintered.itemID, new ItemStack( FCBetterThanWolves.fcItemNuggetIron ), 0, 3 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ public void OnCookedByKiln(World var1, int var2, int var3, int var4) {
var1.setBlockWithNotify(var2, var3, var4, 0);
FCUtilsItem.EjectSingleItemWithRandomOffset(var1, var2, var3, var4, SuperBTWDefinitions.terracotta.blockID, 0);
}

@Override
public int GetItemIndexDroppedWhenCookedByKiln( IBlockAccess blockAccess, int i, int j, int k )
{
return SuperBTWDefinitions.terracotta.blockID;
}

@Override
public int GetCookTimeMultiplierInKiln( IBlockAccess blockAccess, int i, int j, int k )
Expand Down
6 changes: 2 additions & 4 deletions minecraft_server/net/minecraft/src/SuperBTWRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ private static void addMiscRecipes()
new ItemStack( SuperBTWDefinitions.chunkIronSintered, 1 ),
new ItemStack[] {
new ItemStack( FCBetterThanWolves.fcItemPileIronOre, 1 ),
new ItemStack( FCBetterThanWolves.fcItemCoalDust, 1 )
new ItemStack( FCBetterThanWolves.fcItemCoalDust, 1 ),
} );
AddRecipe( new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage ), new Object[] {
"###",
Expand All @@ -580,12 +580,10 @@ private static void addMiscRecipes()
} );

AddShapelessRecipe( new ItemStack( SuperBTWDefinitions.chunkIronSintered, 9 ), new Object[] {
new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage )
new ItemStack( SuperBTWDefinitions.blockIronSinteredStorage ),
} );

FurnaceRecipes.smelting().addSmelting( SuperBTWDefinitions.chunkIronSintered.itemID, new ItemStack( FCBetterThanWolves.fcItemNuggetIron ), 0, 3 );



AddStokedCrucibleRecipe(new ItemStack(SuperBTWDefinitions.rib, 1),
new ItemStack[] { new ItemStack(SuperBTWDefinitions.cowRib) });
Expand Down

0 comments on commit 6f7af52

Please sign in to comment.