Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-26 14:41:42 +02:00
Code Issues Projects Releases Wiki Activity

Many recipes now use Crystals, fixed Reconstructor Page & Chapter, moved pages around

Browse source
This commit is contained in:
Ellpeck 2015-11-15 17:50:31 +01:00
parent 377126e2ba
commit 2902f5d8a5
13 changed files with 128 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java
View file

@ -54,7 +54,8 @@ public class InitBooklet{
private static void initChapters(){ private static void initChapters(){
//Getting Started //Getting Started
chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3), new PageCrafting(4, ItemCrafting.recipeBook)).setImportant(); chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3), new PageCrafting(4, ItemCrafting.recipeBook)).setImportant();
new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("<power>", ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue()), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial(); new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<power>", ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial();
new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue()));
new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeStoneCase).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant(); new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeStoneCase).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant();
//Miscellaneous //Miscellaneous
@ -98,7 +99,6 @@ public class InitBooklet{
new BookletChapter("longRangeBreaker", entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.DIRECTIONAL_BREAKER_RF_PER_BLOCK.getValue()).addTextReplacement("<range>", ConfigIntValues.DIRECTIONAL_BREAKER_RANGE.getValue()), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker)); new BookletChapter("longRangeBreaker", entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.DIRECTIONAL_BREAKER_RF_PER_BLOCK.getValue()).addTextReplacement("<range>", ConfigIntValues.DIRECTIONAL_BREAKER_RANGE.getValue()), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker));
//RF Generating Blocks //RF Generating Blocks
new BookletChapter("coalGen", entryGeneratingRF, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue()));
new BookletChapter("solarPanel", entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.FURNACE_SOLAR_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText()); new BookletChapter("solarPanel", entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.FURNACE_SOLAR_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText());
new BookletChapter("heatCollector", entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.HEAT_COLLECTOR_ENERGY_PRODUCED.getValue()).addTextReplacement("<min>", ConfigIntValues.HEAT_COLLECTOR_BLOCKS.getValue()), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText()); new BookletChapter("heatCollector", entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.HEAT_COLLECTOR_ENERGY_PRODUCED.getValue()).addTextReplacement("<min>", ConfigIntValues.HEAT_COLLECTOR_BLOCKS.getValue()), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText());
new BookletChapter("canola", entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addTextReplacement("<pressRF>", ConfigIntValues.PRESS_ENERGY_USED.getValue()).addTextReplacement("<canola>", ConfigIntValues.PRESS_MB_PRODUCED.getValue()).addTextReplacement("<rf>", ConfigIntValues.OIL_GEN_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(3, BlockCrafting.recipeFermentingBarrel).setNoText(), new PageCrafting(4, BlockCrafting.recipeOilGen).setNoText()); new BookletChapter("canola", entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addTextReplacement("<pressRF>", ConfigIntValues.PRESS_ENERGY_USED.getValue()).addTextReplacement("<canola>", ConfigIntValues.PRESS_MB_PRODUCED.getValue()).addTextReplacement("<rf>", ConfigIntValues.OIL_GEN_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(3, BlockCrafting.recipeFermentingBarrel).setNoText(), new PageCrafting(4, BlockCrafting.recipeOilGen).setNoText());

15
src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java
View file

@ -12,7 +12,9 @@ package ellpeck.actuallyadditions.booklet.chapter;
import ellpeck.actuallyadditions.booklet.entry.BookletEntry; import ellpeck.actuallyadditions.booklet.entry.BookletEntry;
import ellpeck.actuallyadditions.booklet.page.BookletPage; import ellpeck.actuallyadditions.booklet.page.BookletPage;
import ellpeck.actuallyadditions.booklet.page.PageCrafting;
import ellpeck.actuallyadditions.booklet.page.PageReconstructor; import ellpeck.actuallyadditions.booklet.page.PageReconstructor;
import ellpeck.actuallyadditions.crafting.MiscCrafting;
import ellpeck.actuallyadditions.recipe.AtomicReconstructorRecipeHandler; import ellpeck.actuallyadditions.recipe.AtomicReconstructorRecipeHandler;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -30,6 +32,19 @@ public class BookletChapterReconstructor extends BookletChapter{
ArrayList<BookletPage> allPages = new ArrayList<BookletPage>(); ArrayList<BookletPage> allPages = new ArrayList<BookletPage>();
allPages.addAll(Arrays.asList(pages)); allPages.addAll(Arrays.asList(pages));
allPages.add(new PageCrafting(allPages.size()+1, MiscCrafting.recipesCrystals){
@Override
public ItemStack[] getItemStacksForPage(){
return new ItemStack[0];
}
}.setNoText());
allPages.add(new PageCrafting(allPages.size()+1, MiscCrafting.recipesCrystalBlocks){
@Override
public ItemStack[] getItemStacksForPage(){
return new ItemStack[0];
}
}.setNoText());
for(AtomicReconstructorRecipeHandler.Recipe recipe : AtomicReconstructorRecipeHandler.recipes){ for(AtomicReconstructorRecipeHandler.Recipe recipe : AtomicReconstructorRecipeHandler.recipes){
BookletPage page = new PageReconstructor(allPages.size()+1, recipe.getFirstOutput()).setNoText(); BookletPage page = new PageReconstructor(allPages.size()+1, recipe.getFirstOutput()).setNoText();
allPages.add(page); allPages.add(page);

2
src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java
View file

@ -65,6 +65,7 @@ public class PageReconstructor extends BookletPage{
} }
if(input != null){ if(input != null){
renderItem(gui, new ItemStack(InitBlocks.blockAtomicReconstructor), gui.guiLeft+37+22, gui.guiTop+20+21, 1.0F);
for(int i = 0; i < 2; i++){ for(int i = 0; i < 2; i++){
for(int x = 0; x < 2; x++){ for(int x = 0; x < 2; x++){
ItemStack stack = x == 0 ? input : this.result; ItemStack stack = x == 0 ? input : this.result;
@ -85,7 +86,6 @@ public class PageReconstructor extends BookletPage{
} }
} }
} }
renderItem(gui, new ItemStack(InitBlocks.blockAtomicReconstructor), gui.guiLeft+37+22, gui.guiTop+20+21, 1.0F);
} }
} }

2
src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java
View file

@ -180,7 +180,7 @@ public enum ConfigIntValues{
RECONSTRUCTOR_DISTANCE("Atomic Reconstructor: Distance", ConfigCategories.MACHINE_VALUES, 10, 1, 50, "The max distance the Reconstructor goes forward to find blocks to convert"), RECONSTRUCTOR_DISTANCE("Atomic Reconstructor: Distance", ConfigCategories.MACHINE_VALUES, 10, 1, 50, "The max distance the Reconstructor goes forward to find blocks to convert"),
RECONSTRCUTOR_RANGE("Atomic Reconstructor: Range", ConfigCategories.MACHINE_VALUES, 2, 1, 10, "The range of Converting blocks or items into other blocks or items"), RECONSTRCUTOR_RANGE("Atomic Reconstructor: Range", ConfigCategories.MACHINE_VALUES, 2, 1, 10, "The range of Converting blocks or items into other blocks or items"),
RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 1000, 0, 100000, "The amount of Energy the Reconstructor uses per Block converted"), RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 800, 0, 100000, "The amount of Energy the Reconstructor uses per Block converted"),
RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers"); RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers");
public final String name; public final String name;

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

