Skip to content

Commit

Permalink
Merge branch '1.11.2' of https://github.com/squeek502/AppleCore into …
Browse files Browse the repository at this point in the history
…1.12
  • Loading branch information
squeek502 committed Dec 10, 2017
2 parents 327a4d9 + ba288cb commit 5c04d31
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions java/squeek/applecore/example/BlockEdibleExample.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore")
@Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "applecore")
public class BlockEdibleExample extends BlockCake implements IEdibleBlock
{
private boolean isEdibleAtMaxHunger = false;

@Optional.Method(modid = "AppleCore")
@Optional.Method(modid = "applecore")
@Override
public void setEdibleAtMaxHunger(boolean value)
{
isEdibleAtMaxHunger = value;
}

@Optional.Method(modid = "AppleCore")
@Optional.Method(modid = "applecore")
@Override
public FoodValues getFoodValues(@Nonnull ItemStack itemStack)
{
Expand All @@ -39,7 +39,7 @@ public FoodValues getFoodValues(@Nonnull ItemStack itemStack)

// This needs to be abstracted into an Optional method,
// otherwise the ItemFoodProxy reference will cause problems
@Optional.Method(modid = "AppleCore")
@Optional.Method(modid = "applecore")
public void onEatenCompatibility(ItemStack itemStack, EntityPlayer player)
{
// one possible compatible method
Expand Down Expand Up @@ -71,7 +71,7 @@ private boolean eat(World world, BlockPos pos, IBlockState state, EntityPlayer p
}
else
{
if (Loader.isModLoaded("AppleCore"))
if (Loader.isModLoaded("applecore"))
{
onEatenCompatibility(new ItemStack(this), player);
}
Expand Down

0 comments on commit 5c04d31

Please sign in to comment.