From 3456a0e1cb96802d79e9bf2379c25c7f67a4b36a Mon Sep 17 00:00:00 2001 From: Nicolas BARBOTIN Date: Tue, 13 Feb 2018 21:45:07 +0100 Subject: [PATCH] * Updated MCEF API * Fixed Screen missing wiki informations --- libs/mcef-1.12.2-0.9-api.jar | Bin 313717 -> 313966 bytes .../net/montoyo/wd/block/BlockScreen.java | 29 ++++++++++++++++++ .../montoyo/wd/block/WDBlockContainer.java | 8 +---- .../net/montoyo/wd/item/ItemPeripheral.java | 2 ++ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/libs/mcef-1.12.2-0.9-api.jar b/libs/mcef-1.12.2-0.9-api.jar index 0a8686b1a02f15a80ed0e70dc6eb24a3ed56eecb..b2bea17c86f3e0e63f7e0b2c7ddb0b1a04ce28d1 100644 GIT binary patch delta 17486 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 diff --git a/src/main/java/net/montoyo/wd/block/BlockScreen.java b/src/main/java/net/montoyo/wd/block/BlockScreen.java index bf3bab5..5bdc5ac 100644 --- a/src/main/java/net/montoyo/wd/block/BlockScreen.java +++ b/src/main/java/net/montoyo/wd/block/BlockScreen.java @@ -12,9 +12,11 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -35,10 +37,12 @@ import net.montoyo.wd.core.ScreenRights; import net.montoyo.wd.core.IUpgrade; import net.montoyo.wd.data.SetURLData; import net.montoyo.wd.entity.TileEntityScreen; +import net.montoyo.wd.item.WDItem; import net.montoyo.wd.utilities.*; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.List; public class BlockScreen extends WDBlockContainer { @@ -368,4 +372,29 @@ public class BlockScreen extends WDBlockContainer { return state.getValue(emitting); } + @Override + protected ItemBlock createItemBlock() { + return new ItemBlockScreen(this); + } + + private static class ItemBlockScreen extends ItemBlock implements WDItem { + + public ItemBlockScreen(BlockScreen screen) { + super(screen); + } + + @Nullable + @Override + public String getWikiName(@Nonnull ItemStack is) { + return "Screen"; + } + + @Override + public void addInformation(@Nullable ItemStack is, @Nullable World world, @Nullable List tt, @Nullable ITooltipFlag ttFlags) { + super.addInformation(is, world, tt, ttFlags); + WDItem.addInformation(tt); + } + + } + } diff --git a/src/main/java/net/montoyo/wd/block/WDBlockContainer.java b/src/main/java/net/montoyo/wd/block/WDBlockContainer.java index be2589e..4e14b43 100644 --- a/src/main/java/net/montoyo/wd/block/WDBlockContainer.java +++ b/src/main/java/net/montoyo/wd/block/WDBlockContainer.java @@ -13,10 +13,6 @@ public abstract class WDBlockContainer extends BlockContainer { protected ItemBlock itemBlock; - public WDBlockContainer(Material mat, MapColor color) { - super(mat, color); - } - public WDBlockContainer(Material material) { super(material); } @@ -26,9 +22,7 @@ public abstract class WDBlockContainer extends BlockContainer { setRegistryName(name); } - protected ItemBlock createItemBlock() { - return new ItemBlock(this); - } + protected abstract ItemBlock createItemBlock(); public void makeItemBlock() { if(itemBlock != null) diff --git a/src/main/java/net/montoyo/wd/item/ItemPeripheral.java b/src/main/java/net/montoyo/wd/item/ItemPeripheral.java index 53eddb2..d2aefe8 100644 --- a/src/main/java/net/montoyo/wd/item/ItemPeripheral.java +++ b/src/main/java/net/montoyo/wd/item/ItemPeripheral.java @@ -53,6 +53,8 @@ public class ItemPeripheral extends ItemMultiTexture implements WDItem { @Override public void addInformation(@Nullable ItemStack is, @Nullable World world, @Nullable List tt, @Nullable ITooltipFlag ttFlags) { + super.addInformation(is, world, tt, ttFlags); + if(is != null && tt != null) { if(is.getMetadata() == 1) //CC Interface tt.add("" + ChatFormatting.RED + I18n.format("webdisplays.message.missingCC")); //CC is not available for 1.12.2