@ -98,7 +98,7 @@ public class BlockCrafting{
"OBO", "RCR", "OBO", "OBO", "RCR", "OBO",
'B', new ItemStack(Blocks.redstone_block), 'B', new ItemStack(Blocks.redstone_block),
'O', new ItemStack(Blocks.obsidian), 'O', new ItemStack(Blocks.obsidian),
'R', "dustRedstone", 'R', "crystalRed",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLaserRelay = Util.GetRecipes.lastIRecipe(); recipeLaserRelay = Util.GetRecipes.lastIRecipe();
} }
@ -106,17 +106,19 @@ public class BlockCrafting{
//Ranged Collector //Ranged Collector
if(ConfigCrafting.RANGED_COLLECTOR.isEnabled()){ if(ConfigCrafting.RANGED_COLLECTOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockRangedCollector), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockRangedCollector),
"EHE", " C ", " A ", "EHE", " C ",
'E', new ItemStack(Items.ender_pearl), 'E', new ItemStack(Items.ender_pearl),
'H', new ItemStack(Blocks.hopper), 'H', new ItemStack(Blocks.hopper),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'A', "crystalBlack"));
recipeRangedCollector = Util.GetRecipes.lastIRecipe(); recipeRangedCollector = Util.GetRecipes.lastIRecipe();
} }
//Directional Breaker //Directional Breaker
if(ConfigCrafting.DIRECTIONAL_BREAKER.isEnabled()){ if(ConfigCrafting.DIRECTIONAL_BREAKER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDirectionalBreaker), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDirectionalBreaker),
"BBB", "BBB", " C ",
'C', "crystalBlack",
'B', new ItemStack(InitBlocks.blockBreaker))); 'B', new ItemStack(InitBlocks.blockBreaker)));
recipeDirectionalBreaker = Util.GetRecipes.lastIRecipe(); recipeDirectionalBreaker = Util.GetRecipes.lastIRecipe();
} }
@ -144,7 +146,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier),
"XXX", "DCD", "XXX", "XXX", "DCD", "XXX",
'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()), 'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()),
'D', "blockDiamond", 'D', "blockCrystalLightBlue",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeSolidifier = Util.GetRecipes.lastIRecipe(); recipeSolidifier = Util.GetRecipes.lastIRecipe();
} }
@ -183,7 +185,7 @@ public class BlockCrafting{
"WSW", "SRS", "WSW", "WSW", "SRS", "WSW",
'W', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'W', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
'S', Blocks.obsidian)); 'S', "crystalLightBlue"));
recipeEnderCase = Util.GetRecipes.lastIRecipe(); recipeEnderCase = Util.GetRecipes.lastIRecipe();
} }
@ -191,8 +193,8 @@ public class BlockCrafting{
if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled()){ if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomBooster), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomBooster),
"RDR", "DCD", "RDR", "RDR", "DCD", "RDR",
'R', "dustRedstone", 'R', "crystalRed",
'D', "gemDiamond", 'D', "crystalLightBlue",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipePhantomBooster = Util.GetRecipes.lastIRecipe(); recipePhantomBooster = Util.GetRecipes.lastIRecipe();
} }
@ -200,7 +202,8 @@ public class BlockCrafting{
//Coffee Machine //Coffee Machine
if(ConfigCrafting.COFFEE_MACHINE.isEnabled()){ if(ConfigCrafting.COFFEE_MACHINE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoffeeMachine), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoffeeMachine),
" C ", " S ", "A A", " C ", " S ", "AMA",
'M', "crystalBlack",
'C', InitItems.itemCoffeeBean, 'C', InitItems.itemCoffeeBean,
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
@ -211,7 +214,7 @@ public class BlockCrafting{
if(ConfigCrafting.ENERGIZER.isEnabled()){ if(ConfigCrafting.ENERGIZER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnergizer), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnergizer),
"I I", "CAC", "I I", "I I", "CAC", "I I",
'I', "ingotIron", 'I', "crystalRed",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
recipeEnergizer = Util.GetRecipes.lastIRecipe(); recipeEnergizer = Util.GetRecipes.lastIRecipe();
@ -221,7 +224,7 @@ public class BlockCrafting{
if(ConfigCrafting.ENERVATOR.isEnabled()){ if(ConfigCrafting.ENERVATOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator),
" I ", "CAC", " I ", " I ", "CAC", " I ",
'I', "ingotIron", 'I', "crystalRed",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
recipeEnervator = Util.GetRecipes.lastIRecipe(); recipeEnervator = Util.GetRecipes.lastIRecipe();
@ -233,7 +236,7 @@ public class BlockCrafting{
"SCS", "ISI", "LLL", "SCS", "ISI", "LLL",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'I', "blockIron", 'I', "blockCrystalWhite",
'L', Items.lava_bucket)); 'L', Items.lava_bucket));
recipeLavaFactory = Util.GetRecipes.lastIRecipe(); recipeLavaFactory = Util.GetRecipes.lastIRecipe();
} }
@ -243,7 +246,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
"ICI", "ICI",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'I', "blockIron")); 'I', "blockCrystalWhite"));
recipeCasing = Util.GetRecipes.lastIRecipe(); recipeCasing = Util.GetRecipes.lastIRecipe();
} }
@ -252,7 +255,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCanolaPress), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCanolaPress),
"CHC", "CDC", "CRC", "CHC", "CDC", "CRC",
'C', "cobblestone", 'C', "cobblestone",
'H', Blocks.hopper, 'H', "crystalWhite",
'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.GetRecipes.lastIRecipe(); recipeCanolaPress = Util.GetRecipes.lastIRecipe();
@ -263,7 +266,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFermentingBarrel), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFermentingBarrel),
"CHC", "CDC", "CRC", "CHC", "CDC", "CRC",
'C', "logWood", 'C', "logWood",
'H', Blocks.hopper, 'H', "crystalWhite",
'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.GetRecipes.lastIRecipe(); recipeFermentingBarrel = Util.GetRecipes.lastIRecipe();
@ -273,7 +276,7 @@ public class BlockCrafting{
if(ConfigCrafting.PHANTOMFACE.isEnabled()){ if(ConfigCrafting.PHANTOMFACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomface), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomface),
" C ", "EBE", " S ", " C ", "EBE", " S ",
'E', Items.ender_eye, 'E', "crystalLightBlue",
'C', Blocks.chest, 'C', Blocks.chest,
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
@ -300,7 +303,7 @@ public class BlockCrafting{
if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled()){ if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface),
" R ", "RFR", " R ", " R ", "RFR", " R ",
'R', "dustRedstone", 'R', "crystalRed",
'F', InitBlocks.blockPhantomface)); 'F', InitBlocks.blockPhantomface));
recipeEnergyface = Util.GetRecipes.lastIRecipe(); recipeEnergyface = Util.GetRecipes.lastIRecipe();
} }
@ -356,8 +359,8 @@ public class BlockCrafting{
if(ConfigCrafting.LEAF_GENERATOR.isEnabled()){ if(ConfigCrafting.LEAF_GENERATOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLeafGenerator), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLeafGenerator),
"IEI", "GLG", "ICI", "IEI", "GLG", "ICI",
'I', "ingotIron", 'I', "crystalWhite",
'G', "ingotGold", 'G', "crystalRed",
'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'L', "treeLeaves", 'L', "treeLeaves",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
@ -392,7 +395,7 @@ public class BlockCrafting{
if(ConfigCrafting.FISHING_NET.isEnabled()){ if(ConfigCrafting.FISHING_NET.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFishingNet), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFishingNet),
"SSS", "SDS", "SSS", "SSS", "SDS", "SSS",
'D', "gemDiamond", 'D', "crystalLightBlue",
'S', Items.string)); 'S', Items.string));
recipeFisher = Util.GetRecipes.lastIRecipe(); recipeFisher = Util.GetRecipes.lastIRecipe();
} }
@ -401,8 +404,8 @@ public class BlockCrafting{
if(ConfigCrafting.REPAIRER.isEnabled()){ if(ConfigCrafting.REPAIRER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer),
"DID", "OCO", "DID", "DID", "OCO", "DID",
'D', "gemDiamond", 'D', "blockCrystalLightBlue",
'I', "ingotIron", 'I', "crystalWhite",
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipeRepairer = Util.GetRecipes.lastIRecipe(); recipeRepairer = Util.GetRecipes.lastIRecipe();
@ -412,8 +415,8 @@ public class BlockCrafting{
if(ConfigCrafting.SOLAR_PANEL.isEnabled()){ if(ConfigCrafting.SOLAR_PANEL.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar),
"IQI", "CDC", "IBI", "IQI", "CDC", "IBI",
'D', "blockDiamond", 'D', "blockCrystalLightBlue",
'I', "ingotIron", 'I', "crystalWhite",
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(Blocks.iron_bars))); 'B', new ItemStack(Blocks.iron_bars)));
@ -424,7 +427,7 @@ public class BlockCrafting{
if(ConfigCrafting.HEAT_COLLECTOR.isEnabled()){ if(ConfigCrafting.HEAT_COLLECTOR.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockHeatCollector), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockHeatCollector),
"BRB", "CDC", "BQB", "BRB", "CDC", "BQB",
'D', "ingotIron", 'D', "crystalWhite",
'R', new ItemStack(Items.repeater), 'R', new ItemStack(Items.repeater),
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'L', new ItemStack(Items.lava_bucket), 'L', new ItemStack(Items.lava_bucket),
@ -451,21 +454,22 @@ public class BlockCrafting{
"WWW", "CHC", "WWW", "WWW", "CHC", "WWW",
'W', "plankWood", 'W', "plankWood",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'H', new ItemStack(Blocks.hopper))); 'H', "crystalWhite"));
recipeESD = Util.GetRecipes.lastIRecipe(); recipeESD = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced),
InitBlocks.blockInputter, InitBlocks.blockInputter,
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
"dustRedstone")); "crystalRed"));
recipeAdvancedESD = Util.GetRecipes.lastIRecipe(); recipeAdvancedESD = Util.GetRecipes.lastIRecipe();
} }
//Crusher //Crusher
if(ConfigCrafting.CRUSHER.isEnabled()){ if(ConfigCrafting.CRUSHER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinder), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinder),
"CFC", "DQD", "CFC", "MFC", "DQD", "CFM",
'M', "crystalRed",
'C', "cobblestone", 'C', "cobblestone",
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
@ -487,19 +491,19 @@ public class BlockCrafting{
} }
//Double Furnace //Double Furnace
if(ConfigCrafting.COMPOST.isEnabled()){ if(ConfigCrafting.DOUBLE_FURNACE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceDouble), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceDouble),
"CDC", "RFR", "CDC", "PDC", "RFR", "CDP",
'C', "cobblestone", 'C', "cobblestone",
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'R', new ItemStack(Blocks.furnace), 'R', new ItemStack(Blocks.furnace),
'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
'P', "ingotBrick")); 'P', "crystalWhite"));
recipeFurnace = Util.GetRecipes.lastIRecipe(); recipeFurnace = Util.GetRecipes.lastIRecipe();
} }
//Feeder //Feeder
if(ConfigCrafting.DOUBLE_FURNACE.isEnabled()){ if(ConfigCrafting.FEEDER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFeeder), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFeeder),
"WCW", "DHD", "WCW", "WCW", "DHD", "WCW",
'W', "plankWood", 'W', "plankWood",
@ -524,7 +528,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3),
"GSG", "SDS", "GSG", "GSG", "SDS", "GSG",
'G', "blockGlass", 'G', "blockGlass",
'D', Blocks.obsidian, 'D', "blockCrystalBlue",
'S', "treeSapling")); 'S', "treeSapling"));
recipeGlass = Util.GetRecipes.lastIRecipe(); recipeGlass = Util.GetRecipes.lastIRecipe();
} }
@ -535,7 +539,7 @@ public class BlockCrafting{
"CCC", "CRP", "CCC", "CCC", "CRP", "CCC",
'C', "cobblestone", 'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', Blocks.piston)); 'P', "blockCrystalBlue"));
recipePlacer = Util.GetRecipes.lastIRecipe(); recipePlacer = Util.GetRecipes.lastIRecipe();
} }
@ -545,14 +549,15 @@ public class BlockCrafting{
"CCC", "CRP", "CCC", "CCC", "CRP", "CCC",
'C', "cobblestone", 'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', Items.iron_pickaxe)); 'P', "blockCrystalBlack"));
recipeBreaker = Util.GetRecipes.lastIRecipe(); recipeBreaker = Util.GetRecipes.lastIRecipe();
} }
//Dropper //Dropper
if(ConfigCrafting.DROPPER.isEnabled()){ if(ConfigCrafting.DROPPER.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDropper), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDropper),
"CCC", "CDR", "CCC", "CBC", "CDR", "CBC",
'B', "crystalBlue",
'C', "cobblestone", 'C', "cobblestone",
'D', Blocks.dropper, 'D', Blocks.dropper,
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
@ -562,7 +567,8 @@ public class BlockCrafting{
if(ConfigCrafting.LAMPS.isEnabled()){ if(ConfigCrafting.LAMPS.isEnabled()){
for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){ for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockColoredLamp, 6, i), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockColoredLamp, 6, i),
"GGG", "DQD", "GGG", "GCG", "DQD", "GCG",
'C', "crystalBlue",
'G', "glowstone", 'G', "glowstone",
'D', "dye"+BlockColoredLamp.allLampTypes[i].name, 'D', "dye"+BlockColoredLamp.allLampTypes[i].name,
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
@ -571,7 +577,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4),
"XXX", "XLX", "XXX", "XXX", "XLX", "XXX",
'X', "dustRedstone", 'X', "crystalRed",
'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD))); 'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD)));
recipePowerer = Util.GetRecipes.lastIRecipe(); recipePowerer = Util.GetRecipes.lastIRecipe();
} }

