mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Fix crashes on server from SideOnly
This commit is contained in:
1 parent
99646e8656
commit
0df025c2d5
25 files changed
+148
-63
No files matched your search
@@ -0,0 +1,23 @@
|
||||
package forestry.apiculture.blocks;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
public class AlvearyItemModel implements IItemModelRegister {
|
||||
private final BlockAlveary blockAlveary;
|
||||
|
||||
public AlvearyItemModel(BlockAlveary blockAlveary) {
|
||||
this.blockAlveary = blockAlveary;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, "apiculture/alveary." + blockAlveary.getAlvearyType());
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,9 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
@@ -185,6 +188,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister,
|
||||
|
||||
/* ITEM MODELS */
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (HiveType hiveType : HiveType.VALUES) {
|
||||
manager.registerItemModel(item, hiveType.getMeta(), "beehives/" + hiveType.getName());
|
||||
|
||||
@@ -27,7 +27,6 @@ import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -37,10 +36,10 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
@@ -53,10 +52,11 @@ import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.apiculture.tiles.TileCandle;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
public class BlockCandle extends BlockTorch implements IItemModelRegister, ITileEntityProvider, IBlockColor {
|
||||
public class BlockCandle extends BlockTorch implements IItemModelRegister, ITileEntityProvider, IColoredBlock {
|
||||
|
||||
private static final ImmutableMap<String, Integer> colours;
|
||||
public static final Set<Item> lightingItems;
|
||||
|
||||
@@ -14,7 +14,6 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -37,9 +36,10 @@ import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.apiculture.genetics.BeeGenome;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.genetics.ItemGE;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemBeeGE extends ItemGE implements IItemColor {
|
||||
public class ItemBeeGE extends ItemGE implements IColoredItem {
|
||||
|
||||
private final EnumBeeType type;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
package forestry.apiculture.items;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
@@ -19,9 +18,10 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.apiculture.blocks.BlockCandle;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
|
||||
public class ItemBlockCandle extends ItemBlockForestry<BlockCandle> implements IItemColor {
|
||||
public class ItemBlockCandle extends ItemBlockForestry<BlockCandle> implements IColoredItem {
|
||||
|
||||
public ItemBlockCandle(Block block) {
|
||||
super(block);
|
||||
|
||||
@@ -14,7 +14,6 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -25,9 +24,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemForestry;
|
||||
|
||||
public class ItemHoneyComb extends ItemForestry implements IItemColor {
|
||||
public class ItemHoneyComb extends ItemForestry implements IColoredItem {
|
||||
public ItemHoneyComb() {
|
||||
setMaxDamage(0);
|
||||
setHasSubtypes(true);
|
||||
|
||||
@@ -16,6 +16,10 @@ import net.minecraft.client.renderer.texture.TextureUtil;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TextureHabitatLocator extends TextureAtlasSprite {
|
||||
|
||||
private static TextureHabitatLocator instance;
|
||||
|
||||
@@ -48,12 +48,14 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerVariant(item, WoodHelper.getResourceLocations(this));
|
||||
manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerStateMapper() {
|
||||
Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, null).addPropertyToRemove(POWERED));
|
||||
}
|
||||
|
||||
@@ -10,10 +10,7 @@ import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -39,11 +36,10 @@ import forestry.api.core.Tabs;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.blocks.property.PropertyTreeType;
|
||||
import forestry.arboriculture.genetics.TreeDefinition;
|
||||
import forestry.arboriculture.tiles.TileLeaves;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
|
||||
public abstract class BlockDecorativeLeaves extends Block implements IShearable, IItemModelRegister, IBlockColor {
|
||||
public abstract class BlockDecorativeLeaves extends Block implements IShearable, IItemModelRegister, IColoredBlock {
|
||||
private static final int VARIANTS_PER_BLOCK = 16;
|
||||
private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1;
|
||||
|
||||
@@ -146,6 +142,7 @@ public abstract class BlockDecorativeLeaves extends Block implements IShearable,
|
||||
|
||||
/* MODELS */
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (IBlockState state : blockState.getValidStates()) {
|
||||
int meta = getMetaFromState(state);
|
||||
|
||||
@@ -23,10 +23,7 @@ import net.minecraft.block.ITileEntityProvider;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -68,6 +65,7 @@ import forestry.arboriculture.LeafDecayHelper;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.genetics.TreeDefinition;
|
||||
import forestry.arboriculture.tiles.TileLeaves;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockPos;
|
||||
import forestry.core.proxy.Proxies;
|
||||
@@ -75,7 +73,7 @@ import forestry.core.tiles.TileUtil;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvider, IGrowable, IItemModelRegister, IBlockColor {
|
||||
public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvider, IGrowable, IItemModelRegister, IColoredBlock {
|
||||
|
||||
public BlockForestryLeaves() {
|
||||
setCreativeTab(Tabs.tabArboriculture);
|
||||
@@ -285,6 +283,7 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi
|
||||
|
||||
/* MODELS */
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:leaves", "inventory"));
|
||||
}
|
||||
@@ -357,7 +356,7 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi
|
||||
}
|
||||
|
||||
if (tintIndex == 0) {
|
||||
EntityPlayerSP thePlayer = Minecraft.getMinecraft().thePlayer;
|
||||
EntityPlayer thePlayer = Proxies.common.getPlayer();
|
||||
return leaves.getFoliageColour(thePlayer);
|
||||
} else {
|
||||
return leaves.getFruitColour();
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package forestry.arboriculture.items;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.arboriculture.IFruitProvider;
|
||||
@@ -9,11 +8,11 @@ import forestry.api.arboriculture.ITreeGenome;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.blocks.BlockDecorativeLeaves;
|
||||
import forestry.arboriculture.genetics.TreeDefinition;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
import forestry.core.utils.ColourUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemBlockDecorativeLeaves extends ItemBlockForestry<BlockDecorativeLeaves> implements IItemColor {
|
||||
public class ItemBlockDecorativeLeaves extends ItemBlockForestry<BlockDecorativeLeaves> implements IColoredItem {
|
||||
public ItemBlockDecorativeLeaves(Block block) {
|
||||
super(block);
|
||||
}
|
||||
|
||||
@@ -12,21 +12,21 @@ package forestry.arboriculture.items;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.blocks.BlockForestryLeaves;
|
||||
import forestry.arboriculture.tiles.TileLeaves;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemBlockLeaves extends ItemBlockForestry<BlockForestryLeaves> implements IItemColor {
|
||||
public class ItemBlockLeaves extends ItemBlockForestry<BlockForestryLeaves> implements IColoredItem {
|
||||
|
||||
public ItemBlockLeaves(Block block) {
|
||||
super(block);
|
||||
|
||||
@@ -15,7 +15,6 @@ import java.util.List;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -47,13 +46,14 @@ import forestry.arboriculture.genetics.TreeGenome;
|
||||
import forestry.arboriculture.genetics.pollination.ICheckPollinatable;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.genetics.ItemGE;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.network.packets.PacketFXSignal;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.core.utils.GeneticsUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemGermlingGE extends ItemGE implements IVariableFermentable, IItemColor {
|
||||
public class ItemGermlingGE extends ItemGE implements IVariableFermentable, IColoredItem {
|
||||
|
||||
private final EnumGermlingType type;
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package forestry.core.blocks;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public interface IColoredBlock {
|
||||
int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex);
|
||||
}
|
||||
@@ -13,7 +13,6 @@ package forestry.core.circuits;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -29,9 +28,10 @@ import forestry.api.circuits.ICircuitBoard;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.core.PluginCore;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemForestry;
|
||||
|
||||
public class ItemCircuitBoard extends ItemForestry implements IItemColor {
|
||||
public class ItemCircuitBoard extends ItemForestry implements IColoredItem {
|
||||
|
||||
public ItemCircuitBoard() {
|
||||
setHasSubtypes(true);
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package forestry.core.items;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IColoredItem {
|
||||
int getColorFromItemstack(ItemStack stack, int tintIndex);
|
||||
}
|
||||
@@ -12,7 +12,6 @@ package forestry.core.items;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -31,7 +30,7 @@ import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemCrated extends ItemForestry implements IItemColor {
|
||||
public class ItemCrated extends ItemForestry implements IColoredItem {
|
||||
|
||||
private final ItemStack contained;
|
||||
private final boolean usesOreDict;
|
||||
|
||||
@@ -13,7 +13,6 @@ package forestry.core.items;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -37,7 +36,7 @@ import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.Translator;
|
||||
|
||||
public class ItemLiquidContainer extends ItemForestry implements IItemColor {
|
||||
public class ItemLiquidContainer extends ItemForestry implements IColoredItem {
|
||||
private final EnumContainerType type;
|
||||
private final int color;
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ package forestry.core.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -23,7 +22,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.core.config.Config;
|
||||
|
||||
public class ItemOverlay extends ItemForestry implements IItemColor {
|
||||
public class ItemOverlay extends ItemForestry implements IColoredItem {
|
||||
|
||||
public interface IOverlayInfo {
|
||||
String getUid();
|
||||
|
||||
@@ -10,28 +10,31 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.models;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.vecmath.Vector3f;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.vecmath.Vector3f;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.color.BlockColors;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.IRegistry;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
@@ -45,7 +48,9 @@ import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IStateMapperRegister;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -58,8 +63,8 @@ public class ModelManager implements IModelManager {
|
||||
|
||||
private final List<IItemModelRegister> itemModelRegisters = new ArrayList<>();
|
||||
private final List<IStateMapperRegister> stateMapperRegisters = new ArrayList<>();
|
||||
private final List<IBlockColor> blockColorList = new ArrayList<>();
|
||||
private final List<IItemColor> itemColorList = new ArrayList<>();
|
||||
private final List<IColoredBlock> blockColorList = new ArrayList<>();
|
||||
private final List<IColoredItem> itemColorList = new ArrayList<>();
|
||||
|
||||
private TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null);
|
||||
public final IModelState DEFAULT_BLOCK;
|
||||
@@ -160,24 +165,26 @@ public class ModelManager implements IModelManager {
|
||||
return new ModelResourceLocation(modID + ":" + identifier, "inventory");
|
||||
}
|
||||
|
||||
public void registerBlock(Block block) {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockClient(Block block) {
|
||||
if (block instanceof IItemModelRegister) {
|
||||
itemModelRegisters.add((IItemModelRegister) block);
|
||||
}
|
||||
if (block instanceof IStateMapperRegister) {
|
||||
stateMapperRegisters.add((IStateMapperRegister) block);
|
||||
}
|
||||
if (block instanceof IBlockColor) {
|
||||
blockColorList.add((IBlockColor) block);
|
||||
if (block instanceof IColoredBlock) {
|
||||
blockColorList.add((IColoredBlock) block);
|
||||
}
|
||||
}
|
||||
|
||||
public void registerItem(Item item) {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerItemClient(Item item) {
|
||||
if (item instanceof IItemModelRegister) {
|
||||
itemModelRegisters.add((IItemModelRegister) item);
|
||||
}
|
||||
if (item instanceof IItemColor) {
|
||||
itemColorList.add((IItemColor) item);
|
||||
if (item instanceof IColoredItem) {
|
||||
itemColorList.add((IColoredItem) item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,20 +213,56 @@ public class ModelManager implements IModelManager {
|
||||
Minecraft minecraft = Minecraft.getMinecraft();
|
||||
|
||||
BlockColors blockColors = minecraft.getBlockColors();
|
||||
for (IBlockColor blockColor : blockColorList) {
|
||||
for (IColoredBlock blockColor : blockColorList) {
|
||||
if (blockColor instanceof Block) {
|
||||
blockColors.registerBlockColorHandler(blockColor, (Block) blockColor);
|
||||
blockColors.registerBlockColorHandler(ColoredBlockBlockColor.INSTANCE, (Block) blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
ItemColors itemColors = minecraft.getItemColors();
|
||||
for (IItemColor itemColor : itemColorList) {
|
||||
for (IColoredItem itemColor : itemColorList) {
|
||||
if (itemColor instanceof Item) {
|
||||
itemColors.registerItemColorHandler(itemColor, (Item) itemColor);
|
||||
itemColors.registerItemColorHandler(ColoredItemItemColor.INSTANCE, (Item) itemColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredItemItemColor implements IItemColor {
|
||||
public static final ColoredItemItemColor INSTANCE = new ColoredItemItemColor();
|
||||
|
||||
private ColoredItemItemColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IColoredItem) {
|
||||
return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredBlockBlockColor implements IBlockColor {
|
||||
public static final ColoredBlockBlockColor INSTANCE = new ColoredBlockBlockColor();
|
||||
|
||||
private ColoredBlockBlockColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) {
|
||||
Block block = state.getBlock();
|
||||
if (block instanceof IColoredBlock) {
|
||||
return ((IColoredBlock) block).colorMultiplier(state, worldIn, pos, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
public void registerCustomModels(ModelBakeEvent event) {
|
||||
IRegistry<ModelResourceLocation, IBakedModel> registry = event.getModelRegistry();
|
||||
for (final BlockModelIndex index : customBlockModels) {
|
||||
|
||||
@@ -47,13 +47,13 @@ public class ProxyCommonClient extends ProxyCommon {
|
||||
|
||||
@Override
|
||||
public void registerBlock(Block block) {
|
||||
ModelManager.getInstance().registerBlock(block);
|
||||
ModelManager.getInstance().registerBlockClient(block);
|
||||
TextureManager.getInstance().registerBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItem(Item item) {
|
||||
ModelManager.getInstance().registerItem(item);
|
||||
ModelManager.getInstance().registerItemClient(item);
|
||||
TextureManager.getInstance().registerItem(item);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ package forestry.food.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -33,11 +32,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.food.IBeverageEffect;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemForestryFood;
|
||||
import forestry.core.items.ItemOverlay;
|
||||
import forestry.food.BeverageEffect;
|
||||
|
||||
public class ItemBeverage extends ItemForestryFood implements IItemColor {
|
||||
public class ItemBeverage extends ItemForestryFood implements IColoredItem {
|
||||
public interface IBeverageInfo extends ItemOverlay.IOverlayInfo {
|
||||
int getHeal();
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ import forestry.api.core.Tabs;
|
||||
import forestry.api.multiblock.IGreenhouseComponent;
|
||||
import forestry.core.CreativeTabForestry;
|
||||
import forestry.core.blocks.BlockStructure;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockPos;
|
||||
import forestry.core.utils.CamouflageUtil;
|
||||
@@ -68,7 +69,7 @@ import forestry.greenhouse.tiles.TileGreenhouseSprinkler;
|
||||
import forestry.greenhouse.tiles.TileGreenhouseValve;
|
||||
import forestry.plugins.ForestryPluginUids;
|
||||
|
||||
public abstract class BlockGreenhouse extends BlockStructure implements ISpriteRegister, IBlockColor {
|
||||
public abstract class BlockGreenhouse extends BlockStructure implements ISpriteRegister, IColoredBlock {
|
||||
private static final AxisAlignedBB SPRINKLER_BOUNDS = new AxisAlignedBB(0.3125F, 0.25F, 0.3125F, 0.6875F, 1F, 0.6875F);
|
||||
public static final PropertyEnum<State> STATE = PropertyEnum.create("state", State.class);
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@ import java.util.Random;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -24,9 +23,9 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -50,6 +49,7 @@ import forestry.api.lepidopterology.IButterflyGenome;
|
||||
import forestry.api.lepidopterology.IButterflyNursery;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.genetics.ItemGE;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.network.packets.PacketFXSignal;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
@@ -60,7 +60,7 @@ import forestry.lepidopterology.PluginLepidopterology;
|
||||
import forestry.lepidopterology.entities.EntityButterfly;
|
||||
import forestry.lepidopterology.genetics.ButterflyGenome;
|
||||
|
||||
public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IItemColor {
|
||||
public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColoredItem {
|
||||
|
||||
private static final Random rand = new Random();
|
||||
public static final String NBT_AGE = "Age";
|
||||
|
||||
@@ -15,7 +15,6 @@ import java.util.Locale;
|
||||
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -43,6 +42,7 @@ import forestry.core.gui.GuiHandler;
|
||||
import forestry.core.inventory.ItemInventory;
|
||||
import forestry.core.inventory.filters.StandardStackFilters;
|
||||
import forestry.core.inventory.manipulators.ItemHandlerInventoryManipulator;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.items.ItemWithGui;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
@@ -52,7 +52,7 @@ import forestry.storage.gui.GuiBackpack;
|
||||
import forestry.storage.gui.GuiBackpackT2;
|
||||
import forestry.storage.inventory.ItemInventoryBackpack;
|
||||
|
||||
public class ItemBackpack extends ItemWithGui implements IItemColor {
|
||||
public class ItemBackpack extends ItemWithGui implements IColoredItem {
|
||||
private final IBackpackDefinition definition;
|
||||
private final EnumBackpackType type;
|
||||
|
||||
|
||||
Reference in new issue
Block a user