From 389910f716d204a54dad8c779538adf5f2e1ddc0 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 24 Jan 2015 08:18:58 -0500 Subject: [PATCH] Book tests and Movage of Int3 --- .../AlchemicalWizardry.java | 4 +- .../{common => api}/Int3.java | 2 +- .../api/RoutingFocusPosAndFacing.java | 1 - .../api/rituals/LocalRitualStorage.java | 2 +- .../common/book/BUEntries.java | 50 ++++++++++++------- .../common/demonVillage/BlockSet.java | 2 +- .../demonVillage/BuildingSchematic.java | 2 +- .../common/demonVillage/DemonBuilding.java | 2 +- .../common/demonVillage/DemonVillagePath.java | 2 +- .../ai/EntityDemonAIHurtByTarget.java | 2 +- .../demon/EntityMinorDemonGrunt.java | 2 +- .../demonHoard/demon/IHoardDemon.java | 2 +- .../demonVillage/tileEntity/TEDemonChest.java | 2 +- .../tileEntity/TEDemonPortal.java | 2 +- .../items/energy/ItemAttunedCrystal.java | 2 +- .../common/items/routing/RoutingFocus.java | 2 +- .../common/items/sigil/ItemFluidSigil.java | 2 +- .../renderer/block/RenderReagentConduit.java | 3 +- .../common/rituals/LocalStorageAlphaPact.java | 2 +- .../rituals/RitualEffectDemonPortal.java | 2 +- .../rituals/RitualEffectItemRouting.java | 2 +- .../common/rituals/RitualEffectMagnetic.java | 2 +- .../common/tileEntity/TEMasterStone.java | 2 +- .../common/tileEntity/TEReagentConduit.java | 2 +- .../assets/alchemicalwizardryBooks/books.txt | 18 ++++--- .../alchemicalwizardryBooks/books/book.txt | 24 ++++++--- .../alchemicalwizardryBooks/lang/en_US.lang | 19 ++++--- 27 files changed, 96 insertions(+), 63 deletions(-) rename src/main/java/WayofTime/alchemicalWizardry/{common => api}/Int3.java (95%) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 19d65e9e..6f1452b4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -1176,8 +1176,8 @@ public class AlchemicalWizardry DemonVillageLootRegistry.init(); -// if(parseTextFiles) -// this.parseTextFile(); + if(parseTextFiles) + this.parseTextFile(); // this.createItemTextureFiles(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/Int3.java b/src/main/java/WayofTime/alchemicalWizardry/api/Int3.java similarity index 95% rename from src/main/java/WayofTime/alchemicalWizardry/common/Int3.java rename to src/main/java/WayofTime/alchemicalWizardry/api/Int3.java index 51be4894..e3b61b8f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/Int3.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/Int3.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common; +package WayofTime.alchemicalWizardry.api; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/RoutingFocusPosAndFacing.java b/src/main/java/WayofTime/alchemicalWizardry/api/RoutingFocusPosAndFacing.java index e7360874..a6ee34a9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/RoutingFocusPosAndFacing.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/RoutingFocusPosAndFacing.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.api; import net.minecraftforge.common.util.ForgeDirection; -import WayofTime.alchemicalWizardry.common.Int3; public class RoutingFocusPosAndFacing { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/LocalRitualStorage.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/LocalRitualStorage.java index f5c008d6..e5a3241b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/LocalRitualStorage.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/LocalRitualStorage.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.api.rituals; import net.minecraft.nbt.NBTTagCompound; -import WayofTime.alchemicalWizardry.common.Int3; +import WayofTime.alchemicalWizardry.api.Int3; /** * This class is used to pass ritual-specific data into the RitualEffect from the containing Master Ritual Stone. This is basically used as auxillarary storage, diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java b/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java index 381a52b4..55ce45d0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java @@ -37,11 +37,12 @@ public class BUEntries } - public void initEntries(){ + public void initEntries() + { rIntro = new Entry(new IEntry[]{new EntryText(), new EntryText(), new EntryText()}, "Introduction", 1); rWeakRituals = new Entry(new IEntry[]{new EntryText(), new EntryText(), new EntryText(), new EntryText()}, "Weak Rituals", 1); rRituals = new Entry(new IEntry[]{new EntryText(), new EntryText(), new EntryText(), new EntryText()}, "Rituals", 1); - + rRitualWater = this.getPureTextEntry(2, "Ritual of the Full Spring", 1); theAltar = new Entry(new IEntry[]{new EntryItemText(new ItemStack(ModBlocks.blockAltar), "Blood Altar")}, EnumChatFormatting.BLUE + "Blood Altar", 1); runes = new Entry(new IEntry[]{new EntryItemText(new ItemStack(ModBlocks.runeOfSelfSacrifice)), new EntryItemText(new ItemStack(ModBlocks.runeOfSacrifice)), new EntryItemText(new ItemStack(ModBlocks.speedRune))}, "Runes", 1); @@ -73,9 +74,21 @@ public class BUEntries debug = new Entry(new IEntry[]{new EntryText("Debug"), new EntryImage("bloodutils:textures/misc/screenshots/t1.png", 854, 480, "Debug")}, EnumChatFormatting.AQUA + "De" + EnumChatFormatting.RED + "bug", 1); registerEntries(); } + + public Entry getPureTextEntry(int numberOfPages, String name, int pageNumber) + { + IEntry[] entries = new IEntry[numberOfPages]; + for(int i=0; i