75
src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java
View file

@ -105,7 +105,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLaserWrench), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLaserWrench),
"C ", " S ", " S", "C ", " S ", " S",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'S', "ingotIron")); 'S', "crystalWhite"));
recipeLaserWrench = Util.GetRecipes.lastIRecipe(); recipeLaserWrench = Util.GetRecipes.lastIRecipe();
} }
@ -129,7 +129,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlower), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlower),
" F", "IP", "IC", " F", "IP", "IC",
'F', new ItemStack(Items.flint), 'F', new ItemStack(Items.flint),
'I', "ingotIron", 'I', "crystalWhite",
'P', new ItemStack(Blocks.piston), 'P', new ItemStack(Blocks.piston),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLeafBlower = Util.GetRecipes.lastIRecipe(); recipeLeafBlower = Util.GetRecipes.lastIRecipe();
@ -139,18 +139,18 @@ public class ItemCrafting{
if(ConfigCrafting.DRILL.isEnabled()){ if(ConfigCrafting.DRILL.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill),
"DDD", "CRC", "III", "DDD", "CRC", "III",
'D', "gemDiamond", 'D', "crystalLightBlue",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
'I', "blockIron")); 'I', "blockCrystalWhite"));
recipeDrill = Util.GetRecipes.lastIRecipe(); recipeDrill = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill, 1, 1), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill, 1, 1),
"DDD", "CRC", "III", "DDD", "CRC", "III",
'D', "gemEmerald", 'D', "crystalGreen",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
'I', "blockIron")); 'I', "blockCrystalWhite"));
recipeDrillEmerald = Util.GetRecipes.lastIRecipe(); recipeDrillEmerald = Util.GetRecipes.lastIRecipe();
} }
@ -159,15 +159,16 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
"ICI", "CRC", "ICI", "ICI", "CRC", "ICI",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'R', "dustRedstone", 'R', "crystalRed",
'I', "blockIron")); 'I', "blockCrystalWhite"));
recipeDrillCore = Util.GetRecipes.lastIRecipe(); recipeDrillCore = Util.GetRecipes.lastIRecipe();
} }
//Tele Staff //Tele Staff
if(ConfigCrafting.TELE_STAFF.isEnabled()){ if(ConfigCrafting.TELE_STAFF.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemTeleStaff), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemTeleStaff),
" E", " S ", "SB ", " FE", " S ", "SB ",
'F', "crystalLightBlue",
'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()),
'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD))); 'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD)));
@ -178,23 +179,23 @@ public class ItemCrafting{
if(ConfigCrafting.DRILL_SPEED.isEnabled()){ if(ConfigCrafting.DRILL_SPEED.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeed), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeed),
"ISI", "SRS", "ISI", "ISI", "SRS", "ISI",
'I', "ingotIron", 'I', "crystalWhite",
'S', Items.sugar, 'S', Items.sugar,
'R', "dustRedstone")); 'R', "crystalRed"));
recipeDrillSpeedI = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedI = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII),
"ISI", "SCS", "ISI", "ISI", "SCS", "ISI",
'I', "ingotIron", 'I', "crystalWhite",
'S', Items.sugar, 'S', Items.sugar,
'C', Items.cake)); 'C', Items.cake));
recipeDrillSpeedII = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedII = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII),
"ISI", "SFS", "ISI", "ISI", "SFS", "ISI",
'I', "ingotIron", 'I', "crystalWhite",
'S', Items.sugar, 'S', Items.sugar,
'F', "gemDiamond")); 'F', "crystalLightBlue"));
recipeDrillSpeedIII = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedIII = Util.GetRecipes.lastIRecipe();
} }
@ -204,13 +205,13 @@ public class ItemCrafting{
"ISI", "SRS", "ISI", "ISI", "SRS", "ISI",
'I', Blocks.glowstone, 'I', Blocks.glowstone,
'S', Items.redstone, 'S', Items.redstone,
'R', Blocks.diamond_block)); 'R', "blockCrystalLightBlue"));
recipeDrillFortuneI = Util.GetRecipes.lastIRecipe(); recipeDrillFortuneI = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII),
"ISI", "SRS", "ISI", "ISI", "SRS", "ISI",
'I', Blocks.glowstone, 'I', Blocks.glowstone,
'S', Items.redstone, 'S', "crystalRed",
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipeDrillFortuneII = Util.GetRecipes.lastIRecipe(); recipeDrillFortuneII = Util.GetRecipes.lastIRecipe();
} }
@ -219,15 +220,15 @@ public class ItemCrafting{
if(ConfigCrafting.DRILL_SIZE.isEnabled()){ if(ConfigCrafting.DRILL_SIZE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeThreeByThree), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeThreeByThree),
"DID", "ICI", "DID", "DID", "ICI", "DID",
'I', "ingotIron", 'I', "crystalWhite",
'D', "gemDiamond", 'D', "crystalLightBlue",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
recipeDrillThree = Util.GetRecipes.lastIRecipe(); recipeDrillThree = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive),
"DID", "ICI", "DID", "DID", "ICI", "DID",
'I', "ingotIron", 'I', "crystalWhite",
'D', "gemDiamond", 'D', "crystalLightBlue",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeDrillFive = Util.GetRecipes.lastIRecipe(); recipeDrillFive = Util.GetRecipes.lastIRecipe();
} }
@ -236,8 +237,8 @@ public class ItemCrafting{
if(ConfigCrafting.DRILL_SILK_TOUCH.isEnabled()){ if(ConfigCrafting.DRILL_SILK_TOUCH.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSilkTouch), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSilkTouch),
"DSD", "SCS", "DSD", "DSD", "SCS", "DSD",
'D', "gemEmerald", 'D', "crystalGreen",
'S', "gemDiamond", 'S', "crystalLightBlue",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeDrillSilk = Util.GetRecipes.lastIRecipe(); recipeDrillSilk = Util.GetRecipes.lastIRecipe();
} }
@ -249,7 +250,7 @@ public class ItemCrafting{
'C', "cobblestone", 'C', "cobblestone",
'E', Items.paper, 'E', Items.paper,
'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'R', "ingotIron")); 'R', "crystalWhite"));
recipeDrillPlacing = Util.GetRecipes.lastIRecipe(); recipeDrillPlacing = Util.GetRecipes.lastIRecipe();
} }
@ -257,8 +258,8 @@ public class ItemCrafting{
if(ConfigCrafting.BATTERY.isEnabled()){ if(ConfigCrafting.BATTERY.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBattery), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBattery),
" R ", "ICI", "III", " R ", "ICI", "III",
'R', "dustRedstone", 'R', "crystalRed",
'I', "ingotIron", 'I', "crystalWhite",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBattery = Util.GetRecipes.lastIRecipe(); recipeBattery = Util.GetRecipes.lastIRecipe();
} }
@ -268,7 +269,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryDouble), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryDouble),
" R ", "ICI", "III", " R ", "ICI", "III",
'R', new ItemStack(InitItems.itemBattery), 'R', new ItemStack(InitItems.itemBattery),
'I', "ingotIron", 'I', "crystalWhite",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryDouble = Util.GetRecipes.lastIRecipe(); recipeBatteryDouble = Util.GetRecipes.lastIRecipe();
} }
@ -277,8 +278,8 @@ public class ItemCrafting{
if(ConfigCrafting.MAGNET_RING.isEnabled()){ if(ConfigCrafting.MAGNET_RING.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMagnetRing), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMagnetRing),
"RIB", "IOI", "BIR", "RIB", "IOI", "BIR",
'R', "dustRedstone", 'R', "crystalRed",
'I', "ingotIron", 'I', "crystalWhite",
'B', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 4),
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeMagnetRing = Util.GetRecipes.lastIRecipe(); recipeMagnetRing = Util.GetRecipes.lastIRecipe();
@ -289,7 +290,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGrowthRing), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGrowthRing),
"SIS", "IOI", "SIS", "SIS", "IOI", "SIS",
'S', new ItemStack(Items.wheat_seeds), 'S', new ItemStack(Items.wheat_seeds),
'I', "ingotIron", 'I', "crystalWhite",
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeGrowthRing = Util.GetRecipes.lastIRecipe(); recipeGrowthRing = Util.GetRecipes.lastIRecipe();
} }
@ -299,7 +300,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWaterRemovalRing), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWaterRemovalRing),
"BIB", "IOI", "BIB", "BIB", "IOI", "BIB",
'B', new ItemStack(Items.water_bucket), 'B', new ItemStack(Items.water_bucket),
'I', "ingotIron", 'I', "crystalWhite",
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeWaterRing = Util.GetRecipes.lastIRecipe(); recipeWaterRing = Util.GetRecipes.lastIRecipe();
} }
@ -309,7 +310,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple),
" R ", "ICI", "III", " R ", "ICI", "III",
'R', new ItemStack(InitItems.itemBatteryDouble), 'R', new ItemStack(InitItems.itemBatteryDouble),
'I', "ingotIron", 'I', "crystalWhite",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryTriple = Util.GetRecipes.lastIRecipe(); recipeBatteryTriple = Util.GetRecipes.lastIRecipe();
} }
@ -319,7 +320,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple),
" R ", "ICI", "III", " R ", "ICI", "III",
'R', new ItemStack(InitItems.itemBatteryTriple), 'R', new ItemStack(InitItems.itemBatteryTriple),
'I', "ingotIron", 'I', "crystalWhite",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryQuadruple = Util.GetRecipes.lastIRecipe(); recipeBatteryQuadruple = Util.GetRecipes.lastIRecipe();
} }
@ -329,7 +330,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple),
" R ", "ICI", "III", " R ", "ICI", "III",
'R', new ItemStack(InitItems.itemBatteryQuadruple), 'R', new ItemStack(InitItems.itemBatteryQuadruple),
'I', "ingotIron", 'I', "crystalWhite",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryQuintuple = Util.GetRecipes.lastIRecipe(); recipeBatteryQuintuple = Util.GetRecipes.lastIRecipe();
} }
@ -339,7 +340,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats),
"WNW", "WDW", "WNW", "WNW", "WDW", "WNW",
'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()),
'N', "blockDiamond", 'N', "blockCrystalLightBlue",
'D', new ItemStack(Items.nether_star))); 'D', new ItemStack(Items.nether_star)));
recipeWings = Util.GetRecipes.lastIRecipe(); recipeWings = Util.GetRecipes.lastIRecipe();
} }
@ -356,7 +357,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
" R ", "RIR", " R ", " R ", "RIR", " R ",
'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
'R', "dustRedstone")); 'R', "crystalRed"));
recipeCoil = Util.GetRecipes.lastIRecipe(); recipeCoil = Util.GetRecipes.lastIRecipe();
} }
@ -399,7 +400,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlowerAdvanced), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlowerAdvanced),
" F", "DP", "DC", " F", "DP", "DC",
'F', new ItemStack(Items.flint), 'F', new ItemStack(Items.flint),
'D', "gemDiamond", 'D', "crystalLightBlue",
'P', new ItemStack(Blocks.piston), 'P', new ItemStack(Blocks.piston),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLeafBlowerAdvanced = Util.GetRecipes.lastIRecipe(); recipeLeafBlowerAdvanced = Util.GetRecipes.lastIRecipe();
@ -514,7 +515,7 @@ public class ItemCrafting{
} }
public static void addRingRecipeWithStack(ItemStack mainStack, int meta){ public static void addRingRecipeWithStack(ItemStack mainStack, int meta){
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(Blocks.diamond_block), new ItemStack(Items.nether_wart), new ItemStack(Items.potionitem), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), new ItemStack(Items.nether_wart), new ItemStack(Items.potionitem), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()));
recipesPotionRings.add(Util.GetRecipes.lastIRecipe()); recipesPotionRings.add(Util.GetRecipes.lastIRecipe());
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(Items.nether_star), new ItemStack(Items.nether_star)); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(Items.nether_star), new ItemStack(Items.nether_star));
recipesPotionRings.add(Util.GetRecipes.lastIRecipe()); recipesPotionRings.add(Util.GetRecipes.lastIRecipe());

