From 2e192ff29c33be9e35ef0bb752a63790ddeff14d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 10 Oct 2016 10:57:29 -0400 Subject: [PATCH] Attempted to add a new schematic, but for some reason the generated schematic is non-functional. (Divination Sigil is in testing mode) Added some more stuff to the Downgrade ritual. --- .../item/sigil/ItemSigilDivination.java | 18 +++---- .../bloodmagic/registry/ModRecipes.java | 18 ++++++- .../bloodmagic/structures/DungeonRoom.java | 5 +- .../assets/bloodmagic/lang/en_US.lang | 9 ++++ .../bloodmagic/schematics/RawBuilding1.json | 47 ++++++++++++++++++ .../bloodmagic/schematics/Schematics.json | 3 +- .../bloodmagic/structures/Building1.nbt | Bin 0 -> 8120 bytes 7 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/schematics/RawBuilding1.json create mode 100644 src/main/resources/assets/bloodmagic/structures/Building1.nbt diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index c12dc127..6a9b83a0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -12,12 +12,12 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; +import WayofTime.bloodmagic.structures.DungeonTester; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.tile.TileInversionPillar; import WayofTime.bloodmagic.util.ChatUtil; @@ -33,13 +33,13 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader @Override public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { -// if (world instanceof WorldServer) -// { -// System.out.println("Testing..."); -//// BuildTestStructure s = new BuildTestStructure(); -//// s.placeStructureAtPosition(new Random(), Rotation.CLOCKWISE_180, (WorldServer) world, player.getPosition(), 0); -// DungeonTester.testDungeonElementWithOutput((WorldServer) world, player.getPosition()); -// } + if (world instanceof WorldServer) + { + System.out.println("Testing..."); +// BuildTestStructure s = new BuildTestStructure(); +// s.placeStructureAtPosition(new Random(), Rotation.CLOCKWISE_180, (WorldServer) world, player.getPosition(), 0); + DungeonTester.testDungeonElementWithOutput((WorldServer) world, player.getPosition()); + } // if (!world.isRemote) // { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 35a79b64..b7088f96 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -56,6 +56,8 @@ import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.soul.ItemSoulGem; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease; +import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched; import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe; @@ -482,9 +484,13 @@ public class ModRecipes String messageBase = "ritual.BloodMagic.downgradeRitual.dialogue."; ItemStack bowStack = new ItemStack(Items.BOW); + ItemStack bottleStack = new ItemStack(Items.POTIONITEM, 1, 0); + ItemStack swordStack = new ItemStack(Items.STONE_SWORD); Map> dialogueMap = new HashMap>(); dialogueMap.put(bowStack, Pair.of("bow", new int[] { 1, 100, 300, 500 })); + dialogueMap.put(bottleStack, Pair.of("quenched", new int[] { 1, 100, 300, 500 })); + dialogueMap.put(swordStack, Pair.of("dulledBlade", new int[] { 1, 100, 300, 500, 700 })); for (Entry> entry : dialogueMap.entrySet()) { @@ -494,14 +500,22 @@ public class ModRecipes for (int tick : entry.getValue().getValue()) { List textList = new ArrayList(); - textList.add(new TextComponentTranslation(messageBase + str + "." + tick)); + textList.add(new TextComponentTranslation("\u00A74%s", new TextComponentTranslation(messageBase + str + "." + tick))); textMap.put(tick, textList); } LivingArmourDowngradeRecipeRegistry.registerDialog(keyStack, textMap); } - LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(0), bowStack, "gemDiamond"); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(0), bowStack, Items.ARROW, Items.STRING, "ingotIron", "ingotIron"); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(1), bowStack, Items.SPECTRAL_ARROW, "ingotGold", "dustRedstone", "dustGlowstone", "gemLapis"); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(2), bowStack, "gemDiamond", Items.FIRE_CHARGE, Items.BLAZE_ROD, Items.FEATHER); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(3), bowStack, Items.PRISMARINE_SHARD, Items.BLAZE_ROD, Items.FEATHER, Items.FEATHER); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeStormTrooper(4), bowStack, new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.TIPPED_ARROW, 1, OreDictionary.WILDCARD_VALUE)); // LivingArmourDowngradeRecipeRegistry.registerDialog(bowStack, bowMap); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeQuenched(0), bottleStack, Items.DRAGON_BREATH); + + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeMeleeDecrease(0), swordStack, Items.IRON_SWORD, Blocks.CACTUS); + LivingArmourDowngradeRecipeRegistry.registerRecipe(new LivingArmourUpgradeMeleeDecrease(1), swordStack, Items.IRON_SWORD, "dustRedstone"); } } diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index ed72b577..04f41737 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -67,7 +67,10 @@ public class DungeonRoom DungeonStructure structure = new DungeonStructure(location); BlockPos offsetPos = Template.transformedBlockPos(settings, entry.getValue()); - structure.placeStructureAtPosition(rand, settings, world, pos.add(offsetPos)); + if (structure.placeStructureAtPosition(rand, settings, world, pos.add(offsetPos))) + { + System.out.println(location); + } } return true; diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 5a55b13e..ac8d4085 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -673,6 +673,15 @@ ritual.BloodMagic.downgradeRitual.dialogue.bow.1=So, mortal, you want to gain mo ritual.BloodMagic.downgradeRitual.dialogue.bow.100=Of course you must know that everything has a cost... I cannot simply grant you more power without you paying something in return... ritual.BloodMagic.downgradeRitual.dialogue.bow.300=If you lay an offering before me, you will forsake your perception, preventing you from using long-ranged projectiles with any form of accuracy. Arrows will no longer be your key to victory. ritual.BloodMagic.downgradeRitual.dialogue.bow.500=But in return, I will unlock your armour so that it may grow even further... All you have to do is kneel before this altar with the correct offering... +ritual.BloodMagic.downgradeRitual.dialogue.quenched.1=Fufufu... Greetings. I see that you wish to become more powerful. +ritual.BloodMagic.downgradeRitual.dialogue.quenched.100=You must be fully aware that when one's cup becomes full, it invariably has to empty once more to be filled again. +ritual.BloodMagic.downgradeRitual.dialogue.quenched.300=As such, I offer you a deal: by forsaking one's ability to drink, I shall grant you a vast increase to your potential. Wether this is a deal you think is worth taking is another matter entirely... +ritual.BloodMagic.downgradeRitual.dialogue.quenched.500=So kneel, mortal, and drink from this cup that I offer to you, for it may be your last drink. +ritual.BloodMagic.downgradeRitual.dialogue.dulledBlade.1=Hmmm... What is it that you truely desire? +ritual.BloodMagic.downgradeRitual.dialogue.dulledBlade.100=If it is strength beyond mortal men, then I cannot provide that - instead, I can offer you different deal... +ritual.BloodMagic.downgradeRitual.dialogue.dulledBlade.300=I can expand the capabilities of your armour, allowing you to achieve greater heights. However, I will need something from you in return: your strength in physical combat. +ritual.BloodMagic.downgradeRitual.dialogue.dulledBlade.500=By agreeing to this, you will no longer be able to swing a weapon with as much certainty, only able to do a fraction of the damage you could before. +ritual.BloodMagic.downgradeRitual.dialogue.dulledBlade.700=So, the choise is yours: will you kneel at this altar, or will you still take up your sword? # Chat chat.BloodMagic.altarMaker.setTier=Set Tier to: %d diff --git a/src/main/resources/assets/bloodmagic/schematics/RawBuilding1.json b/src/main/resources/assets/bloodmagic/schematics/RawBuilding1.json new file mode 100644 index 00000000..007753c7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/schematics/RawBuilding1.json @@ -0,0 +1,47 @@ +{ + "dungeonWeight": 4, + "structureMap": { + "bloodmagic:Building1": { + "x": 0, + "y": 0, + "z": 0 + } + }, + "doorMap": { + "south": [ + { + "x": 7, + "y": 0, + "z": 14 + }, + { + "x": 4, + "y": 8, + "z": 14 + } + ], + "north": [ + { + "x": 4, + "y": 8, + "z": 0 + } + ] + }, + "descriptorList": [ + { + "minimumOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "maximumOffset": { + "x": 15, + "y": 13, + "z": 15 + }, + "blockPosCache": [], + "cache": true + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/Schematics.json b/src/main/resources/assets/bloodmagic/schematics/Schematics.json index a2f649f3..7590e9f6 100644 --- a/src/main/resources/assets/bloodmagic/schematics/Schematics.json +++ b/src/main/resources/assets/bloodmagic/schematics/Schematics.json @@ -1,4 +1,5 @@ [ "bloodmagic:Corridor1", - "bloodmagic:HallChest1" + "bloodmagic:HallChest1", + "bloodmagic:RawBuilding1" ] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/structures/Building1.nbt b/src/main/resources/assets/bloodmagic/structures/Building1.nbt new file mode 100644 index 0000000000000000000000000000000000000000..13fd2edfbbf780ac8e442d01a5eb60104e3897e9 GIT binary patch literal 8120 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 literal 0 HcmV?d00001