Clean up the pools

This commit is contained in:
Vincent Lee committed 2016-07-23 21:08:01 -05:00
1 parent 9f0c710479
commit 1c4ae58377
14 files changed
+124 -141

No files matched your search

@@ -150,25 +150,6 @@ public final class ModelHandler {
/** Special Item Meshers **/
// Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper
// See https://github.com/MinecraftForge/ForgeGradle/issues/314.
ModelLoader.registerItemVariants(Item.getItemFromBlock(ModBlocks.pool),
new ModelResourceLocation("botania:pool", "variant=default"),
new ModelResourceLocation("botania:pool", "variant=diluted"),
new ModelResourceLocation("botania:pool", "variant=creative"),
new ModelResourceLocation("botania:pool", "variant=fabulous"),
new ModelResourceLocation("botania:pool", "default_full"),
new ModelResourceLocation("botania:pool", "diluted_full"),
new ModelResourceLocation("botania:pool", "creative_full"),
new ModelResourceLocation("botania:pool", "fabulous_full"));
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(ModBlocks.pool), MesherWrapper.of(stack -> {
int meta = stack.getMetadata();
if (meta < 0 || meta > 3)
meta = 0;
PoolVariant v = PoolVariant.values()[meta];
boolean renderFull = v == PoolVariant.CREATIVE || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"));
return new ModelResourceLocation("botania:pool", renderFull ? v.getName() + "_full" : "variant=" + v.getName());
}));
ModelLoader.registerItemVariants(elementiumShears,
new ModelResourceLocation("botania:elementiumShears", "inventory"),
new ModelResourceLocation("botania:dammitReddit", "inventory"));
@@ -357,6 +338,7 @@ public final class ModelHandler {
registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant");
registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant");
// todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture
registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant");
@@ -12,18 +12,32 @@ package vazkii.botania.common.item.block;
import net.minecraft.block.Block;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public class ItemBlockPool extends ItemBlockWithMetaNameAndColor {
public ItemBlockPool(Block par2Block) {
super(par2Block);
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), new IItemPropertyGetter() {
@Override
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"));
return renderFull ? 1F : 0F;
}
});
}
@SideOnly(Side.CLIENT)