From c522c013d7065dbaa810dff862ee11a636c33856 Mon Sep 17 00:00:00 2001 From: Srdra <99605300+srdr2k3@users.noreply.github.com> Date: Fri, 9 May 2025 17:40:45 +0200 Subject: [PATCH 1/4] Change Incense recipes to make them available earlier --- .../common/items/ItemIncense.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index 2a38bf21..ca8c1da7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -142,6 +142,9 @@ public class ItemIncense extends Item implements IIncense { ItemStack quartzStack = new ItemStack(Items.quartz, 1, WILDCARD); ItemStack blazePowderStack = new ItemStack(Items.blaze_powder); ItemStack netherwartStack = new ItemStack(Items.nether_wart); + + ItemStack blankSlateStack = new ItemStack(ModItems.blankSlate); + ItemStack reinforcedSlateStack = new ItemStack(ModItems.reinforcedSlate); ItemStack fracturedBoneStack = new ItemStack(ModItems.baseAlchemyItems, 1, 5); ItemStack woodashStack = new ItemStack(ModItems.itemIncense, 1, 0); @@ -156,7 +159,7 @@ public class ItemIncense extends Item implements IIncense { new ItemStack(Items.redstone), leavesStack, leavesStack, - new ItemStack(ModItems.apprenticeBloodOrb))); + new ItemStack(ModItems.weakBloodOrb))); GameRegistry.addRecipe( new ShapelessBloodOrbRecipe( new ItemStack(ModItems.itemIncense, 1, 2), @@ -168,7 +171,7 @@ public class ItemIncense extends Item implements IIncense { glowstoneStack, stringStack, stringStack, - new ItemStack(ModItems.magicianBloodOrb))); + new ItemStack(ModItems.apprenticeBloodOrb))); GameRegistry.addRecipe( new ShapelessBloodOrbRecipe( new ItemStack(ModItems.itemIncense, 1, 3), @@ -178,7 +181,8 @@ public class ItemIncense extends Item implements IIncense { soulSandStack, gunpowderStack, fermentedEyeStack, - new ItemStack(ModItems.masterBloodOrb))); + blankSlateStack, + new ItemStack(ModItems.apprenticeBloodOrb))); GameRegistry.addRecipe( new ShapelessBloodOrbRecipe( new ItemStack(ModItems.itemIncense, 1, 4), @@ -189,8 +193,8 @@ public class ItemIncense extends Item implements IIncense { netherwartStack, blazePowderStack, fracturedBoneStack, - goldNuggetStack, - new ItemStack(ModItems.archmageBloodOrb))); + reinforcedSlateStack, + new ItemStack(ModItems.masterBloodOrb))); } public enum EnumIncense { From 825f28d8f1d2db8d4b2be1f3eaad3e5063560822 Mon Sep 17 00:00:00 2001 From: Srdra <99605300+srdr2k3@users.noreply.github.com> Date: Fri, 9 May 2025 17:41:35 +0200 Subject: [PATCH 2/4] Buff incenses --- .../alchemicalWizardry/common/items/ItemIncense.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index ca8c1da7..fa68827f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -199,11 +199,11 @@ public class ItemIncense extends Item implements IIncense { public enum EnumIncense { - WOODASH(0, 200, 1.0f, 1000, 0.937f, 0.898f, 0.820f), - RED(200, 600, 1.5f, 1000, 1.0f, 0, 0), - BLUE(600, 1200, 3.0f, 1000, 0, 0, 1.0f), - GREEN(1200, 2000, 4.0f, 1000, 0, 1.0f, 0), - PURPLE(2000, 3000, 5.0f, 1000, 1.0f, 0, 1.0f); + WOODASH(0, 400, 1.0f, 2000, 0.937f, 0.898f, 0.820f), + RED(400, 800, 1.5f, 2000, 1.0f, 0, 0), + BLUE(800, 1500, 3.0f, 2000, 0, 0, 1.0f), + GREEN(1500, 2400, 4.0f, 2000, 0, 1.0f, 0), + PURPLE(2400, 3500, 5.0f, 2000, 1.0f, 0, 1.0f); public final int minValue; public final int maxValue; From 97cd95d5e16b5cb226a016453de9bcd1ada02b11 Mon Sep 17 00:00:00 2001 From: Srdra <99605300+srdr2k3@users.noreply.github.com> Date: Fri, 9 May 2025 17:41:47 +0200 Subject: [PATCH 3/4] Buff Soul Fray --- .../api/sacrifice/PlayerSacrificeHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java index 496ccca7..94b56ed2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java @@ -13,7 +13,7 @@ import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; public class PlayerSacrificeHandler { public static float scalingOfSacrifice = 0.001f; - public static int soulFrayDuration = 400; + public static int soulFrayDuration = 240; public static Potion soulFrayId; public static float getPlayerIncense(EntityPlayer player) { From edc839b1093de6e5053b8cd5385fb4befd34c3b7 Mon Sep 17 00:00:00 2001 From: Srdra <99605300+srdr2k3@users.noreply.github.com> Date: Sat, 10 May 2025 13:18:30 +0200 Subject: [PATCH 4/4] Oopsies, thought master orb came after apprentice --- .../WayofTime/alchemicalWizardry/common/items/ItemIncense.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index fa68827f..becf7a50 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -194,7 +194,7 @@ public class ItemIncense extends Item implements IIncense { blazePowderStack, fracturedBoneStack, reinforcedSlateStack, - new ItemStack(ModItems.masterBloodOrb))); + new ItemStack(ModItems.magicianBloodOrb))); } public enum EnumIncense {