16
src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java
View file

@ -11,20 +11,36 @@
package ellpeck.actuallyadditions.crafting; package ellpeck.actuallyadditions.crafting;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import ellpeck.actuallyadditions.blocks.InitBlocks;
import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.config.values.ConfigCrafting;
import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.InitItems;
import ellpeck.actuallyadditions.items.metalists.TheCrystals;
import ellpeck.actuallyadditions.items.metalists.TheFoods; import ellpeck.actuallyadditions.items.metalists.TheFoods;
import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
import ellpeck.actuallyadditions.util.Util; import ellpeck.actuallyadditions.util.Util;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
public class MiscCrafting{ public class MiscCrafting{
public static IRecipe[] recipesCrystals = new IRecipe[TheCrystals.values().length];
public static IRecipe[] recipesCrystalBlocks = new IRecipe[TheCrystals.values().length];
public static void init(){ public static void init(){
//Crystals
for(int i = 0; i < TheCrystals.values().length; i++){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i),
"XXX", "XXX", "XXX",
'X', new ItemStack(InitItems.itemCrystal, 1, i)));
recipesCrystalBlocks[i] = Util.GetRecipes.lastIRecipe();
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystal, 9, i), new ItemStack(InitBlocks.blockCrystal, 1, i)));
recipesCrystals[i] = Util.GetRecipes.lastIRecipe();
}
//Dough //Dough
if(ConfigCrafting.DOUGH.isEnabled()){ if(ConfigCrafting.DOUGH.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()),

3
src/main/java/ellpeck/actuallyadditions/items/metalists/TheCrystals.java
View file

@ -18,7 +18,8 @@ public enum TheCrystals{
LAPIS("Blue", EnumRarity.uncommon, 131437), LAPIS("Blue", EnumRarity.uncommon, 131437),
DIAMOND("LightBlue", EnumRarity.epic, 9211636), DIAMOND("LightBlue", EnumRarity.epic, 9211636),
COAL("Black", EnumRarity.uncommon, 986895), COAL("Black", EnumRarity.uncommon, 986895),
EMERALD("Green", EnumRarity.epic, 382466); EMERALD("Green", EnumRarity.epic, 382466),
IRON("White", EnumRarity.rare, 11053224);
public final String name; public final String name;
public final EnumRarity rarity; public final EnumRarity rarity;

1
src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java
View file

@ -72,6 +72,7 @@ public class NeiScreenEvents{
Minecraft.getMinecraft().displayGuiScreen(book); Minecraft.getMinecraft().displayGuiScreen(book);
BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true);
BookletUtils.openChapter(book, page.getChapter(), page); BookletUtils.openChapter(book, page.getChapter(), page);
break;
} }
} }
} }

