Avaritia Renders for MetaItems and Materials

dependencies.gradle

@@ -51,6 +51,7 @@ dependencies {
     compileOnly("curse.maven:journeymap-32274:5172461") // Journeymap 5.7.1p3
     compileOnly("curse.maven:voxelmap-225179:3029445") // VoxelMap 1.9.28
     compileOnly("curse.maven:xaeros-263420:5394758") // Xaero's Minimap 24.2.0
+    compileOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 3.3.0.39
     compileOnly rfg.deobf("curse.maven:opencomputers-223008:5274236") // OpenComputers 1.8.5+179e1c3
     compileOnly rfg.deobf("curse.maven:hwyla-253449:2568751") // HWYLA 1.8.26-B41
     compileOnly rfg.deobf("curse.maven:baubles-227083:2518667") // Baubles 1.5.2
@@ -61,7 +62,7 @@ dependencies {
 
     // Mods with Soft compat but which have no need to be in code, such as isModLoaded() checks and getModItem() recipes.
     // Uncomment any of these to test them in-game.
-
+    // runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 3.3.0.39
     // runtimeOnlyNonPublishable rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3 (recommended to enable when testing Forestry compat)
     // runtimeOnlyNonPublishable rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5 (recommended to enable when testing Forestry compat)
     // runtimeOnlyNonPublishable rfg.deobf("curse.maven:binnies-mods-223525:2916129") // Binnie 2.5.1.203

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gregtech
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.8.7-beta
+modVersion=2.8.10-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -51,6 +51,8 @@ gradleTokenVersion = VERSION
 # leave this property empty.
 # Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
 apiPackage =
+# If you want to keep your API code in src/api instead of src/main
+useSrcApiPath=false
 
 # If you want to keep your API code in src/api instead of src/main
 useSrcApiPath=false
@@ -97,6 +99,7 @@ includeCommonDevEnvMods = true
 stripForgeRequirements=false
 
 
+
 # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = false

src/api/java/morph/avaritia/api/ICosmicRenderItem.java

@@ -0,0 +1,36 @@
+package morph.avaritia.api;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import javax.annotation.Nullable;
+
+/**
+ * Any item implementing this that also binds itself to TODO INPUT MODEL NAME HERE.
+ * Will automatically have the cosmic shader applied to the mask with the given opacity.
+ */
+public interface ICosmicRenderItem {
+
+    /**
+     * The mask where the cosmic overlay will be.
+     *
+     * @param stack  The stack being rendered.
+     * @param player The entity holding the item, May be null, If null assume either inventory, or ground.
+     * @return The masked area where the cosmic overlay will be.
+     */
+    @SideOnly (Side.CLIENT)
+    TextureAtlasSprite getMaskTexture(ItemStack stack, @Nullable EntityLivingBase player);
+
+    /**
+     * The opacity that the mask overlay will be rendered with.
+     *
+     * @param stack  The stack being rendered.
+     * @param player The entity holding the item, May be null, If null assume either inventory, or ground.
+     * @return The opacity that the mask overlay will be rendered with.
+     */
+    @SideOnly (Side.CLIENT)
+    float getMaskOpacity(ItemStack stack, @Nullable EntityLivingBase player);
+}

src/api/java/morph/avaritia/api/IHaloRenderItem.java

@@ -0,0 +1,25 @@
+package morph.avaritia.api;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public interface IHaloRenderItem {
+
+    @SideOnly (Side.CLIENT)
+    boolean shouldDrawHalo(ItemStack stack);
+
+    @SideOnly (Side.CLIENT)
+    TextureAtlasSprite getHaloTexture(ItemStack stack);
+
+    @SideOnly (Side.CLIENT)
+    int getHaloColour(ItemStack stack);
+
+    @SideOnly (Side.CLIENT)
+    int getHaloSize(ItemStack stack);
+
+    @SideOnly (Side.CLIENT)
+    boolean shouldDrawPulse(ItemStack stack);
+
+}

src/api/java/morph/avaritia/api/registration/IModelRegister.java

@@ -0,0 +1,17 @@
+package morph.avaritia.api.registration;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+/**
+ * Implemented on an item for model registration, completely arbitrary.
+ */
+public interface IModelRegister {
+
+    /**
+     * Called when it is time to initialize models in preInit.
+     */
+    @SideOnly (Side.CLIENT)
+    void registerModels();
+
+}

src/main/java/gregtech/GregTechMod.java

@@ -2,9 +2,12 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
+import gregtech.api.items.metaitem.MetaItem;
 import gregtech.api.modules.ModuleContainerRegistryEvent;
 import gregtech.api.persistence.PersistentData;
+import gregtech.api.util.Mods;
 import gregtech.client.utils.BloomEffectUtil;
+import gregtech.client.utils.BloomEffectVintagiumUtil;
 import gregtech.modules.GregTechModules;
 import gregtech.modules.ModuleManager;
 
@@ -26,6 +29,10 @@
 import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
 import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
 
+import codechicken.lib.texture.TextureUtils;
+
+import static gregtech.api.util.Mods.Avaritia;
+
 @Mod(modid = GTValues.MODID,
      name = GTValues.MOD_NAME,
      acceptedMinecraftVersions = "[1.12.2,1.13)",
@@ -46,6 +53,9 @@ public GregTechMod() {
         FluidRegistry.enableUniversalBucket();
         if (FMLCommonHandler.instance().getSide().isClient()) {
             BloomEffectUtil.init();
+            if (Mods.Vintagium.isModLoaded()) {
+                BloomEffectVintagiumUtil.init();
+            }
         }
     }
 
@@ -63,6 +73,9 @@ public void onConstruction(FMLConstructionEvent event) {
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         moduleManager.onPreInit(event);
+        if (Avaritia.isModLoaded()) {
+            TextureUtils.addIconRegister(new MetaItem.MetaValueItem.CosmicTexture());
+        }
     }
 
     @EventHandler

src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java

@@ -3,23 +3,30 @@
 import gregtech.api.GTValues;
 import gregtech.api.damagesources.DamageSources;
 import gregtech.api.items.armor.ArmorMetaItem;
+import gregtech.api.items.metaitem.MetaItem.MetaValueItem.CosmicTexture;
 import gregtech.api.items.metaitem.StandardMetaItem;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.info.MaterialIconSet;
+import gregtech.api.unification.material.properties.CosmicProperty;
 import gregtech.api.unification.material.properties.DustProperty;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.material.properties.ToolProperty;
 import gregtech.api.unification.material.registry.MaterialRegistry;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.UnificationEntry;
+import gregtech.api.util.Mods;
 import gregtech.common.creativetab.GTCreativeTabs;
 
+import morph.avaritia.client.render.item.CosmicHaloItemRender;
+
 import net.minecraft.block.BlockCauldron;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -29,23 +36,41 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import codechicken.lib.model.ModelRegistryHelper;
+import codechicken.lib.util.TransformUtils;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
+import morph.avaritia.api.ICosmicRenderItem;
+import morph.avaritia.api.IHaloRenderItem;
+import morph.avaritia.api.registration.IModelRegister;
+import morph.avaritia.init.AvaritiaTextures;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-public class MetaPrefixItem extends StandardMetaItem {
+import java.util.*;
+
+import static gregtech.api.util.Mods.Avaritia;
+
+@Optional.Interface(
+                    modid = Mods.Names.AVARITIA,
+                    iface = "morph.avaritia.api.ICosmicRenderItem")
+@Optional.Interface(
+                    modid = Mods.Names.AVARITIA,
+                    iface = "morph.avaritia.api.IHaloRenderItem")
+@Optional.Interface(
+                    modid = Mods.Names.AVARITIA,
+                    iface = "morph.avaritia.api.registration.IModelRegister")
+@Optional.Interface(
+                    modid = Mods.Names.AVARITIA,
+                    iface = "morph.avaritia.init.AvaritiaTextures")
+public class MetaPrefixItem extends StandardMetaItem implements IHaloRenderItem, ICosmicRenderItem,
+                            IModelRegister {
 
     private final MaterialRegistry registry;
     private final OrePrefix prefix;
-
     public static final Map<OrePrefix, OrePrefix> purifyMap = new HashMap<>();
 
     static {
@@ -120,13 +145,24 @@ public void registerModels() {
         Map<Short, ModelResourceLocation> alreadyRegistered = new Short2ObjectOpenHashMap<>();
         for (short metaItem : metaItems.keySet()) {
             MaterialIconSet materialIconSet = getMaterial(metaItem).getMaterialIconSet();
-
             short registrationKey = (short) (prefix.id + materialIconSet.id);
             if (!alreadyRegistered.containsKey(registrationKey)) {
                 ResourceLocation resourceLocation = Objects.requireNonNull(prefix.materialIconType)
                         .getItemModelPath(materialIconSet);
                 ModelBakery.registerItemVariants(this, resourceLocation);
                 alreadyRegistered.put(registrationKey, new ModelResourceLocation(resourceLocation, "inventory"));
+
+                if (Avaritia.isModLoaded()) {
+                    ModelResourceLocation location = new ModelResourceLocation(resourceLocation, "inventory");
+                    IBakedModel wrapped = new CosmicHaloItemRender(TransformUtils.DEFAULT_ITEM,
+                            (modelRegistry) -> modelRegistry.getObject(location));
+                    ModelRegistryHelper.register(location, wrapped);
+
+                    String processedLocation = resourceLocation.toString().replace("gregtech:", "gregtech:items/");
+                    String processedIdentifier = resourceLocation.toString()
+                            .replace("gregtech:material_sets", "identifier");
+                    CosmicTexture.registerSpecialMaskIcon(processedIdentifier + "_mask", processedLocation + "_mask");
+                }
             }
             ModelResourceLocation resourceLocation = alreadyRegistered.get(registrationKey);
             metaItemsModels.put(metaItem, resourceLocation);
@@ -273,4 +309,111 @@ protected void addMaterialTooltip(@NotNull List<String> lines, @NotNull ItemStac
             lines.addAll(this.prefix.tooltipFunc.apply(getMaterial(itemStack)));
         }
     }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean shouldDrawHalo(ItemStack stack) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getShouldDrawHalo()) {
+            return prop.getShouldDrawHalo();
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public TextureAtlasSprite getHaloTexture(ItemStack stack) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getHaloTexture() != null) {
+            return CosmicTexture.haloTextures.get(prop.getHaloTexture());
+        } else {
+            return AvaritiaTextures.HALO;
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getHaloColour(ItemStack stack) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getHaloColour() != null) {
+            return Integer.decode("0x7F" + prop.getHaloColour());
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getHaloSize(ItemStack stack) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getHaloSize() != 0) {
+            return prop.getHaloSize();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean shouldDrawPulse(ItemStack stack) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getHaloPulse()) {
+            return prop.getHaloPulse();
+        } else {
+            return false;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public TextureAtlasSprite getMaskTexture(ItemStack stack, EntityLivingBase player) {
+        Material material = getMaterial(stack);
+        assert material != null;
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getMaskOpacity() != null) {
+            int meta = stack.getMetadata();
+            MaterialIconSet materialIconSet = getMaterial(meta).getMaterialIconSet();
+            ResourceLocation resourceLocation = Objects.requireNonNull(prefix.materialIconType)
+                    .getItemModelPath(materialIconSet);
+            String identifier = resourceLocation.toString().replace("gregtech:material_sets", "identifier");
+            return CosmicTexture.specialMaskTextures.get(identifier + "_mask");
+        } else {
+            return CosmicTexture.specialMaskTextures.get("fallback");
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public float getMaskOpacity(ItemStack stack, EntityLivingBase player) {
+        Material material = getMaterial(stack);
+        assert material != null;
+
+        CosmicProperty prop = material.getProperty(PropertyKey.COSMIC);
+
+        if (material.hasProperty(PropertyKey.COSMIC) && prop.getMaskOpacity() != null) {
+            return prop.getMaskOpacity();
+        } else {
+            return 0.0f;
+        }
+    }
 }