diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java b/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java deleted file mode 100644 index 127c96803..000000000 --- a/src/main/java/appeng/items/misc/ItemCrystalSeedRendering.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.items.misc; - - -import com.google.common.collect.ImmutableList; - -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import appeng.bootstrap.IItemRendering; -import appeng.bootstrap.ItemRenderingCustomizer; - - -public class ItemCrystalSeedRendering extends ItemRenderingCustomizer -{ - - private static final ModelResourceLocation[] MODELS_CERTUS = { - new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus2" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_certus3" ) - }; - private static final ModelResourceLocation[] MODELS_FLUIX = { - new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix2" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_fluix3" ) - }; - private static final ModelResourceLocation[] MODELS_NETHER = { - new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether2" ), - new ModelResourceLocation( "appliedenergistics2:crystal_seed_nether3" ) - }; - - @Override - @OnlyIn( Dist.CLIENT ) - public void customize( IItemRendering rendering ) - { - rendering.variants( ImmutableList.builder().add( MODELS_CERTUS ).add( MODELS_FLUIX ).add( MODELS_NETHER ).build() ); - // FIXME rendering.meshDefinition( this.getItemMeshDefinition() ); - } - - // FIXME private ItemMeshDefinition getItemMeshDefinition() - // FIXME { - // FIXME return is -> - // FIXME { - // FIXME int damage = ItemCrystalSeed.getProgress( is ); -// FIXME - // FIXME // Split the damage value into crystal type and growth level - // FIXME int type = damage / ItemCrystalSeed.SINGLE_OFFSET; - // FIXME int level = ( damage % ItemCrystalSeed.SINGLE_OFFSET ) / ItemCrystalSeed.LEVEL_OFFSET; -// FIXME - // FIXME // Determine which list of models to use based on the type of crystal - // FIXME ModelResourceLocation[] models; - // FIXME switch( type ) - // FIXME { - // FIXME case 0: - // FIXME models = MODELS_CERTUS; - // FIXME break; - // FIXME case 1: - // FIXME models = MODELS_NETHER; - // FIXME break; - // FIXME case 2: - // FIXME models = MODELS_FLUIX; - // FIXME break; - // FIXME default: - // FIXME // We use this as the fallback for broken items - // FIXME models = MODELS_CERTUS; - // FIXME break; - // FIXME } -// FIXME - // FIXME // Return one of the 3 models based on the level - // FIXME if( level < 0 ) - // FIXME { - // FIXME level = 0; - // FIXME } - // FIXME else if( level >= models.length ) - // FIXME { - // FIXME level = models.length - 1; - // FIXME } -// FIXME - // FIXME return models[level]; - // FIXME }; - // FIXME } -} diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png index dfb94d574..a79afdbed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png index ba67c3c29..de9935eed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png index 4f134f47e..05879d6ff 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png index 55022c27b..8b2268af2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png index 5e73c8e01..0499eb4c1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png index 500fa37ba..6a34fdfc3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png index b01bbaad4..6be1992a5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png differ