2
src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java
View file

@ -72,12 +72,14 @@ public class InitOreDict{
addOre(InitItems.itemCrystal, TheCrystals.DIAMOND.ordinal(), "crystalLightBlue"); addOre(InitItems.itemCrystal, TheCrystals.DIAMOND.ordinal(), "crystalLightBlue");
addOre(InitItems.itemCrystal, TheCrystals.EMERALD.ordinal(), "crystalGreen"); addOre(InitItems.itemCrystal, TheCrystals.EMERALD.ordinal(), "crystalGreen");
addOre(InitItems.itemCrystal, TheCrystals.COAL.ordinal(), "crystalBlack"); addOre(InitItems.itemCrystal, TheCrystals.COAL.ordinal(), "crystalBlack");
addOre(InitItems.itemCrystal, TheCrystals.IRON.ordinal(), "crystalWhite");
addOre(InitBlocks.blockCrystal, TheCrystals.REDSTONE.ordinal(), "blockCrystalRed"); addOre(InitBlocks.blockCrystal, TheCrystals.REDSTONE.ordinal(), "blockCrystalRed");
addOre(InitBlocks.blockCrystal, TheCrystals.LAPIS.ordinal(), "blockCrystalBlue"); addOre(InitBlocks.blockCrystal, TheCrystals.LAPIS.ordinal(), "blockCrystalBlue");
addOre(InitBlocks.blockCrystal, TheCrystals.DIAMOND.ordinal(), "blockCrystalLightBlue"); addOre(InitBlocks.blockCrystal, TheCrystals.DIAMOND.ordinal(), "blockCrystalLightBlue");
addOre(InitBlocks.blockCrystal, TheCrystals.EMERALD.ordinal(), "blockCrystalGreen"); addOre(InitBlocks.blockCrystal, TheCrystals.EMERALD.ordinal(), "blockCrystalGreen");
addOre(InitBlocks.blockCrystal, TheCrystals.COAL.ordinal(), "blockCrystalBlack"); addOre(InitBlocks.blockCrystal, TheCrystals.COAL.ordinal(), "blockCrystalBlack");
addOre(InitBlocks.blockCrystal, TheCrystals.IRON.ordinal(), "blockCrystalWhite");
addOre(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), "oreQuartzBlack"); addOre(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), "oreQuartzBlack");

