Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Added some descriptions to the booklet, fixed issues with it

Browse source
This commit is contained in:
Ellpeck 2015-08-29 01:09:09 +02:00
parent c4b4637439
commit 64b27cfb8d
13 changed files with 171 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ellpeck/actuallyadditions/config/GuiConfiguration.java
View file

@ -13,7 +13,7 @@ import java.util.List;
public class GuiConfiguration extends GuiConfig{
public GuiConfiguration(GuiScreen parentScreen){
super(parentScreen, getConfigElements(), ModUtil.MOD_ID, true, true, ModUtil.NAME);
super(parentScreen, getConfigElements(), ModUtil.MOD_ID, false, false, ModUtil.NAME);
}
private static List<IConfigElement> getConfigElements(){

133
src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java
View file

@ -12,34 +12,50 @@ import ellpeck.actuallyadditions.util.Util;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
public class BlockCrafting{
public static IRecipe recipeSmileyCloud;
public static IRecipe recipePhantomface;
public static IRecipe recipeLiquiface;
public static IRecipe recipeEnergyface;
public static IRecipe recipePhantomBreaker;
public static IRecipe recipePhantomPlacer;
public static IRecipe recipeBreaker;
public static IRecipe recipePlacer;
public static IRecipe recipeLiquidPlacer;
public static IRecipe recipeLiquidCollector;
public static void init(){
//Smiley Cloud
if(ConfigCrafting.CLOUD.isEnabled())
if(ConfigCrafting.CLOUD.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockSmileyCloud),
" W ", "WXW", " W ",
'W', new ItemStack(Blocks.wool, 1, Util.WILDCARD),
'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal())));
recipeSmileyCloud = Util.lastIRecipe();
}
//Compost
if(ConfigCrafting.COMPOST.isEnabled())
if(ConfigCrafting.COMPOST.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCompost),
"W W", "W W", "WCW",
'W', "plankWood",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
}
//XP Solidifier
if(ConfigCrafting.XP_SOLIDIFIER.isEnabled())
if(ConfigCrafting.XP_SOLIDIFIER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier),
"XXX", "DCD", "XXX",
'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()),
'D', "blockDiamond",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
}
//Charcoal Block
GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()),
@ -49,160 +65,187 @@ public class BlockCrafting{
new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()));
//Wood Casing
if(ConfigCrafting.WOOD_CASING.isEnabled())
if(ConfigCrafting.WOOD_CASING.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
"WSW", "SRS", "WSW",
'W', "plankWood",
'R', "logWood",
'S', "stickWood"));
}
//Ender Casing
if(ConfigCrafting.ENDER_CASING.isEnabled())
if(ConfigCrafting.ENDER_CASING.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()),
"WSW", "SRS", "WSW",
'W', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
'S', Blocks.obsidian));
}
//Phantom Booster
if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled())
if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomBooster),
"RDR", "DCD", "RDR",
'R', "dustRedstone",
'D', "gemDiamond",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
}
//Coffee Machine
if(ConfigCrafting.COFFEE_MACHINE.isEnabled())
if(ConfigCrafting.COFFEE_MACHINE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoffeeMachine),
" C ", " S ", "A A",
'C', InitItems.itemCoffeeBean,
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
}
//Energizer
if(ConfigCrafting.ENERGIZER.isEnabled())
if(ConfigCrafting.ENERGIZER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnergizer),
"I I", "CAC", "I I",
'I', "ingotIron",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
}
//Energizer
if(ConfigCrafting.ENERVATOR.isEnabled())
if(ConfigCrafting.ENERVATOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator),
" I ", "CAC", " I ",
'I', "ingotIron",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
}
//Lava Factory
if(ConfigCrafting.LAVA_FACTORY.isEnabled())
if(ConfigCrafting.LAVA_FACTORY.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController),
"SCS", "ISI", "LLL",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'I', "blockIron",
'L', Items.lava_bucket));
}
//Casing
if(ConfigCrafting.CASING.isEnabled())
if(ConfigCrafting.CASING.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
"ICI",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'I', "blockIron"));
}
//Canola Press
if(ConfigCrafting.CANOLA_PRESS.isEnabled())
if(ConfigCrafting.CANOLA_PRESS.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCanolaPress),
"CHC", "CDC", "CRC",
'C', "cobblestone",
'H', Blocks.hopper,
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
}
//Ore Magnet
if(ConfigCrafting.ORE_MAGNET.isEnabled())
if(ConfigCrafting.ORE_MAGNET.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOreMagnet),
"SSS", "CBC", "ISI",
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'B', new ItemStack(InitItems.itemBatteryDouble),
'I', new ItemStack(Blocks.iron_block)));
}
//Fermenting Barrel
if(ConfigCrafting.FERMENTING_BARREL.isEnabled())
if(ConfigCrafting.FERMENTING_BARREL.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFermentingBarrel),
"CHC", "CDC", "CRC",
'C', "logWood",
'H', Blocks.hopper,
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
}
//Phantomface
if(ConfigCrafting.PHANTOMFACE.isEnabled())
if(ConfigCrafting.PHANTOMFACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomface),
" C ", "EBE", " S ",
'E', Items.ender_eye,
'C', Blocks.chest,
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
recipePhantomface = Util.lastIRecipe();
}
//Phantom Placer
if(ConfigCrafting.PHANTOM_PLACER.isEnabled())
if(ConfigCrafting.PHANTOM_PLACER.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomPlacer),
InitBlocks.blockPlacer,
InitBlocks.blockPhantomface));
recipePhantomPlacer = Util.lastIRecipe();
}
//Phantom Breaker
if(ConfigCrafting.PHANTOM_BREAKER.isEnabled())
if(ConfigCrafting.PHANTOM_BREAKER.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomBreaker),
InitBlocks.blockBreaker,
InitBlocks.blockPhantomface));
recipePhantomBreaker = Util.lastIRecipe();
}
//Phantom Energyface
if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled())
if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface),
" R ", "RFR", " R ",
'R', "dustRedstone",
'F', InitBlocks.blockPhantomface));
recipeEnergyface = Util.lastIRecipe();
}
//Phantom Liquiface
if(ConfigCrafting.PHANTOM_LIQUIFACE.isEnabled())
if(ConfigCrafting.PHANTOM_LIQUIFACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomLiquiface),
"RFR",
'R', Items.bucket,
'F', InitBlocks.blockPhantomface));
recipeLiquiface = Util.lastIRecipe();
}
//Liquid Placer
if(ConfigCrafting.LIQUID_PLACER.isEnabled())
if(ConfigCrafting.LIQUID_PLACER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFluidPlacer),
"RFR",
'R', Items.bucket,
'F', InitBlocks.blockPlacer));
recipeLiquidPlacer = Util.lastIRecipe();
}
//Liquid Breaker
if(ConfigCrafting.LIQUID_BREAKER.isEnabled())
if(ConfigCrafting.LIQUID_BREAKER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFluidCollector),
"RFR",
'R', Items.bucket,
'F', InitBlocks.blockBreaker));
recipeLiquidCollector = Util.lastIRecipe();
}
//Oil Generator
if(ConfigCrafting.OIL_GENERATOR.isEnabled())
if(ConfigCrafting.OIL_GENERATOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOilGenerator),
"CRC", "CBC", "CRC",
'C', "cobblestone",
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
}
//Coal Generator
if(ConfigCrafting.COAL_GENERATOR.isEnabled())
if(ConfigCrafting.COAL_GENERATOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoalGenerator),
"CRC", "CBC", "CRC",
'C', "cobblestone",
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'B', new ItemStack(Items.coal, 1, Util.WILDCARD)));
}
//Enderpearl Block
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
@ -212,12 +255,13 @@ public class BlockCrafting{
new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
//Stone Casing
if(ConfigCrafting.STONE_CASING.isEnabled())
if(ConfigCrafting.STONE_CASING.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
"WSW", "SRS", "WSW",
'W', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
'S', "stickWood"));
}
//Quartz Block
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
@ -225,23 +269,25 @@ public class BlockCrafting{
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
//Fishing Net
if(ConfigCrafting.FISHING_NET.isEnabled())
if(ConfigCrafting.FISHING_NET.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFishingNet),
"SSS", "SDS", "SSS",
'D', "gemDiamond",
'S', Items.string));
}
//Repairer
if(ConfigCrafting.REPAIRER.isEnabled())
if(ConfigCrafting.REPAIRER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer),
"DID", "OCO", "DID",
'D', "gemDiamond",
'I', "ingotIron",
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
}
//Solar Panel
if(ConfigCrafting.SOLAR_PANEL.isEnabled())
if(ConfigCrafting.SOLAR_PANEL.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar),
"IQI", "CDC", "IBI",
'D', "blockDiamond",
@ -249,9 +295,10 @@ public class BlockCrafting{
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(Blocks.iron_bars)));
}
//Heat Collector
if(ConfigCrafting.HEAT_COLLECTOR.isEnabled())
if(ConfigCrafting.HEAT_COLLECTOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockHeatCollector),
"BRB", "CDC", "BQB",
'D', "gemDiamond",
@ -260,6 +307,7 @@ public class BlockCrafting{
'L', new ItemStack(Items.lava_bucket),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(Blocks.iron_bars)));
}
//Quartz Pillar
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal()),
@ -287,7 +335,7 @@ public class BlockCrafting{
}
//Crusher
if(ConfigCrafting.CRUSHER.isEnabled())
if(ConfigCrafting.CRUSHER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinder),
"CFC", "DQD", "CFC",
'C', "cobblestone",
@ -295,9 +343,10 @@ public class BlockCrafting{
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'P', new ItemStack(Blocks.piston),
'F', new ItemStack(Items.flint)));
}
//Double Crusher
if(ConfigCrafting.DOUBLE_CRUSHER.isEnabled())
if(ConfigCrafting.DOUBLE_CRUSHER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinderDouble),
"CDC", "RFR", "CDC",
'C', "cobblestone",
@ -305,9 +354,10 @@ public class BlockCrafting{
'R', InitBlocks.blockGrinder,
'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'P', new ItemStack(Blocks.piston)));
}
//Double Furnace
if(ConfigCrafting.COMPOST.isEnabled())
if(ConfigCrafting.COMPOST.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceDouble),
"CDC", "RFR", "CDC",
'C', "cobblestone",
@ -315,55 +365,64 @@ public class BlockCrafting{
'R', new ItemStack(Blocks.furnace),
'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'P', "ingotBrick"));
}
//Feeder
if(ConfigCrafting.DOUBLE_FURNACE.isEnabled())
if(ConfigCrafting.DOUBLE_FURNACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFeeder),
"WCW", "DHD", "WCW",
'W', "plankWood",
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'C', new ItemStack(Items.golden_carrot),
'H', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
}
//Giant Chest
if(ConfigCrafting.GIANT_CHEST.isEnabled())
if(ConfigCrafting.GIANT_CHEST.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGiantChest),
"CWC", "WDW", "CWC",
'C', new ItemStack(Blocks.chest),
'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'W', "plankWood"));
}
//Greenhouse Glass
if(ConfigCrafting.GREENHOUSE_GLASS.isEnabled())
if(ConfigCrafting.GREENHOUSE_GLASS.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3),
"GSG", "SDS", "GSG",
'G', "blockGlass",
'D', Blocks.obsidian,
'S', "treeSapling"));
}
//Placer
if(ConfigCrafting.PLACER.isEnabled())
if(ConfigCrafting.PLACER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPlacer),
"CCC", "CRP", "CCC",
'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', Blocks.piston));
recipePlacer = Util.lastIRecipe();
}
//Breaker
if(ConfigCrafting.BREAKER.isEnabled())
if(ConfigCrafting.BREAKER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockBreaker),
"CCC", "CRP", "CCC",
'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', Items.iron_pickaxe));
recipeBreaker = Util.lastIRecipe();
}
//Dropper
if(ConfigCrafting.DROPPER.isEnabled())
if(ConfigCrafting.DROPPER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDropper),
"CCC", "CDR", "CCC",
'C', "cobblestone",
'D', Blocks.dropper,
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
}
if(ConfigCrafting.LAMPS.isEnabled()){
for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){

2
src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java
View file

@ -4,7 +4,7 @@ import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.gui.*;
import ellpeck.actuallyadditions.inventory.gui.lexicon.GuiBooklet;
import ellpeck.actuallyadditions.inventory.gui.booklet.GuiBooklet;
import ellpeck.actuallyadditions.tile.TileEntityBase;
import ellpeck.actuallyadditions.util.ModUtil;
import net.minecraft.entity.player.EntityPlayer;

3
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/BookletChapter.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/BookletChapter.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;
@ -8,6 +8,7 @@ public class BookletChapter{
public final IBookletPage[] pages;
private final String unlocalizedName;
public final BookletIndexEntry entry;
public int openPage;
public BookletChapter(String unlocalizedName, BookletIndexEntry entry, IBookletPage... pages){
this.pages = pages.clone();

2
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/BookletIndexEntry.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/BookletIndexEntry.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;

2
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/GuiAAAchievements.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/GuiAAAchievements.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import cpw.mods.fml.relauncher.ReflectionHelper;
import ellpeck.actuallyadditions.achievement.InitAchievements;

4
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/GuiBooklet.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/GuiBooklet.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -164,7 +164,7 @@ public class GuiBooklet extends GuiScreen{
int actualButton = button.id-CHAPTER_BUTTONS_START;
if(this.currentIndexEntry != null){
if(this.currentChapter == null){
if(actualButton < InitBooklet.entries.size()){
if(actualButton < this.currentIndexEntry.chapters.size()){
this.openChapter(currentIndexEntry.chapters.get(actualButton));
}
}

2
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/IBookletPage.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/IBookletPage.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
public interface IBookletPage{

9
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/InitBooklet.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/InitBooklet.java
View file

@ -1,5 +1,6 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import ellpeck.actuallyadditions.crafting.BlockCrafting;
import ellpeck.actuallyadditions.crafting.FoodCrafting;
import ellpeck.actuallyadditions.items.InitItems;
import ellpeck.actuallyadditions.items.metalists.TheFoods;
@ -11,9 +12,15 @@ public class InitBooklet{
public static ArrayList<BookletIndexEntry> entries = new ArrayList<BookletIndexEntry>();
public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF");
public static BookletIndexEntry entryMisc = new BookletIndexEntry("misc");
static{
new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud));
new BookletChapter("foods", entryMisc, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal())));
new BookletChapter("breaker", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector));
new BookletChapter("phantomfaces", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomface), new PageCrafting(3, BlockCrafting.recipeLiquiface), new PageCrafting(4, BlockCrafting.recipeEnergyface));
new BookletChapter("phantomBreaker", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomPlacer), new PageCrafting(3, BlockCrafting.recipePhantomBreaker));
}
}

