- Adds Codex category switching entries

- Adds Multi-page Codex entries
- Adds the ability to display items in Codex entries
- Changes lang keys of Codex entries
- Fixes Activator, Pressure Refinery and Reactor not updating on the client if the amount of stored Ember changes
- Adds dial comparator support to the interface
- Changes the Grand Hammer to no longer accept Fortune and Silk Touch
- Fixes Stamp Base not updating on the client when the fluid changes
- Doubles the fuel efficiency of Steam Engines if they burn coal

build.gradle

@@ -13,7 +13,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 
-version = "1.6"
+version = "1.7"
 group = "teamroots.embers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "EmbersRekindled"
 

src/main/java/teamroots/embers/SoundManager.java

@@ -195,10 +195,14 @@ public class SoundManager {
     public static SoundEvent CODEX_CATEGORY_SELECT;
     @GameRegistry.ObjectHolder("embers:item.codex.category.unselect")
     public static SoundEvent CODEX_CATEGORY_UNSELECT;
+    @GameRegistry.ObjectHolder("embers:item.codex.category.switch")
+    public static SoundEvent CODEX_CATEGORY_SWITCH;
     @GameRegistry.ObjectHolder("embers:item.codex.page.open")
     public static SoundEvent CODEX_PAGE_OPEN;
     @GameRegistry.ObjectHolder("embers:item.codex.page.close")
     public static SoundEvent CODEX_PAGE_CLOSE;
+    @GameRegistry.ObjectHolder("embers:item.codex.page.switch")
+    public static SoundEvent CODEX_PAGE_SWITCH;
 
     @GameRegistry.ObjectHolder("embers:item.bauble.equip")
     public static SoundEvent BAUBLE_EQUIP;
@@ -320,8 +324,10 @@ public static void registerSounds(RegistryEvent.Register<SoundEvent> event) {
         event.getRegistry().register(registerSound("item.codex.category.close"));
         event.getRegistry().register(registerSound("item.codex.category.select"));
         event.getRegistry().register(registerSound("item.codex.category.unselect"));
+        event.getRegistry().register(registerSound("item.codex.category.switch"));
         event.getRegistry().register(registerSound("item.codex.page.open"));
         event.getRegistry().register(registerSound("item.codex.page.close"));
+        event.getRegistry().register(registerSound("item.codex.page.switch"));
 
         event.getRegistry().register(registerSound("item.bauble.equip"));
         event.getRegistry().register(registerSound("item.bauble.unequip"));

src/main/java/teamroots/embers/api/power/IEmberCapability.java

@@ -11,4 +11,5 @@ public interface IEmberCapability {
 	double removeAmount(double value, boolean doRemove);
 	void writeToNBT(NBTTagCompound tag);
 	void readFromNBT(NBTTagCompound tag);
+	void onContentsChanged();
 }

src/main/java/teamroots/embers/api/tile/IExtraDialInformation.java

@@ -5,4 +5,8 @@
 
 public interface IExtraDialInformation {
     void addDialInformation(EnumFacing facing, List<String> information, String dialType);
+
+    default int getComparatorData(EnumFacing facing, int data, String dialType) {
+        return data;
+    }
 }

src/main/java/teamroots/embers/compat/BaublesIntegration.java

@@ -21,6 +21,9 @@
 import teamroots.embers.item.bauble.ItemEmberAmulet;
 import teamroots.embers.item.bauble.ItemEmberBelt;
 import teamroots.embers.item.bauble.ItemEmberRing;
+import teamroots.embers.research.ResearchBase;
+import teamroots.embers.research.ResearchManager;
+import teamroots.embers.research.subtypes.ResearchShowItem;
 
 public class BaublesIntegration {
     public static Item ember_amulet, ember_belt, ember_ring, mantle_bulb;
@@ -113,4 +116,14 @@ public static double removeEmber(EntityPlayer player, double amount){
         }
         return amount;
     }
+
+    public static void initBaublesCategory() {
+        ItemStack fullBulb = ResearchManager.makeFullEmberItem(new ItemStack(mantle_bulb));
+
+        ResearchManager.cost_reduction = new ResearchShowItem("cost_reduction", new ItemStack(ember_amulet), 5, 5).addItem(new ResearchShowItem.DisplayItem(new ItemStack(ember_amulet),new ItemStack(ember_belt),new ItemStack(ember_ring)));
+        ResearchManager.mantle_bulb = new ResearchBase("mantle_bulb", fullBulb, 7, 3);
+
+        ResearchManager.subCategoryBaubles.addResearch(ResearchManager.cost_reduction);
+        ResearchManager.subCategoryBaubles.addResearch(ResearchManager.mantle_bulb);
+    }
 }

src/main/java/teamroots/embers/compat/MysticalMechanicsIntegration.java

@@ -3,6 +3,7 @@
 import mysticalmechanics.api.IGearBehavior;
 import mysticalmechanics.api.IMechCapability;
 import mysticalmechanics.api.MysticalMechanicsAPI;
+import mysticalmechanics.handler.RegistryHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
@@ -26,6 +27,10 @@
 import teamroots.embers.block.BlockSteamEngine;
 import teamroots.embers.item.ItemBase;
 import teamroots.embers.particle.ParticleUtil;
+import teamroots.embers.research.ResearchBase;
+import teamroots.embers.research.ResearchManager;
+import teamroots.embers.research.subtypes.ResearchFakePage;
+import teamroots.embers.research.subtypes.ResearchShowItem;
 import teamroots.embers.tileentity.TileEntityMechActuator;
 import teamroots.embers.tileentity.TileEntityMechActuatorRenderer;
 import teamroots.embers.tileentity.TileEntitySteamEngine;
@@ -141,4 +146,27 @@ public static void registerClientSide()
     {
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMechActuator.class, new TileEntityMechActuatorRenderer());
     }