2
src/main/java/ellpeck/actuallyadditions/recipe/AtomicReconstructorRecipeHandler.java
View file

@ -26,12 +26,14 @@ public class AtomicReconstructorRecipeHandler{
addRecipe("blockDiamond", "blockCrystalLightBlue"); addRecipe("blockDiamond", "blockCrystalLightBlue");
addRecipe("blockEmerald", "blockCrystalGreen"); addRecipe("blockEmerald", "blockCrystalGreen");
addRecipe("blockCoal", "blockCrystalBlack"); addRecipe("blockCoal", "blockCrystalBlack");
addRecipe("blockIron", "blockCrystalWhite");
addRecipe("dustRedstone", "crystalRed"); addRecipe("dustRedstone", "crystalRed");
addRecipe("gemLapis", "crystalBlue"); addRecipe("gemLapis", "crystalBlue");
addRecipe("gemDiamond", "crystalLightBlue"); addRecipe("gemDiamond", "crystalLightBlue");
addRecipe("gemEmerald", "crystalGreen"); addRecipe("gemEmerald", "crystalGreen");
addRecipe("coal", "crystalBlack"); addRecipe("coal", "crystalBlack");
addRecipe("ingotIron", "crystalWhite");
} }
public static void addRecipe(String input, String output){ public static void addRecipe(String input, String output){

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

@ -120,6 +120,7 @@ tile.actuallyadditions.blockCrystalBlue.name=Palis Crystal Block
tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block
tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block
tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block
tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block
#ESD #ESD
tile.actuallyadditions.blockInputter.name=ESD tile.actuallyadditions.blockInputter.name=ESD
@ -300,6 +301,7 @@ item.actuallyadditions.itemCrystalBlue.name=Palis Crystal
item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal
item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal
item.actuallyadditions.itemCrystalBlack.name=Void Crystal item.actuallyadditions.itemCrystalBlack.name=Void Crystal
item.actuallyadditions.itemCrystalWhite.name=Enori Crystal
#Tooltips #Tooltips
tooltip.actuallyadditions.onSuffix.desc=On tooltip.actuallyadditions.onSuffix.desc=On
@ -592,5 +594,5 @@ booklet.actuallyadditions.chapter.blackLotus.text.1=Think of this: <n>You need t
booklet.actuallyadditions.chapter.blackLotus.text.2=<i>No, not that one, Vaz booklet.actuallyadditions.chapter.blackLotus.text.2=<i>No, not that one, Vaz
booklet.actuallyadditions.chapter.crystals.name=Crystals & At. Reconstructor booklet.actuallyadditions.chapter.crystals.name=Crystals & At. Reconstructor
booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in <imp>Actually Additions<r>, you will need <item>Crystals<r> or <item>Crystal Blocks<r>. <n>These can be made using an <item>Atomic Reconstructor<r>. Just place one down facing in any direction and it will <imp>shoot out a red laser<r>. When placing some of the blocks shown on the following pages in front of the laser, they will be <imp>converted into Crystals<r>. booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in <imp>Actually Additions<r>, you will need <item>Crystals<r> or <item>Crystal Blocks<r>. <n>These can be made using an <item>Atomic Reconstructor<r>. Just place one down facing in any direction and it will <imp>shoot out a red laser<r>. When placing some of the blocks shown on the following pages in front of the laser, they will be <imp>converted into Crystals<r>. <n>During each conversion, it uses <imp><power> RF<r>.
booklet.actuallyadditions.chapter.crystals.text.2=The way this works is that the laser <imp>searches for a block<r>, and when it finds one, it converts <imp>all blocks and items on the ground<r> in that area into their Crystal forms (if they have one!). <n>During each conversion, it uses <imp><power> RF<r>. booklet.actuallyadditions.chapter.crystals.text.2=The way this works is that the laser <imp>searches for a block<r>, and when it finds one, it converts <imp>all blocks and items on the ground<r> in that area into their Crystal forms (if they have one!). <n><n>When trying to power the Reconstructor, at first you will notice that <imp>many power sources require crystals<r> to be crafted. Not to worry, though, as you can <imp>use<r> <item>Coal Generators<r> to create your first couple of crystals before you can <imp>upgrade to better sources<r>.

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystal.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 384 B