From e2865afb49481c8d778b5266e57b017a569ce788 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 7 Feb 2017 18:25:45 +0100 Subject: [PATCH] implemented charset carrying for most blocks Closes #621 --- .../actuallyadditions/mod/util/ItemUtil.java | 5 +++ .../mod/util/compat/IMCHandler.java | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java index e92cc45db..e904b9bab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.util; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; +import de.ellpeck.actuallyadditions.mod.util.compat.IMCHandler; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; @@ -52,6 +53,8 @@ public final class ItemUtil{ block.setCreativeTab(addTab ? CreativeTab.INSTANCE : null); + IMCHandler.doBlockIMC(block); + addUnderscoreNameToMapUnderscorelessName(block.getRegistryName()); } @@ -63,6 +66,8 @@ public final class ItemUtil{ item.setCreativeTab(addTab ? CreativeTab.INSTANCE : null); + IMCHandler.doItemIMC(item); + if(item instanceof IColorProvidingItem){ ActuallyAdditions.proxy.addColoredItem(item); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java new file mode 100644 index 000000000..40578101e --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/IMCHandler.java @@ -0,0 +1,41 @@ +/* + * This file ("IMCHandler.java") is part of the Actually Additions mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://ellpeck.de/actaddlicense + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2015-2017 Ellpeck + */ + +package de.ellpeck.actuallyadditions.mod.util.compat; + +import de.ellpeck.actuallyadditions.mod.blocks.*; +import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import org.apache.commons.lang3.ArrayUtils; + +public final class IMCHandler{ + + private static final Class[] NO_CARRYING = new Class[]{ + BlockGiantChest.class, + BlockWildPlant.class, + BlockPlant.class, + BlockPhantom.class, + BlockTinyTorch.class, + BlockItemViewer.class, + BlockLaserRelay.class + }; + + public static void doBlockIMC(Block block){ + if(!ArrayUtils.contains(NO_CARRYING, block.getClass())){ + FMLInterModComms.sendMessage("charsetlib", "addCarry", block.getRegistryName()); + } + } + + public static void doItemIMC(Item item){ + + } +}