9
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/PageCrafting.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/PageCrafting.java
View file

@ -1,7 +1,8 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import cpw.mods.fml.relauncher.ReflectionHelper;
import ellpeck.actuallyadditions.util.Util;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
@ -77,8 +78,9 @@ public class PageCrafting extends PageText{
int xShowOutput = gui.guiLeft+28+82;
int yShowOutput = gui.guiTop+23+20;
RenderHelper.disableStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(gui.unicodeRenderer, gui.mc.getTextureManager(), recipe.getRecipeOutput(), xShowOutput, yShowOutput);
RenderHelper.enableStandardItemLighting();
for(int i = 0; i < 2; i++){
boolean tooltip = i == 1;
for(int x = 0; x < width; x++){
@ -89,7 +91,9 @@ public class PageCrafting extends PageText{
int yShow = gui.guiTop+23+y*21;
if(!tooltip){
if(stack.getItemDamage() == Util.WILDCARD) stack.setItemDamage(0);
RenderHelper.disableStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(gui.unicodeRenderer, gui.mc.getTextureManager(), stack, xShow, yShow);
RenderHelper.enableStandardItemLighting();
}
else{
if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){
@ -100,7 +104,6 @@ public class PageCrafting extends PageText{
}
}
}
if(mouseX >= xShowOutput && mouseX <= xShowOutput+16 && mouseY >= yShowOutput && mouseY <= yShowOutput+16){
gui.renderToolTip(recipe.getRecipeOutput(), mouseX, mouseY);
}

5
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/PageFurnace.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/PageFurnace.java
View file

@ -1,5 +1,6 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
@ -42,7 +43,9 @@ public class PageFurnace extends PageText{
int xShow = gui.guiLeft+37+1+x*40;
int yShow = gui.guiTop+20+20;
if(!tooltip){
RenderHelper.disableStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(gui.unicodeRenderer, gui.mc.getTextureManager(), stack, xShow, yShow);
RenderHelper.enableStandardItemLighting();
}
else{
if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){

4
src/main/java/ellpeck/actuallyadditions/inventory/gui/lexicon/PageText.java → src/main/java/ellpeck/actuallyadditions/inventory/gui/booklet/PageText.java
View file

@ -1,4 +1,4 @@
package ellpeck.actuallyadditions.inventory.gui.lexicon;
package ellpeck.actuallyadditions.inventory.gui.booklet;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;
@ -24,7 +24,7 @@ public class PageText implements IBookletPage{
@Override
public String getText(){
return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.id+".name");
return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.chapter.getUnlocalizedName()+".text."+this.id);
}
@Override

47
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -245,6 +245,8 @@ tooltip.actuallyadditions.codeName.desc=Code Name
tooltip.actuallyadditions.baseUnlocName.desc=Item's Unlocalized Name
tooltip.actuallyadditions.unlocName.desc=Meta's Unlocalized Name
tooltip.actuallyadditions.disablingInfo.desc=If you don't want this Information |to appear, disable it in the |Actually Additions Config!
tooltip.actuallyadditions.ctrlForMoreInfo.desc=Press CTRL for Advanced Info
tooltip.actuallyadditions.extraInfo.desc=Advanced Info
tile.actuallyadditions.blockXPSolidifier.name=Experience Solidifier
tooltip.actuallyadditions.blockPhantomRange.desc=Range
tile.actuallyadditions.blockFlax.name=Flax Plant
@ -358,4 +360,47 @@ achievement.actuallyadditions.craftPhantomLiquiface.desc=Craft a Phantom Liquifa
achievement.actuallyadditions.craftPhantomEnergyface=Watch out! It's powered!
achievement.actuallyadditions.craftPhantomEnergyface.desc=Craft a Phantom Energyface
achievement.actuallyadditions.openTreasureChest=You almost drowned!!
achievement.actuallyadditions.openTreasureChest.desc=Open a Treasure Chest underwater
achievement.actuallyadditions.openTreasureChest.desc=Open a Treasure Chest underwater
booklet.actuallyadditions.indexEntry.misc.name=Miscellaneous
booklet.actuallyadditions.indexEntry.functionalNoRF.name=Functional Blocks (No RF use)
booklet.actuallyadditions.chapter.foods.name=Food
booklet.actuallyadditions.chapter.foods.text.1=A Pizza is round, delicious and tastes of tomatoes, cheese and deliciousness. Yum!
booklet.actuallyadditions.chapter.foods.text.2=Rice Bread is made in a furnace from rice dough, which can be made from rice. It tastes of a combination of rice and bread. Because that's what it is, I guess.
booklet.actuallyadditions.chapter.foods.text.3=It's hammy, and it's burgr'y, and it makes you want to sing, it's a Haaaaaaamuuuuurgeeeeeer *cough* It's from a german city: Hamburg! ...You learn something new every day.
booklet.actuallyadditions.chapter.foods.text.4=Reminds me of something. Hmmm... Subway?
booklet.actuallyadditions.chapter.foods.text.5=Reminds me of something. Hmmm... Wubsay?
booklet.actuallyadditions.chapter.foods.text.6=A pity it isn't waving a white flaaaaaaaaa.. flake. Of corn. A white cornflake.
booklet.actuallyadditions.chapter.foods.text.7=Or chips, if you're not american!
booklet.actuallyadditions.chapter.foods.text.8=It's a paper container filled with fries and fish. What more could you want?
booklet.actuallyadditions.chapter.foods.text.9=Someone might reeeeally like this.
booklet.actuallyadditions.chapter.foods.text.10=I somehow have a weird song stuck in my head where someone just repeatedly goes "Pumpkin pumpkin pumpkin blur, pumpkin blur, pumpkin blur"...
booklet.actuallyadditions.chapter.foods.text.11=It's like Tomato Juice, only that you don't always get it on a plane.
booklet.actuallyadditions.chapter.foods.text.12=It's a bowl with 3 noodles in it. It must be a really big bowl, I guess.
booklet.actuallyadditions.chapter.foods.text.13=THERE are those noodles! I've been searching for them for ages!
booklet.actuallyadditions.chapter.foods.text.14=Lari likes.
booklet.actuallyadditions.chapter.foods.text.15=It's chocolate cake. Who wouldn't like it!?
booklet.actuallyadditions.chapter.foods.text.16=It's Toast. What more could I say?
booklet.actuallyadditions.chapter.foods.text.17=Dough gets cooked into Baguette in a Furnace and can then join the french fries on their mission to achieve something or another.
booklet.actuallyadditions.chapter.cloud.name=Smiley Cloud
booklet.actuallyadditions.chapter.cloud.text.1=A Smiley Cloud is a neat little block that you can put down in the world. When in place, it will hover around across the ground, though staying on the block you placed it in. When right-clicking the cloud, it will open a GUI that enables you to change its name, and thus, its appearance if you do it right. On the next page, you can find some examples you can try out.
booklet.actuallyadditions.chapter.cloud.text.2=The Crafting Recipe is shown above. If you want to know what certain name changes do, try naming a cloud "Ellpeck", "Glenthor" or "AcidBlues".
booklet.actuallyadditions.chapter.phantomfaces.name=Phantomfaces
booklet.actuallyadditions.chapter.phantomfaces.text.1=A Phantomface is a block that you can connect to any inventory by using a Phantom Connector. When connected, the phantomface will act as if it was the corresponding inventory, accepting Items from pipes and hoppers and having items be able to get pulled out of the face (the same applies for energyfaces with RF and liquifaces with fluids.) a Phantomfaces has a default range of 15 blocks that can be enlarged with Phantom Boosters.
booklet.actuallyadditions.chapter.phantomfaces.text.2=The normal Phantomface can connect to inventories like chests and furnaces, transfering Items into and out of them.
booklet.actuallyadditions.chapter.phantomfaces.text.3=The Phantom Liquiface can connect to tanks and such, allowing all types of liquids to be pumped through. Giving it a Redstone Signal will cause it to auto-output.
booklet.actuallyadditions.chapter.phantomfaces.text.4=The Phantom Energyface can connect to things like generators and crushers, allowing for RF to flow through them into and out of machines.
booklet.actuallyadditions.chapter.phantomBreaker.name=Phantom Breakers & Placers
booklet.actuallyadditions.chapter.phantomBreaker.text.1=Phantom Breakers and Placers have very similar mechanics to Phantomfaces: They can be connected to Blocks via Phantom Connectors and interact with the environment. Phantom Breakers and Placers only have a range of 3 blocks, however, in which they can destroy and place blocks in connected places. Shift-right-clicking will supply you with information about the connection, right-clicking normally will open its interface.
booklet.actuallyadditions.chapter.phantomBreaker.text.2=The Phantom Placer places Blocks that you supply it with.
booklet.actuallyadditions.chapter.phantomBreaker.text.3=The Phantom Placer breaks blocks and stores them in its internal inventory.
booklet.actuallyadditions.chapter.breaker.name=(Fluid) Placers & Breakers
booklet.actuallyadditions.chapter.breaker.text.1=The Breaker breaks Blocks in front of it and stores them in its internal inventory. That's it.
booklet.actuallyadditions.chapter.breaker.text.2=The Placer places Blocks that it has stored in its internal inventory in the world. Amazing.
booklet.actuallyadditions.chapter.breaker.text.3=The Fluid Placer places liquids that you supply it with, if they have a block, in the world.
booklet.actuallyadditions.chapter.breaker.text.4=The Fluid Collector collects liquids in front of it and stores them in its tank.