mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-30 02:38:34 +01:00
Added more chapters, fixed something with the update display inside the book
This commit is contained in:
parent
1beff3ece9
commit
958280c762
7 changed files with 20 additions and 8 deletions
|
@ -51,6 +51,7 @@ public abstract class BlockContainerBase extends BlockContainer{
|
||||||
world.spawnEntityInWorld(entityItem);
|
world.spawnEntityInWorld(entityItem);
|
||||||
itemStack.stackSize = 0;
|
itemStack.stackSize = 0;
|
||||||
}
|
}
|
||||||
|
tileEntity.setInventorySlotContents(i, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,6 +98,7 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{
|
||||||
world.spawnEntityInWorld(entityItem);
|
world.spawnEntityInWorld(entityItem);
|
||||||
itemStack.stackSize = 0;
|
itemStack.stackSize = 0;
|
||||||
}
|
}
|
||||||
|
tileEntity.setInventorySlotContents(0, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
super.breakBlock(world, x, y, z, block, par6);
|
super.breakBlock(world, x, y, z, block, par6);
|
||||||
|
|
|
@ -56,7 +56,9 @@ public class GuiBooklet extends GuiScreen{
|
||||||
private static final int BUTTON_BACK_ID = 1;
|
private static final int BUTTON_BACK_ID = 1;
|
||||||
private static final int BUTTON_RETURN_ID = 2;
|
private static final int BUTTON_RETURN_ID = 2;
|
||||||
private static final int CHAPTER_BUTTONS_START = 3;
|
private static final int CHAPTER_BUTTONS_START = 3;
|
||||||
|
|
||||||
public static final int BUTTONS_PER_PAGE = 13;
|
public static final int BUTTONS_PER_PAGE = 13;
|
||||||
|
private static final int TOOLTIP_SPLIT_LENGTH = 160;
|
||||||
|
|
||||||
private static final int BUTTON_UPDATE_ID = CHAPTER_BUTTONS_START+BUTTONS_PER_PAGE;
|
private static final int BUTTON_UPDATE_ID = CHAPTER_BUTTONS_START+BUTTONS_PER_PAGE;
|
||||||
private static final int BUTTON_TWITTER_ID = BUTTON_UPDATE_ID+1;
|
private static final int BUTTON_TWITTER_ID = BUTTON_UPDATE_ID+1;
|
||||||
|
@ -183,6 +185,11 @@ public class GuiBooklet extends GuiScreen{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean doesGuiPauseGame(){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private GuiButton getButton(int id){
|
private GuiButton getButton(int id){
|
||||||
return (GuiButton)this.buttonList.get(id);
|
return (GuiButton)this.buttonList.get(id);
|
||||||
}
|
}
|
||||||
|
@ -256,9 +263,7 @@ public class GuiBooklet extends GuiScreen{
|
||||||
if(x >= this.guiLeft+138 && x <= this.guiLeft+138+7 && y >= this.guiTop+10 && y <= this.guiTop+10+7){
|
if(x >= this.guiLeft+138 && x <= this.guiLeft+138+7 && y >= this.guiTop+10 && y <= this.guiTop+10+7){
|
||||||
ArrayList list = new ArrayList();
|
ArrayList list = new ArrayList();
|
||||||
list.add(EnumChatFormatting.GOLD+"Show Configuration GUI");
|
list.add(EnumChatFormatting.GOLD+"Show Configuration GUI");
|
||||||
list.add(EnumChatFormatting.ITALIC+"It is highly recommended that you restart");
|
list.addAll(this.fontRendererObj.listFormattedStringToWidth("It is highly recommended that you restart your game after changing anything as that prevents possible bugs occuring!", TOOLTIP_SPLIT_LENGTH));
|
||||||
list.add(EnumChatFormatting.ITALIC+"your game after changing anything as");
|
|
||||||
list.add(EnumChatFormatting.ITALIC+"that prevents possible bugs occuring!");
|
|
||||||
this.func_146283_a(list, x, y);
|
this.func_146283_a(list, x, y);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -276,7 +281,8 @@ public class GuiBooklet extends GuiScreen{
|
||||||
ArrayList list = new ArrayList();
|
ArrayList list = new ArrayList();
|
||||||
list.add(EnumChatFormatting.GOLD+"There is an Update available!");
|
list.add(EnumChatFormatting.GOLD+"There is an Update available!");
|
||||||
list.add(EnumChatFormatting.ITALIC+"You have: "+ModUtil.VERSION+", Newest: "+UpdateChecker.updateVersionS);
|
list.add(EnumChatFormatting.ITALIC+"You have: "+ModUtil.VERSION+", Newest: "+UpdateChecker.updateVersionS);
|
||||||
list.add("Click this button to visit the download page!");
|
list.addAll(this.fontRendererObj.listFormattedStringToWidth(EnumChatFormatting.ITALIC+"Updates include: "+UpdateChecker.changelog, TOOLTIP_SPLIT_LENGTH));
|
||||||
|
list.add(EnumChatFormatting.GRAY+"Click this button to visit the download page!");
|
||||||
this.func_146283_a(list, x, y);
|
this.func_146283_a(list, x, y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ public class InitBooklet{
|
||||||
new BookletChapter("fishingNet", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFisher));
|
new BookletChapter("fishingNet", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFisher));
|
||||||
new BookletChapter("feeder", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFeeder));
|
new BookletChapter("feeder", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFeeder));
|
||||||
new BookletChapter("compost", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemFertilizer)), new PageCrafting(2, BlockCrafting.recipeCompost), new PageCrafting(3, ItemCrafting.recipeMashedFood));
|
new BookletChapter("compost", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemFertilizer)), new PageCrafting(2, BlockCrafting.recipeCompost), new PageCrafting(3, ItemCrafting.recipeMashedFood));
|
||||||
|
new BookletChapter("crate", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeCrate));
|
||||||
|
|
||||||
new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine));
|
new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine));
|
||||||
new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher));
|
new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher));
|
||||||
|
@ -68,8 +69,8 @@ public class InitBooklet{
|
||||||
new BookletChapter("repairer", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeRepairer));
|
new BookletChapter("repairer", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeRepairer));
|
||||||
|
|
||||||
new BookletChapter("coalGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeCoalGen));
|
new BookletChapter("coalGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeCoalGen));
|
||||||
new BookletChapter("oilGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeOilGen));
|
|
||||||
new BookletChapter("solarPanel", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSolar));
|
new BookletChapter("solarPanel", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSolar));
|
||||||
new BookletChapter("heatCollector", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeHeatCollector));
|
new BookletChapter("heatCollector", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeHeatCollector));
|
||||||
|
new BookletChapter("canola", entryGeneratingRF, new PageText(1), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())), new PageCrafting(3, BlockCrafting.recipeCanolaPress), new PageCrafting(4, BlockCrafting.recipeFermentingBarrel), new PageCrafting(5, BlockCrafting.recipeOilGen));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,9 @@ public class BlockCrafting{
|
||||||
public static IRecipe recipeBlockChar;
|
public static IRecipe recipeBlockChar;
|
||||||
public static IRecipe recipeFeeder;
|
public static IRecipe recipeFeeder;
|
||||||
public static IRecipe recipeCompost;
|
public static IRecipe recipeCompost;
|
||||||
|
public static IRecipe recipeCrate;
|
||||||
|
public static IRecipe recipeFermentingBarrel;
|
||||||
|
public static IRecipe recipeCanolaPress;
|
||||||
|
|
||||||
public static void init(){
|
public static void init(){
|
||||||
|
|
||||||
|
@ -195,6 +198,7 @@ public class BlockCrafting{
|
||||||
'H', Blocks.hopper,
|
'H', Blocks.hopper,
|
||||||
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
|
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
|
||||||
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
|
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
|
||||||
|
recipeCanolaPress = Util.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Ore Magnet
|
//Ore Magnet
|
||||||
|
@ -216,6 +220,7 @@ public class BlockCrafting{
|
||||||
'H', Blocks.hopper,
|
'H', Blocks.hopper,
|
||||||
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
||||||
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
|
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
|
||||||
|
recipeFermentingBarrel = Util.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Phantomface
|
//Phantomface
|
||||||
|
@ -453,6 +458,7 @@ public class BlockCrafting{
|
||||||
'C', new ItemStack(Blocks.chest),
|
'C', new ItemStack(Blocks.chest),
|
||||||
'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
|
||||||
'W', "plankWood"));
|
'W', "plankWood"));
|
||||||
|
recipeCrate = Util.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Greenhouse Glass
|
//Greenhouse Glass
|
||||||
|
|
|
@ -466,9 +466,6 @@ booklet.actuallyadditions.chapter.repairer.text.1=The <item>Item Repairer<r> is
|
||||||
booklet.actuallyadditions.chapter.coalGen.name=Coal Generator
|
booklet.actuallyadditions.chapter.coalGen.name=Coal Generator
|
||||||
booklet.actuallyadditions.chapter.coalGen.text.1=This is pretty self-explanatory: You fill the <item>Coal Generator<r> up with <item>Coal<r>, and it will generate RF.
|
booklet.actuallyadditions.chapter.coalGen.text.1=This is pretty self-explanatory: You fill the <item>Coal Generator<r> up with <item>Coal<r>, and it will generate RF.
|
||||||
|
|
||||||
booklet.actuallyadditions.chapter.oilGen.name=Oil Generator
|
|
||||||
booklet.actuallyadditions.chapter.oilGen.text.1=The <item>Oil Generator<r> uses buckets of <imp>Oil<r> to generate much bigger amounts of <imp>RF<r> than the <item>Coal Generator<r> does.
|
|
||||||
|
|
||||||
booklet.actuallyadditions.chapter.solarPanel.name=Solar Panel
|
booklet.actuallyadditions.chapter.solarPanel.name=Solar Panel
|
||||||
booklet.actuallyadditions.chapter.solarPanel.text.1=The <item>Solar Panel<r> is a block that is used to generate <imp>RF<r> through the power of the sun! Just plop it down under a <imp>free sky<r> and watch it generate RF slowly just by sitting there. <n>It will obviously not work at night. <imp>Obviously.
|
booklet.actuallyadditions.chapter.solarPanel.text.1=The <item>Solar Panel<r> is a block that is used to generate <imp>RF<r> through the power of the sun! Just plop it down under a <imp>free sky<r> and watch it generate RF slowly just by sitting there. <n>It will obviously not work at night. <imp>Obviously.
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Loading…
Reference in a new issue