mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 23:28:35 +01:00
Added Iron Casing & Drill Core
This commit is contained in:
parent
1ccf136be6
commit
4c6d76d82e
12 changed files with 62 additions and 24 deletions
|
@ -35,9 +35,11 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{
|
||||||
public IIcon[] textures;
|
public IIcon[] textures;
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private IIcon stoneCasingSeasonalTop;
|
private IIcon casingSeasonalTop;
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private IIcon stoneCasingSeasonal;
|
private IIcon stoneCasingSeasonal;
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
private IIcon ironCasingSeasonal;
|
||||||
|
|
||||||
public BlockMisc(){
|
public BlockMisc(){
|
||||||
super(Material.rock);
|
super(Material.rock);
|
||||||
|
@ -49,8 +51,13 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public IIcon getIcon(int side, int metadata){
|
public IIcon getIcon(int side, int metadata){
|
||||||
if(ClientProxy.jingleAllTheWay && metadata == TheMiscBlocks.STONE_CASING.ordinal() && side != 0){
|
if(ClientProxy.jingleAllTheWay && side != 0){
|
||||||
return side == 1 ? this.stoneCasingSeasonalTop : this.stoneCasingSeasonal;
|
if(metadata == TheMiscBlocks.STONE_CASING.ordinal()){
|
||||||
|
return side == 1 ? this.casingSeasonalTop : this.stoneCasingSeasonal;
|
||||||
|
}
|
||||||
|
else if(metadata == TheMiscBlocks.IRON_CASING.ordinal()){
|
||||||
|
return side == 1 ? this.casingSeasonalTop : this.ironCasingSeasonal;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return metadata >= textures.length ? null : textures[metadata];
|
return metadata >= textures.length ? null : textures[metadata];
|
||||||
}
|
}
|
||||||
|
@ -76,8 +83,9 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{
|
||||||
textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].name);
|
textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].name);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.stoneCasingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop");
|
this.casingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop");
|
||||||
this.stoneCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnow");
|
this.stoneCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnow");
|
||||||
|
this.ironCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscIronCasingSnow");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -23,7 +23,8 @@ public enum TheMiscBlocks{
|
||||||
CHARCOAL_BLOCK("Charcoal", EnumRarity.common),
|
CHARCOAL_BLOCK("Charcoal", EnumRarity.common),
|
||||||
ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare),
|
ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare),
|
||||||
LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon),
|
LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon),
|
||||||
ENDER_CASING("EnderCasing", EnumRarity.epic);
|
ENDER_CASING("EnderCasing", EnumRarity.epic),
|
||||||
|
IRON_CASING("IronCasing", EnumRarity.rare);
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final EnumRarity rarity;
|
public final EnumRarity rarity;
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class InitBooklet{
|
||||||
|
|
||||||
//Miscellaneous
|
//Miscellaneous
|
||||||
BookletPage pageStoneCase = new PageCrafting(5, BlockCrafting.recipeStoneCase);
|
BookletPage pageStoneCase = new PageCrafting(5, BlockCrafting.recipeStoneCase);
|
||||||
new BookletChapter("craftingIngs", entryMisc, 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(), ClientProxy.jingleAllTheWay ? pageStoneCase : pageStoneCase.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()).setImportant();
|
new BookletChapter("craftingIngs", entryMisc, 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(), ClientProxy.jingleAllTheWay ? pageStoneCase : pageStoneCase.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("quartz", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("<lowest>", ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue()).addTextReplacement("<highest>", ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue()), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText());
|
new BookletChapter("quartz", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("<lowest>", ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue()).addTextReplacement("<highest>", ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue()), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText());
|
||||||
new BookletChapter("cloud", entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial();
|
new BookletChapter("cloud", entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial();
|
||||||
new BookletChapter("coalStuff", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());
|
new BookletChapter("coalStuff", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());
|
||||||
|
@ -115,7 +115,7 @@ public class InitBooklet{
|
||||||
new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()]));
|
new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()]));
|
||||||
|
|
||||||
//RF Using Items
|
//RF Using Items
|
||||||
new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
|
new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial();
|
||||||
new BookletChapter("staff", entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant();
|
new BookletChapter("staff", entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant();
|
||||||
new BookletChapter("magnetRing", entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing));
|
new BookletChapter("magnetRing", entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing));
|
||||||
new BookletChapter("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));
|
new BookletChapter("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));
|
||||||
|
|
|
@ -153,7 +153,7 @@ public class PageCrafting extends BookletPage{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack[] getItemStacksForPage(){
|
public ItemStack[] getItemStacksForPage(){
|
||||||
if(this.recipes != null && this.recipes.length > 0){
|
if(this.recipes != null && this.recipes.length > 0 && this.recipes[0] != null){
|
||||||
return new ItemStack[]{this.recipes[0].getRecipeOutput()};
|
return new ItemStack[]{this.recipes[0].getRecipeOutput()};
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -18,6 +18,7 @@ public enum ConfigCrafting{
|
||||||
CLOUD("Smiley Cloud", ConfigCategories.BLOCKS_CRAFTING),
|
CLOUD("Smiley Cloud", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING),
|
XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING),
|
WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
|
IRON_CASING("Iron Casing", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING),
|
STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING),
|
FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
REPAIRER("Repairer", ConfigCategories.BLOCKS_CRAFTING),
|
REPAIRER("Repairer", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
|
@ -156,7 +157,8 @@ public enum ConfigCrafting{
|
||||||
LASER_RELAY("Laser Relay", ConfigCategories.BLOCKS_CRAFTING),
|
LASER_RELAY("Laser Relay", ConfigCategories.BLOCKS_CRAFTING),
|
||||||
LASER_WRENCH("Laser Wrench", ConfigCategories.ITEMS_CRAFTING),
|
LASER_WRENCH("Laser Wrench", ConfigCategories.ITEMS_CRAFTING),
|
||||||
|
|
||||||
CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING);
|
CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING),
|
||||||
|
DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING);
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final String category;
|
public final String category;
|
||||||
|
|
|
@ -174,7 +174,7 @@ public enum ConfigIntValues{
|
||||||
RANGED_COLLECTOR_RANGE("Ranged Collector: Range", ConfigCategories.MACHINE_VALUES, 6, 1, 30, "The range of the Ranged Collector"),
|
RANGED_COLLECTOR_RANGE("Ranged Collector: Range", ConfigCategories.MACHINE_VALUES, 6, 1, 30, "The range of the Ranged Collector"),
|
||||||
|
|
||||||
LASER_RELAY_LOSS("Laser Relay: Loss", ConfigCategories.MACHINE_VALUES, 5, 0, 80, "The Energy Loss of the Laser Relay per Transfer in Percent"),
|
LASER_RELAY_LOSS("Laser Relay: Loss", ConfigCategories.MACHINE_VALUES, 5, 0, 80, "The Energy Loss of the Laser Relay per Transfer in Percent"),
|
||||||
LASER_RELAY_MAX_DISTANCE("Laser Relay: Max Distance", ConfigCategories.MACHINE_VALUES, 10, 3, 80, "The max distance between two connected Laser Relays");
|
LASER_RELAY_MAX_DISTANCE("Laser Relay: Max Distance", ConfigCategories.MACHINE_VALUES, 15, 3, 80, "The max distance between two connected Laser Relays");
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final String category;
|
public final String category;
|
||||||
|
|
|
@ -39,6 +39,7 @@ public class BlockCrafting{
|
||||||
public static IRecipe recipeLiquidPlacer;
|
public static IRecipe recipeLiquidPlacer;
|
||||||
public static IRecipe recipeLiquidCollector;
|
public static IRecipe recipeLiquidCollector;
|
||||||
public static IRecipe recipeCase;
|
public static IRecipe recipeCase;
|
||||||
|
public static IRecipe recipeIronCase;
|
||||||
public static IRecipe recipeStoneCase;
|
public static IRecipe recipeStoneCase;
|
||||||
public static IRecipe recipeEnderCase;
|
public static IRecipe recipeEnderCase;
|
||||||
public static IRecipe recipeEnderPearlBlock;
|
public static IRecipe recipeEnderPearlBlock;
|
||||||
|
@ -83,8 +84,9 @@ public class BlockCrafting{
|
||||||
|
|
||||||
//Laser Relay
|
//Laser Relay
|
||||||
if(ConfigCrafting.LASER_RELAY.isEnabled()){
|
if(ConfigCrafting.LASER_RELAY.isEnabled()){
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelay),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelay, 2),
|
||||||
"ORO", "RCR", "ORO",
|
"OBO", "RCR", "OBO",
|
||||||
|
'B', new ItemStack(Blocks.redstone_block),
|
||||||
'O', new ItemStack(Blocks.obsidian),
|
'O', new ItemStack(Blocks.obsidian),
|
||||||
'R', new ItemStack(Items.redstone),
|
'R', new ItemStack(Items.redstone),
|
||||||
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
|
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
|
||||||
|
@ -155,6 +157,16 @@ public class BlockCrafting{
|
||||||
recipeCase = Util.GetRecipes.lastIRecipe();
|
recipeCase = Util.GetRecipes.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Iron Casing
|
||||||
|
if(ConfigCrafting.IRON_CASING.isEnabled()){
|
||||||
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
|
||||||
|
"WSW", "SQS", "WSW",
|
||||||
|
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
|
||||||
|
'W', "ingotIron",
|
||||||
|
'S', "stickWood"));
|
||||||
|
recipeIronCase = Util.GetRecipes.lastIRecipe();
|
||||||
|
}
|
||||||
|
|
||||||
//Ender Casing
|
//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()),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()),
|
||||||
|
@ -191,7 +203,7 @@ public class BlockCrafting{
|
||||||
"I I", "CAC", "I I",
|
"I I", "CAC", "I I",
|
||||||
'I', "ingotIron",
|
'I', "ingotIron",
|
||||||
'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.STONE_CASING.ordinal())));
|
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
|
||||||
recipeEnergizer = Util.GetRecipes.lastIRecipe();
|
recipeEnergizer = Util.GetRecipes.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,7 +213,7 @@ public class BlockCrafting{
|
||||||
" I ", "CAC", " I ",
|
" I ", "CAC", " I ",
|
||||||
'I', "ingotIron",
|
'I', "ingotIron",
|
||||||
'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.STONE_CASING.ordinal())));
|
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
|
||||||
recipeEnervator = Util.GetRecipes.lastIRecipe();
|
recipeEnervator = Util.GetRecipes.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,7 +221,7 @@ public class BlockCrafting{
|
||||||
if(ConfigCrafting.LAVA_FACTORY.isEnabled()){
|
if(ConfigCrafting.LAVA_FACTORY.isEnabled()){
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController),
|
||||||
"SCS", "ISI", "LLL",
|
"SCS", "ISI", "LLL",
|
||||||
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_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', "blockIron",
|
||||||
'L', Items.lava_bucket));
|
'L', Items.lava_bucket));
|
||||||
|
@ -220,7 +232,7 @@ public class BlockCrafting{
|
||||||
if(ConfigCrafting.CASING.isEnabled()){
|
if(ConfigCrafting.CASING.isEnabled()){
|
||||||
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.STONE_CASING.ordinal()),
|
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
|
||||||
'I', "blockIron"));
|
'I', "blockIron"));
|
||||||
recipeCasing = Util.GetRecipes.lastIRecipe();
|
recipeCasing = Util.GetRecipes.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
@ -241,7 +253,7 @@ public class BlockCrafting{
|
||||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOreMagnet),
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOreMagnet),
|
||||||
"SSS", "CBC", "ISI",
|
"SSS", "CBC", "ISI",
|
||||||
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
|
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
|
||||||
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
|
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
|
||||||
'B', new ItemStack(InitItems.itemBatteryDouble),
|
'B', new ItemStack(InitItems.itemBatteryDouble),
|
||||||
'I', new ItemStack(Blocks.iron_block)));
|
'I', new ItemStack(Blocks.iron_block)));
|
||||||
recipeMiner = Util.GetRecipes.lastIRecipe();
|
recipeMiner = Util.GetRecipes.lastIRecipe();
|
||||||
|
@ -347,7 +359,7 @@ public class BlockCrafting{
|
||||||
"IEI", "GLG", "ICI",
|
"IEI", "GLG", "ICI",
|
||||||
'I', "ingotIron",
|
'I', "ingotIron",
|
||||||
'G', "ingotGold",
|
'G', "ingotGold",
|
||||||
'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_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())));
|
||||||
recipeLeafGen = Util.GetRecipes.lastIRecipe();
|
recipeLeafGen = Util.GetRecipes.lastIRecipe();
|
||||||
|
@ -403,7 +415,7 @@ public class BlockCrafting{
|
||||||
"IQI", "CDC", "IBI",
|
"IQI", "CDC", "IBI",
|
||||||
'D', "blockDiamond",
|
'D', "blockDiamond",
|
||||||
'I', "ingotIron",
|
'I', "ingotIron",
|
||||||
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_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)));
|
||||||
recipeSolar = Util.GetRecipes.lastIRecipe();
|
recipeSolar = Util.GetRecipes.lastIRecipe();
|
||||||
|
@ -413,9 +425,9 @@ 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', "gemDiamond",
|
'D', "ingotIron",
|
||||||
'R', new ItemStack(Items.repeater),
|
'R', new ItemStack(Items.repeater),
|
||||||
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
|
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
|
||||||
'L', new ItemStack(Items.lava_bucket),
|
'L', new ItemStack(Items.lava_bucket),
|
||||||
'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)));
|
||||||
|
|
|
@ -73,6 +73,7 @@ public class ItemCrafting{
|
||||||
public static ArrayList<IRecipe> recipesPotionRings = new ArrayList<IRecipe>();
|
public static ArrayList<IRecipe> recipesPotionRings = new ArrayList<IRecipe>();
|
||||||
public static IRecipe recipeChestToCrateUpgrade;
|
public static IRecipe recipeChestToCrateUpgrade;
|
||||||
public static IRecipe recipeLaserWrench;
|
public static IRecipe recipeLaserWrench;
|
||||||
|
public static IRecipe recipeDrillCore;
|
||||||
|
|
||||||
public static void init(){
|
public static void init(){
|
||||||
|
|
||||||
|
@ -134,11 +135,21 @@ public class ItemCrafting{
|
||||||
"DDD", "CRC", "III",
|
"DDD", "CRC", "III",
|
||||||
'D', "gemDiamond",
|
'D', "gemDiamond",
|
||||||
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
|
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
|
||||||
'R', "dustRedstone",
|
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
|
||||||
'I', "blockIron"));
|
'I', "blockIron"));
|
||||||
recipeDrill = Util.GetRecipes.lastIRecipe();
|
recipeDrill = Util.GetRecipes.lastIRecipe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Drill Core
|
||||||
|
if(ConfigCrafting.DRILL_CORE.isEnabled()){
|
||||||
|
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
|
||||||
|
"ICI", "CRC", "ICI",
|
||||||
|
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
|
||||||
|
'R', "dustRedstone",
|
||||||
|
'I', "blockIron"));
|
||||||
|
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),
|
||||||
|
|
|
@ -29,7 +29,8 @@ public enum TheMiscItems{
|
||||||
RICE_SLIME("RiceSlime", EnumRarity.uncommon),
|
RICE_SLIME("RiceSlime", EnumRarity.uncommon),
|
||||||
CANOLA("Canola", EnumRarity.uncommon),
|
CANOLA("Canola", EnumRarity.uncommon),
|
||||||
CUP("Cup", EnumRarity.uncommon),
|
CUP("Cup", EnumRarity.uncommon),
|
||||||
BAT_WING("BatWing", EnumRarity.rare);
|
BAT_WING("BatWing", EnumRarity.rare),
|
||||||
|
DRILL_CORE("DrillCore", EnumRarity.uncommon);
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final EnumRarity rarity;
|
public final EnumRarity rarity;
|
||||||
|
|
|
@ -106,6 +106,7 @@ tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator
|
||||||
tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker
|
tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker
|
||||||
tile.actuallyadditions.blockRangedCollector.name=Ranged Collector
|
tile.actuallyadditions.blockRangedCollector.name=Ranged Collector
|
||||||
tile.actuallyadditions.blockLaserRelay.name=Laser Relay
|
tile.actuallyadditions.blockLaserRelay.name=Laser Relay
|
||||||
|
tile.actuallyadditions.blockMiscIronCasing.name=Iron Casing
|
||||||
|
|
||||||
#ESD
|
#ESD
|
||||||
tile.actuallyadditions.blockInputter.name=ESD
|
tile.actuallyadditions.blockInputter.name=ESD
|
||||||
|
@ -279,6 +280,7 @@ item.actuallyadditions.itemBootsQuartz.name=Black Quartz Boots
|
||||||
item.actuallyadditions.itemBooklet.name=Actually Additions Manual
|
item.actuallyadditions.itemBooklet.name=Actually Additions Manual
|
||||||
item.actuallyadditions.itemLaserWrench.name=Laser Wrench
|
item.actuallyadditions.itemLaserWrench.name=Laser Wrench
|
||||||
item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade
|
item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade
|
||||||
|
item.actuallyadditions.itemMiscDrillCore.name=Drill Core
|
||||||
|
|
||||||
#Tooltips
|
#Tooltips
|
||||||
tooltip.actuallyadditions.onSuffix.desc=On
|
tooltip.actuallyadditions.onSuffix.desc=On
|
||||||
|
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 301 B |
|
@ -10,3 +10,4 @@
|
||||||
- New AIOT Textures
|
- New AIOT Textures
|
||||||
- AIOT Integration for SimpleOres 2
|
- AIOT Integration for SimpleOres 2
|
||||||
- Changed Ball Of Hair Name to "Ball Of Fur", addedBooklet Page
|
- Changed Ball Of Hair Name to "Ball Of Fur", addedBooklet Page
|
||||||
|
- Added Iron Casing & Drill Core
|
Loading…
Reference in a new issue