diff --git a/src/main/java/gregtechlite/gtlitecore/client/renderer/UniversiumRenderBehavior.java b/src/main/java/gregtechlite/gtlitecore/client/renderer/UniversiumRenderBehavior.java new file mode 100644 index 000000000..1abebfa69 --- /dev/null +++ b/src/main/java/gregtechlite/gtlitecore/client/renderer/UniversiumRenderBehavior.java @@ -0,0 +1,18 @@ +package gregtechlite.gtlitecore.client.renderer; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface UniversiumRenderBehavior extends ItemRendererManager +{ + + float getCosmicOpacity(); + + @SideOnly(Side.CLIENT) + default float getCosmicOpacity(ItemStack stack, Object... args) + { + return getCosmicOpacity(); + } + +} diff --git a/src/main/java/gregtechlite/gtlitecore/client/renderer/handler/UniversiumItemRenderer.java b/src/main/java/gregtechlite/gtlitecore/client/renderer/handler/UniversiumItemRenderer.java new file mode 100644 index 000000000..bbeb24f65 --- /dev/null +++ b/src/main/java/gregtechlite/gtlitecore/client/renderer/handler/UniversiumItemRenderer.java @@ -0,0 +1,162 @@ +package gregtechlite.gtlitecore.client.renderer.handler; + +import gregtech.api.items.metaitem.MetaItem; +import gregtechlite.gtlitecore.client.model.WrappedModelGetter; +import gregtechlite.gtlitecore.client.renderer.CustomItemRenderer; +import gregtechlite.gtlitecore.client.renderer.UniversiumRenderBehavior; +import gregtechlite.gtlitecore.client.shader.CosmicShaderHelper; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.model.IModelState; +import org.lwjgl.opengl.GL11; + +public class UniversiumItemRenderer extends WrappedItemRenderer +{ + + public UniversiumItemRenderer(IModelState state, IBakedModel model) + { + super(state, model); + } + + public UniversiumItemRenderer(IModelState state, WrappedModelGetter getter) + { + super(state, getter); + } + + @Override + public void renderItem(ItemStack stack, ItemCameraTransforms.TransformType transformType) + { + if (!(stack.getItem() instanceof MetaItem)) + { + renderModel(wrapped, stack); + return; + } + + MetaItem.MetaValueItem valueItem = ((MetaItem) stack.getItem()).getItem(stack); + UniversiumRenderBehavior urb = null; + if (valueItem != null) + { + urb = (UniversiumRenderBehavior) ((CustomItemRenderer) valueItem).getRendererManager(); + } + + processLightLevel(transformType); + + if (transformType == net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.GUI) + { + renderInventory(stack, renderEntity, urb); + } + else + { + renderSimple(stack, renderEntity, urb); + } + } + + protected void renderSimple(ItemStack stack, EntityLivingBase player, UniversiumRenderBehavior urb) + { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + + World world = player != null ? player.world : null; + IBakedModel model = wrapped.getOverrides().handleItemState(wrapped, stack, world, player); + + // Render base model + renderModel(model, stack); + + // Render cosmic overlay with shader + if (urb != null) { + GlStateManager.disableAlpha(); + GlStateManager.depthFunc(GL11.GL_EQUAL); + + CosmicShaderHelper.cosmicOpacity = urb.getCosmicOpacity(stack); + CosmicShaderHelper.useShader(); + + renderModel(model, stack); + + CosmicShaderHelper.releaseShader(); + + GlStateManager.depthFunc(GL11.GL_LEQUAL); + GlStateManager.enableAlpha(); + } + + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + + protected void renderInventory(ItemStack stack, EntityLivingBase player, UniversiumRenderBehavior urb) + { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.disableDepth(); + + World world = player != null ? player.world : null; + IBakedModel model = wrapped.getOverrides().handleItemState(wrapped, stack, world, player); + + // Render base model + renderModel(model, stack); + + // Render cosmic overlay with shader + if (urb != null) { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.disableDepth(); + + GlStateManager.color(1F, 1F, 1F, 1F); + CosmicShaderHelper.cosmicOpacity = urb.getCosmicOpacity(stack); + CosmicShaderHelper.inventoryRender = true; + CosmicShaderHelper.useShader(); + + renderModel(model, stack); + + CosmicShaderHelper.releaseShader(); + CosmicShaderHelper.inventoryRender = false; + GlStateManager.popMatrix(); + } + + GlStateManager.enableAlpha(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableDepth(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + + protected void processLightLevel(ItemCameraTransforms.TransformType transformType) + { + switch (transformType) + { + case GROUND: + if (entityPos != null) + { + CosmicShaderHelper.setLightFromLocation(world, entityPos); + return; + } + break; + case THIRD_PERSON_LEFT_HAND: + case THIRD_PERSON_RIGHT_HAND: + case FIRST_PERSON_LEFT_HAND: + case FIRST_PERSON_RIGHT_HAND: + case HEAD: + if (renderEntity != null) + { + CosmicShaderHelper.setLightFromLocation(world, entityPos); + return; + } + break; + case GUI: + CosmicShaderHelper.setLightLevel(1.2F); + return; + default: + break; + } + CosmicShaderHelper.setLightLevel(1.0F); + } +} \ No newline at end of file diff --git a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialIconSet.kt b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialIconSet.kt index 4bd85f422..0e3b3e85b 100644 --- a/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialIconSet.kt +++ b/src/main/kotlin/gregtechlite/gtlitecore/api/unification/material/info/GTLiteMaterialIconSet.kt @@ -10,6 +10,7 @@ import gregtech.api.unification.material.Materials.Uranium238 import gregtech.api.unification.material.info.MaterialIconSet import gregtechlite.gtlitecore.client.renderer.texture.GTLiteTextures import gregtechlite.gtlitecore.common.item.behavior.HaloRenderItemBehavior +import gregtechlite.gtlitecore.common.item.behavior.UniversiumRenderItemBehavior object GTLiteMaterialIconSet { @@ -68,7 +69,8 @@ object GTLiteMaterialIconSet val WHITE_DWARF = iconSet("white_dwarf") @JvmField - val UNIVERSIUM = iconSet("universium") + val UNIVERSIUM = MaterialIconSetWithRenderer("universium", null, true, + UniversiumRenderItemBehavior()) @JvmField val CHROMATIC = iconSet("chromatic") diff --git a/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/UniversiumRenderItemBehavior.kt b/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/UniversiumRenderItemBehavior.kt new file mode 100644 index 000000000..a7c64814e --- /dev/null +++ b/src/main/kotlin/gregtechlite/gtlitecore/common/item/behavior/UniversiumRenderItemBehavior.kt @@ -0,0 +1,26 @@ +package gregtechlite.gtlitecore.common.item.behavior + +import codechicken.lib.model.ModelRegistryHelper +import codechicken.lib.util.TransformUtils +import gregtechlite.gtlitecore.client.renderer.UniversiumRenderBehavior +import gregtechlite.gtlitecore.client.renderer.handler.UniversiumItemRenderer +import net.minecraft.client.renderer.block.model.ModelResourceLocation +import net.minecraft.util.ResourceLocation +import net.minecraftforge.fml.relauncher.Side +import net.minecraftforge.fml.relauncher.SideOnly + +class UniversiumRenderItemBehavior(private val cosmicOpacity: Float = 2.5f) : UniversiumRenderBehavior +{ + + override fun getCosmicOpacity(): Float = cosmicOpacity + + @SideOnly(Side.CLIENT) + override fun onRendererRegistry(location: ResourceLocation) + { + ModelRegistryHelper.register(ModelResourceLocation(location, "inventory"), + UniversiumItemRenderer(TransformUtils.DEFAULT_ITEM) { modelRegistry -> + modelRegistry.getObject(ModelResourceLocation(location, "inventory")) + }) + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/universium/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/universium/wire_fine.json index da67cf904..979a00560 100644 --- a/src/main/resources/assets/gregtech/models/item/material_sets/universium/wire_fine.json +++ b/src/main/resources/assets/gregtech/models/item/material_sets/universium/wire_fine.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/material_sets/universium/wire_fine", - "layer1": "gregtech:items/material_sets/universium/wire_fine_overlay" + "layer0": "gregtech:items/material_sets/universium/wire_fine" } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png index 15f4b94b4..734b23e35 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.sai2 deleted file mode 100644 index ed6a5ba71..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/bolt.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png index 16d8ff0e4..93ed40bdf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.sai2 deleted file mode 100644 index 7e968062c..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png index 20964cd59..2c47456c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.sai2 deleted file mode 100644 index c3bd852f7..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_small.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png index 4f9f14683..ded7214b9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.sai2 deleted file mode 100644 index 35bee4887..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/dust_tiny.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/effect_base.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/effect_base.sai2 deleted file mode 100644 index 6afc733bd..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/effect_base.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png index d5d52dec3..eb9491a97 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.sai2 deleted file mode 100644 index e9808d2a6..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/foil.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png index 631f29a9c..22b343476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.sai2 deleted file mode 100644 index 6a9f25c60..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/ingot.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png index b45959a0d..2e2ccc34a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png.mcmeta index b2e2153a4..c5d457f93 100644 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.png.mcmeta @@ -1,6 +1,5 @@ { "animation": { - "interpolate": true, - "frametime": 4 + "frametime": 1 } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.sai2 deleted file mode 100644 index 9e268efd1..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nanite.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png index 9bfc2088c..0b7bcafbd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.sai2 deleted file mode 100644 index 7ae197a02..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/nugget.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png index e8c86bf27..931a6d2dd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.sai2 deleted file mode 100644 index 81a95b763..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png index 7326c3392..41acd7ab8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.sai2 deleted file mode 100644 index de9cb390e..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_dense.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png index 356e96371..8b8a8c239 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.sai2 deleted file mode 100644 index bb822a725..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/plate_double.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png index eb2702007..dd392d03b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.sai2 deleted file mode 100644 index 62e2287de..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/screw.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png index 7f5e01461..593c8b1e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.sai2 deleted file mode 100644 index c02543846..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png index f07171327..32f4a2542 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.sai2 deleted file mode 100644 index 58851532f..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/stick_long.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png index c701a89ea..ed3dbc36d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png and b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png.mcmeta deleted file mode 100644 index d6331b7cf..000000000 --- a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.sai2 b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.sai2 deleted file mode 100644 index 5fb0a2562..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine.sai2 and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine_overlay.png deleted file mode 100644 index 5e9e05d5b..000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/material_sets/universium/wire_fine_overlay.png and /dev/null differ