+
+    public static void initMysticalMechanicsCategory() {
+        ResearchManager.gearbox = new ResearchBase("gearbox", new ItemStack(RegistryHandler.GEARBOX_FRAME), 2, 4);
+        ResearchManager.axle_iron = new ResearchBase("axle_iron", new ItemStack(RegistryHandler.IRON_AXLE), 2, 0).addAncestor(ResearchManager.gearbox);
+        ResearchManager.gear_iron = new ResearchShowItem("gear_iron", new ItemStack(RegistryHandler.IRON_GEAR), 4, 1).addItem(new ResearchShowItem.DisplayItem(new ItemStack(RegistryHandler.IRON_GEAR))).addAncestor(ResearchManager.gearbox)
+                .addPage(new ResearchShowItem("gear_dawnstone",new ItemStack(gear_dawnstone),0,0).addItem(new ResearchShowItem.DisplayItem(new ItemStack(gear_dawnstone))));
+        ResearchManager.actuator = new ResearchBase("actuator", new ItemStack(mech_actuator), 9, 5).addAncestor(ResearchManager.gearbox)
+                .addPage(new ResearchShowItem("actuator_bore",ItemStack.EMPTY,0,0).addItem(new ResearchShowItem.DisplayItem(new ItemStack(RegistryManager.ember_bore))))
+                .addPage(new ResearchShowItem("actuator_pump",ItemStack.EMPTY,0,0).addItem(new ResearchShowItem.DisplayItem(new ItemStack(RegistryManager.mechanical_pump))))
+                .addPage(new ResearchShowItem("actuator_stamper",ItemStack.EMPTY,0,0).addItem(new ResearchShowItem.DisplayItem(new ItemStack(RegistryManager.stamper))));
+        ResearchFakePage mechanical_mini_boiler = new ResearchFakePage(ResearchManager.mini_boiler, 12, 0);
+        ResearchManager.steam_engine = new ResearchBase("steam_engine", new ItemStack(steam_engine), 9, 2).addAncestor(ResearchManager.gearbox).addAncestor(mechanical_mini_boiler)
+                .addPage(new ResearchBase("steam_engine_overclock",ItemStack.EMPTY,0,0));
+
+
+        ResearchManager.subCategoryMechanicalPower.addResearch(ResearchManager.gearbox);
+        ResearchManager.subCategoryMechanicalPower.addResearch(ResearchManager.axle_iron);
+        ResearchManager.subCategoryMechanicalPower.addResearch(ResearchManager.gear_iron);
+        ResearchManager.subCategoryMechanicalPower.addResearch(ResearchManager.actuator);
+        ResearchManager.subCategoryMechanicalPower.addResearch(ResearchManager.steam_engine);
+
+        ResearchManager.subCategoryMechanicalPower.addResearch(mechanical_mini_boiler);
+    }
 }