diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 17a332c42..a724c4fe8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/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."); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java index e956fbe6f..14cd534ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java +++ b/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)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CraftingTweaksCompat.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CraftingTweaksCompat.java new file mode 100644 index 000000000..c9de1f04d --- /dev/null +++ b/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); + } + +} diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index c891bf04a..f9ae71bff 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/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 Coal just burns for too long or too short. For that, you can craft Tiny Coal, Tiny Charcoal and Blocks of Charcoal for using them in a furnace. While the Block of Charcoal burns for as long as a Block of Coal, the Tiny Coal and Tiny Charcoal will burn for one eighth of a piece of coal, meaning it will smelt one item in a normal furnace. booklet.actuallyadditions.chapter.lamps.name=Lamps -booklet.actuallyadditions.chapter.lamps.text.1=Lamps are a block providing lots of light, similar to the mystic Glowstone or Torches, but they can be dyed with all of the 16 different colors either by crafting them or by placing them on the ground and right-clicking them with a piece of dye. When right-clicking them with an empty hand, they will turn on and off. +booklet.actuallyadditions.chapter.lamps.text.1=Lamps are a block providing lots of light, similar to the mystic Glowstone or Torches, but they can be dyed with all of the 16 different colors either by crafting them or by placing them on the ground and right-clicking them with a piece of dye. When shift-right-clicking them with an empty hand, they will turn on and off. booklet.actuallyadditions.chapter.lamps.text.2=There is a way to toggle them with Redstone, however. If you place a Lamp Controller facing into one and give it a redstone signal, it will turn the lamp in front of it on and off. The thing that makes this very expandable, though, is that it also toggles every lamp adjacent to that lamp and every other lamp that gets touched. That means you can have a huge field of lamps and toggle them all with just one Lamp Controller. booklet.actuallyadditions.chapter.treasureChest.name=Treasure Chests @@ -993,7 +993,7 @@ booklet.actuallyadditions.chapter.heatCollector.text.1=The Heat Collector< booklet.actuallyadditions.chapter.canola.name=Canola and Oil booklet.actuallyadditions.chapter.canola.text.1=Using Canola, you can make a simple, yet effective power generation system from natural resources. To do this, first find some Canola Plants in the wild and plant them on your farm. The Canola you get out of them can be used in a Canola Press to make Canola Oil. This can be used in an Oil Generator. It displays the amount of power it generates in its GUI, however, it can be upgraded further to yield more power than that! -booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a Fermenting Barrel to convert the Canola Oil into Oil. If you're still not satisfied with the power that generates, place it on the ground and throw in a Crystallized Canola Seed to make Crystallized Oil. If that isn't enough for you either, make a Empowered Canola Seed, toss that into some Crystallized Oil to get Empowered Oil! +booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a Fermenting Barrel to convert the Canola Oil into Oil. If you're still not satisfied with the power that generates, place the oil on the ground and throw in a Crystallized Canola Seed to make Crystallized Oil. If that isn't enough for you either, make an Empowered Canola Seed and toss that into some Crystallized Oil to get Empowered Oil! booklet.actuallyadditions.chapter.canola.text.4=The Fermenting Barrel can have a Comparator attached to it which will result in the Redstone strength being equivalent to the percentage of the output tank. booklet.actuallyadditions.chapter.canola.text.5=If you break the Oil Generator, it will keep the liquid inside. Place it in the crafting grid to empty it out. It will stop generating when powered by Redstone. Additionally, using a Comparator will yield the percentage of energy stored. diff --git a/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang b/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang index 22a0d5fc0..a681ed586 100644 --- a/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang +++ b/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é diff --git a/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang b/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang index 22a0d5fc0..a681ed586 100644 --- a/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang +++ b/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é