Merge remote-tracking branch 'origin/master'

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -46,6 +46,7 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.update.UpdateChecker;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.compat.CraftingTweaksCompat;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -116,6 +117,8 @@ public class ActuallyAdditions{
         InitCrafting.init();
         InitEntities.init();
 
+        CraftingTweaksCompat.register();
+
         proxy.init(event);
 
         ModUtil.LOGGER.info("Initialization Finished.");

src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java

@@ -81,7 +81,7 @@ public class ClientEvents{
                 if(regName != null){
                     if(regName.toString().toLowerCase(Locale.ROOT).contains(ModUtil.MOD_ID)){
                         if(event.getToolTip().size() > 0){
-                            event.getToolTip().set(0, TextFormatting.RESET+event.getToolTip().get(0));
+                            event.getToolTip().set(0, TextFormatting.RESET+TextFormatting.WHITE.toString()+event.getToolTip().get(0));
                         }
                     }
                 }

src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CraftingTweaksCompat.java

@@ -0,0 +1,18 @@
+package de.ellpeck.actuallyadditions.mod.util.compat;
+
+import de.ellpeck.actuallyadditions.mod.inventory.ContainerCrafter;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
+
+public class CraftingTweaksCompat{
+
+    private static final String MOD_ID = "craftingtweaks";
+
+    public static void register(){
+        NBTTagCompound tagCompound = new NBTTagCompound();
+        tagCompound.setString("ContainerClass", ContainerCrafter.class.getName());
+        tagCompound.setString("AlignToGrid", "left");
+        FMLInterModComms.sendMessage(MOD_ID, "RegisterProvider", tagCompound);
+    }
+
+}

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -908,7 +908,7 @@ booklet.actuallyadditions.chapter.coalStuff.name=Coal Stuff
 booklet.actuallyadditions.chapter.coalStuff.text.1=Sometimes your <item>Coal<r> just <imp>burns for too long or too short<r>. <n>For that, you can craft <item>Tiny Coal<r>, <item>Tiny Charcoal<r> and <item>Blocks of Charcoal<r> for using them in a furnace. <n>While the <item>Block of Charcoal<r> burns for as long as a <item>Block of Coal<r>, the <item>Tiny Coal<r> and <item>Tiny Charcoal<r> will burn for <imp>one eighth of a piece of coal<r>, meaning it will <imp>smelt one item in a normal furnace<r>.
 
 booklet.actuallyadditions.chapter.lamps.name=Lamps
-booklet.actuallyadditions.chapter.lamps.text.1=<item>Lamps<r> are a block providing lots of light, similar to the mystic Glowstone or Torches, but they can be <imp>dyed with all of the 16 different colors<r> either by <imp>crafting them<r> or by placing them on the ground and <imp>right-clicking them with a piece of dye<r>. <n>When <imp>right-clicking<r> them with an empty hand, they will <imp>turn on and off<r>.
+booklet.actuallyadditions.chapter.lamps.text.1=<item>Lamps<r> are a block providing lots of light, similar to the mystic Glowstone or Torches, but they can be <imp>dyed with all of the 16 different colors<r> either by <imp>crafting them<r> or by placing them on the ground and <imp>right-clicking them with a piece of dye<r>. <n>When <imp>shift-right-clicking<r> them with an empty hand, they will <imp>turn on and off<r>.
 booklet.actuallyadditions.chapter.lamps.text.2=There is a way to toggle them with <imp>Redstone<r>, however. If you place a <item>Lamp Controller<r> facing into one and give it a <imp>redstone signal<r>, it will turn the lamp in front of it on and off. <n>The thing that makes this very expandable, though, is that it also <imp>toggles every lamp adjacent to that lamp<r> and every other lamp that gets touched. <n>That means you can have a huge field of lamps and toggle them all with <imp>just one<r> <item>Lamp Controller<r>.
 
 booklet.actuallyadditions.chapter.treasureChest.name=Treasure Chests
@@ -993,7 +993,7 @@ booklet.actuallyadditions.chapter.heatCollector.text.1=The <item>Heat Collector<
 
 booklet.actuallyadditions.chapter.canola.name=Canola and Oil
 booklet.actuallyadditions.chapter.canola.text.1=Using <item>Canola<r>, you can make a simple, yet effective power generation system from <imp>natural resources<r>. <n>To do this, first find some <item>Canola Plants<r> in the wild and plant them on your farm. <n><n>The <item>Canola<r> you get out of them can be used in a <item>Canola Press<r> to make <item>Canola Oil<r>. <n><n>This can be <imp>used in an<r> <item>Oil Generator<r>. It displays the amount of power it generates in its GUI, however, it can be <imp>upgraded further<r> to yield <imp>more power<r> than that!
-booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a <item>Fermenting Barrel<r> to convert the <item>Canola Oil<r> into <item>Oil<r>. <n><n>If you're still not satisfied with the power that generates, <imp>place it on the ground<r> and throw in a <item>Crystallized Canola Seed<r> to make <item>Crystallized Oil<r>.  <n><n>If that isn't enough for you either, make a <item>Empowered Canola Seed<r>, toss that into some <item>Crystallized Oil<r> to get <item>Empowered Oil<r>!
+booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a <item>Fermenting Barrel<r> to convert the <item>Canola Oil<r> into <item>Oil<r>. <n><n>If you're still not satisfied with the power that generates, <imp>place the oil on the ground<r> and throw in a <item>Crystallized Canola Seed<r> to make <item>Crystallized Oil<r>.  <n><n>If that isn't enough for you either, make an <item>Empowered Canola Seed<r> and toss that into some <item>Crystallized Oil<r> to get <item>Empowered Oil<r>!
 booklet.actuallyadditions.chapter.canola.text.4=The <item>Fermenting Barrel<r> can have a <item>Comparator<r> attached to it which will result in the Redstone strength being equivalent to the <imp>percentage<r> of the <imp>output tank<r>.
 booklet.actuallyadditions.chapter.canola.text.5=If you break the <item>Oil Generator<r>, it will keep the liquid inside. <n>Place it in the <imp>crafting grid<r> to empty it out. <n>It will <imp>stop generating<r> when powered by <imp>Redstone<r>. <n>Additionally, using a <item>Comparator<r> will yield the percentage of <imp>energy stored<r>.
 

src/main/resources/assets/actuallyadditions/lang/fr_CA.lang

@@ -651,7 +651,7 @@ info.actuallyadditions.machineBroke=Le bloc s'est détruit quand vous avez essay
 info.actuallyadditions.redstoneMode.name=Mode Redstone
 info.actuallyadditions.redstoneMode.pulse=Impulsion
 info.actuallyadditions.redstoneMode.deactivation=Desactivation
-info.actuallyadditions.redstoneMode.invalidItem=Utilisez une torche de redstone pour activer/désactiver!
+info.actuallyadditions.redstoneMode.invalidItem=Utilisez une %s pour activer/désactiver!
 info.actuallyadditions.redstoneMode.validItem=Cliquez-droit pour activer/désactiver!
 info.actuallyadditions.laserRelay.item.extra=Priorité
 info.actuallyadditions.laserRelay.item.display.1=Cliquez-droit pour augmenter!
@@ -662,7 +662,7 @@ info.actuallyadditions.laserRelay.fluid.extra=Flux de liquide
 info.actuallyadditions.laserRelay.mode.both=Les deux sens
 info.actuallyadditions.laserRelay.mode.outputOnly=Seulement vers les blocs adjacents
 info.actuallyadditions.laserRelay.mode.inputOnly=Seulement hors des blocs adjacents
-info.actuallyadditions.laserRelay.mode.noCompasss=Tenez une boussole en main pour modifier!
+info.actuallyadditions.laserRelay.mode.noCompasss=Tenez une %s en main pour modifier!
 
 #Noms de conteneurs
 container.actuallyadditions.inputter.name=DSE
@@ -791,7 +791,7 @@ achievement.actuallyadditions.craftCrusher=Double-moi ça!
 achievement.actuallyadditions.craftCrusher.desc=Craftez un broyeur
 
 achievement.actuallyadditions.craftDoubleCrusher=Double du double!
-achievement.actuallyadditions.craftCrusher.desc=Craftez un double broyeur
+achievement.actuallyadditions.craftDoubleCrusher.desc=Craftez un double broyeur
 
 achievement.actuallyadditions.pickUpCoffee=Ca rend accro...
 achievement.actuallyadditions.pickUpCoffee.desc=Récoltez un peu de café

src/main/resources/assets/actuallyadditions/lang/fr_FR.lang

@@ -651,7 +651,7 @@ info.actuallyadditions.machineBroke=Le bloc s'est détruit quand vous avez essay
 info.actuallyadditions.redstoneMode.name=Mode Redstone
 info.actuallyadditions.redstoneMode.pulse=Impulsion
 info.actuallyadditions.redstoneMode.deactivation=Desactivation
-info.actuallyadditions.redstoneMode.invalidItem=Utilisez une torche de redstone pour activer/désactiver!
+info.actuallyadditions.redstoneMode.invalidItem=Utilisez une %s pour activer/désactiver!
 info.actuallyadditions.redstoneMode.validItem=Cliquez-droit pour activer/désactiver!
 info.actuallyadditions.laserRelay.item.extra=Priorité
 info.actuallyadditions.laserRelay.item.display.1=Cliquez-droit pour augmenter!
@@ -662,7 +662,7 @@ info.actuallyadditions.laserRelay.fluid.extra=Flux de liquide
 info.actuallyadditions.laserRelay.mode.both=Les deux sens
 info.actuallyadditions.laserRelay.mode.outputOnly=Seulement vers les blocs adjacents
 info.actuallyadditions.laserRelay.mode.inputOnly=Seulement hors des blocs adjacents
-info.actuallyadditions.laserRelay.mode.noCompasss=Tenez une boussole en main pour modifier!
+info.actuallyadditions.laserRelay.mode.noCompasss=Tenez une %s en main pour modifier!
 
 #Noms de conteneurs
 container.actuallyadditions.inputter.name=DSE
@@ -791,7 +791,7 @@ achievement.actuallyadditions.craftCrusher=Double-moi ça!
 achievement.actuallyadditions.craftCrusher.desc=Craftez un broyeur
 
 achievement.actuallyadditions.craftDoubleCrusher=Double du double!
-achievement.actuallyadditions.craftCrusher.desc=Craftez un double broyeur
+achievement.actuallyadditions.craftDoubleCrusher.desc=Craftez un double broyeur
 
 achievement.actuallyadditions.pickUpCoffee=Ca rend accro...
 achievement.actuallyadditions.pickUpCoffee.desc=Récoltez un peu de café