From d75563954449638db5003ffc90dcabca407eb092 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 21 Jul 2018 15:31:49 +0200
Subject: [PATCH] Turns out we don't need these

---
 .../hdskins/mixin/MixinSkullRenderer.java        |  7 +++----
 .../com/voxelmodpack/hdskins/util/Optionals.java | 16 ----------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/util/Optionals.java

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java
index 7abf90e6..cf49650c 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java
@@ -3,7 +3,6 @@ package com.voxelmodpack.hdskins.mixin;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.util.Optionals;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -23,10 +22,10 @@ public abstract class MixinSkullRenderer extends TileEntitySpecialRenderer<TileE
             at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/tileentity/TileEntitySkullRenderer;bindTexture(Lnet/minecraft/util/ResourceLocation;)V",
                     ordinal = 4))
-    private void onBindTexture(TileEntitySkullRenderer tesr, ResourceLocation rl, float x, float y, float z, EnumFacing facing, float rotation, int meta,
-                               @Nullable GameProfile profile, int a, float ticks) {
+    private void onBindTexture(TileEntitySkullRenderer tesr, ResourceLocation rl, float x, float y, float z, // ow my back
+            EnumFacing facing, float rotation, int meta, @Nullable GameProfile profile, int a, float ticks) {
         if (profile != null) {
-            bindTexture(Optionals.getOrDefault(HDSkinManager.INSTANCE.getSkinLocation(profile, Type.SKIN, true), rl));
+            bindTexture(HDSkinManager.INSTANCE.getSkinLocation(profile, Type.SKIN, true).orElse(rl));
         } else {
             bindTexture(rl);
         }
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/Optionals.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/Optionals.java
deleted file mode 100644
index e9f53347..00000000
--- a/src/hdskins/java/com/voxelmodpack/hdskins/util/Optionals.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.voxelmodpack.hdskins.util;
-
-import java.util.Optional;
-
-/**
- * Silly optionals
- */
-public final class Optionals {
-    public static <T> T nullableOf(Optional<T> optional) {
-        return getOrDefault(optional, null);
-    }
-
-    public static <T> T getOrDefault(Optional<T> optional, T def) {
-        return optional.isPresent() ? optional.get() : def;
-    }
-}