Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Added recipe for empowered oil

Browse source
This commit is contained in:
Ellpeck 2016-09-13 20:40:26 +02:00
parent 541410be5e
commit 820f097c12
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java
View file

@ -78,16 +78,19 @@ public class ItemMisc extends ItemBase{
public boolean onEntityItemUpdate(EntityItem entity){ public boolean onEntityItemUpdate(EntityItem entity){
if(!entity.worldObj.isRemote){ if(!entity.worldObj.isRemote){
ItemStack stack = entity.getEntityItem(); ItemStack stack = entity.getEntityItem();
if(stack != null && stack.getItemDamage() == TheMiscItems.CRYSTALLIZED_CANOLA_SEED.ordinal()){ if(stack != null){
BlockPos pos = entity.getPosition(); boolean isEmpowered = stack.getItemDamage() == TheMiscItems.EMPOWERED_CANOLA_SEED.ordinal();
IBlockState state = entity.worldObj.getBlockState(pos); if(stack.getItemDamage() == TheMiscItems.CRYSTALLIZED_CANOLA_SEED.ordinal() || isEmpowered){
Block block = state.getBlock(); BlockPos pos = entity.getPosition();
IBlockState state = entity.worldObj.getBlockState(pos);
Block block = state.getBlock();
if(block instanceof IFluidBlock && block.getMetaFromState(state) == 0){ if(block instanceof IFluidBlock && block.getMetaFromState(state) == 0){
Fluid fluid = ((IFluidBlock)block).getFluid(); Fluid fluid = ((IFluidBlock)block).getFluid();
if(fluid != null && fluid == InitFluids.fluidOil){ if(fluid != null && fluid == (isEmpowered ? InitFluids.fluidCrystalOil : InitFluids.fluidOil)){
entity.setDead(); entity.setDead();
entity.worldObj.setBlockState(pos, InitFluids.blockCrystalOil.getDefaultState()); entity.worldObj.setBlockState(pos, (isEmpowered ? InitFluids.blockEmpoweredOil : InitFluids.blockCrystalOil).getDefaultState());
}
} }
} }
} }

1
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java
View file

@ -39,6 +39,7 @@ public enum TheMiscItems{
BIOMASS("Biomass", EnumRarity.UNCOMMON), BIOMASS("Biomass", EnumRarity.UNCOMMON),
BIOCOAL("Biocoal", EnumRarity.RARE), BIOCOAL("Biocoal", EnumRarity.RARE),
CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.UNCOMMON), CRYSTALLIZED_CANOLA_SEED("CrystallizedCanolaSeed", EnumRarity.UNCOMMON),
EMPOWERED_CANOLA_SEED("EmpoweredCanolaSeed", EnumRarity.RARE),
YOUTUBE_ICON("YoutubeIcon", Util.FALLBACK_RARITY); YOUTUBE_ICON("YoutubeIcon", Util.FALLBACK_RARITY);
public final String name; public final String name;

3
src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java
View file

@ -43,6 +43,9 @@ public final class EmpowererHandler{
for(ItemStack ball : balls){ for(ItemStack ball : balls){
addCrystalEmpowering(TheCrystals.EMERALD, new ItemStack(Items.DYE, 1, EnumDyeColor.LIME.getDyeDamage()), new ItemStack(Blocks.TALLGRASS, 1, 1), new ItemStack(Blocks.SAPLING), ball.copy()); addCrystalEmpowering(TheCrystals.EMERALD, new ItemStack(Items.DYE, 1, EnumDyeColor.LIME.getDyeDamage()), new ItemStack(Blocks.TALLGRASS, 1, 1), new ItemStack(Blocks.SAPLING), ball.copy());
} }
ItemStack seed = new ItemStack(InitItems.itemCanolaSeed);
ActuallyAdditionsAPI.addEmpowererRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CRYSTALLIZED_CANOLA_SEED.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.EMPOWERED_CANOLA_SEED.ordinal()), seed, seed, seed, seed, 1000, 30, new float[]{1F, 91F/255F, 76F/255F});
} }
private static void addCrystalEmpowering(TheCrystals type, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4){ private static void addCrystalEmpowering(TheCrystals type, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4){

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

@ -505,6 +505,7 @@ item.actuallyadditions.itemWorm.name=Worm
item.actuallyadditions.itemBag.name=Traveler's Sack item.actuallyadditions.itemBag.name=Traveler's Sack
item.actuallyadditions.itemVoidBag.name=Void Sack item.actuallyadditions.itemVoidBag.name=Void Sack
item.actuallyadditions.itemMiscCrystallizedCanolaSeed.name=Crystallized Canola Seed item.actuallyadditions.itemMiscCrystallizedCanolaSeed.name=Crystallized Canola Seed
item.actuallyadditions.itemMiscEmpoweredCanolaSeed.name=Empowered Canola Seed
#Tooltips #Tooltips
tooltip.actuallyadditions.onSuffix.desc=On tooltip.actuallyadditions.onSuffix.desc=On