right-click to preview

sinender · sinender · commit bff2c42f97bb · 2024-05-29T21:42:19.000-04:00
diff --git a/src/main/java/llc/redstone/hysentials/command/HysentialsCommand.java b/src/main/java/llc/redstone/hysentials/command/HysentialsCommand.java
@@ -415,6 +415,7 @@ private static void handleTest(String command, String args) {
                     break;
                 }
 
+
                 case "locraw": {
                     LocrawInfo info = LocrawUtil.INSTANCE.getLocrawInfo();
                     if (info != null) {
diff --git a/src/main/java/llc/redstone/hysentials/command/QwestiiTestCommand.java b/src/main/java/llc/redstone/hysentials/command/QwestiiTestCommand.java
@@ -39,8 +39,7 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
                 Thread.sleep(1000);
                 UChat.chat("\n&4K A B O O M\n");
                 Thread.sleep(3000);
-                Minecraft.getMinecraft().crashed(new CrashReport("Kaboom", new Throwable())
-                );
+                Minecraft.getMinecraft().crashed(new CrashReport("Kaboom", new Throwable()));
             } catch (InterruptedException ignored) {
             }
         });
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/Cosmetic.java b/src/main/java/llc/redstone/hysentials/cosmetics/Cosmetic.java
@@ -1,33 +1,86 @@
 package llc.redstone.hysentials.cosmetics;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiEnchantment;
+import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.Project;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public interface Cosmetic {
     boolean canUse(EntityPlayer player);
+
     ModelBase getModel();
+
     ResourceLocation getTexture();
+
     String getName();
 
     default void renderPreview(int x, int y, int ticks) {
         EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-        if (!canUse(player)) return;
-        Minecraft.getMinecraft().getTextureManager().bindTexture(getTexture());
+        Minecraft mc = Minecraft.getMinecraft();
+        float zLevel = 350;
+//        if (!canUse(player)) return;
         GlStateManager.pushMatrix();
+        GlStateManager.matrixMode(5889);
+        GlStateManager.pushMatrix();
+        GlStateManager.loadIdentity();
+        GlStateManager.translate(x, y, 0.0F);
+        Project.gluPerspective(90.0F, 1.3333334F, 9.0F, zLevel);
+        float f = 1.0F;
+        GlStateManager.matrixMode(5888);
+        GlStateManager.loadIdentity();
+        RenderHelper.enableStandardItemLighting();
+        GlStateManager.translate(0.0F, 3.3F, -16.0F);
+        GlStateManager.scale(f, f, f);
+        float g = 5.0F;
+        GlStateManager.scale(g, g, g);
+        GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+        mc.getTextureManager().bindTexture(getTexture());
+        GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+//        float h = this.field_147076_A + (this.field_147080_z - this.field_147076_A) * ticks;
+//        GlStateManager.translate((1.0F - h) * 0.2F, (1.0F - h) * 0.1F, (1.0F - h) * 0.25F);
+//        GlStateManager.rotate(-(1.0F - h) * 90.0F - 90.0F, 0.0F, 1.0F, 0.0F);
+//        GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+//        float k = this.field_147069_w + (this.field_147071_v - this.field_147069_w) * ticks + 0.25F;
+//        float l = this.field_147069_w + (this.field_147071_v - this.field_147069_w) * ticks + 0.75F;
+//        k = (k - (float) MathHelper.truncateDoubleToInt((double)k)) * 1.6F - 0.3F;
+//        l = (l - (float)MathHelper.truncateDoubleToInt((double)l)) * 1.6F - 0.3F;
+//        if (k < 0.0F) {
+//            k = 0.0F;
+//        }
+//
+//        if (l < 0.0F) {
+//            l = 0.0F;
+//        }
+//
+//        if (k > 1.0F) {
+//            k = 1.0F;
+//        }
+//
+//        if (l > 1.0F) {
+//            l = 1.0F;
+//        }
 
-        GlStateManager.rotate(toRadians(ticks /20f), 0f, 1.0F, 0.0F);
-//        GlStateManager.translate(x, y, 0);
-        float n = 1;
-        GlStateManager.scale(n, n, n);
-
-        getModel().render(player, 0, 0, 0, 0, 0, n);
-
+        GlStateManager.enableRescaleNormal();
+        //2d rendering
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        getModel().render(null, 0.0F, 0, 0, 0, 0.0F, 0.0625F);
+        GlStateManager.disableRescaleNormal();
+        RenderHelper.disableStandardItemLighting();
+        GlStateManager.matrixMode(5889);
+        GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+        GlStateManager.popMatrix();
+        GlStateManager.matrixMode(5888);
         GlStateManager.popMatrix();
     }
 
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/backpack/BackpackCosmetic.java b/src/main/java/llc/redstone/hysentials/cosmetics/backpack/BackpackCosmetic.java
@@ -36,7 +36,7 @@ public BackpackCosmetic(String name, boolean catpack) {
     }
     public boolean canUse(EntityPlayer player) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), name)
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), name);
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), name) || CosmeticManager.isPreviewing(player.getUniqueID(), name));
     }
 
     public ModelBase getModel() {
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/capes/CapeHandler.java b/src/main/java/llc/redstone/hysentials/cosmetics/capes/CapeHandler.java
@@ -29,7 +29,7 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
                     if (cosmetic.getSubType() != null && cosmetic.getSubType().equals("cape")) {
                         wearingCape = true;
                         String name = cosmetic.getName();
-                        if (CosmeticManager.hasCosmetic(uuid, name)) {
+                        if (CosmeticManager.hasCosmetic(uuid, name) || CosmeticManager.isPreviewing(uuid, name)) {
                             ResourceLocation location = new ResourceLocation(cosmetic.getResource());
                             resourceMap.put(uuid, cosmetic.getResource());
                             try {
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/hats/blackcat/BlackCat.java b/src/main/java/llc/redstone/hysentials/cosmetics/hats/blackcat/BlackCat.java
@@ -16,7 +16,7 @@ public BlackCat() {
     }
     public boolean canUse(EntityPlayer player) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), "black cat")
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), "black cat");
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), "black cat") || CosmeticManager.isPreviewing(player.getUniqueID(), "black cat"));
     }
 
     public BlackCatModel getModel() {
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/hats/cat/CatHat.java b/src/main/java/llc/redstone/hysentials/cosmetics/hats/cat/CatHat.java
@@ -24,7 +24,7 @@ public CatHat(String name) {
     }
     public boolean canUse(EntityPlayer player) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), name)
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), name);
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), name) || CosmeticManager.isPreviewing(player.getUniqueID(), name));
     }
 
     @Override
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/hats/technocrown/TechnoCrown.java b/src/main/java/llc/redstone/hysentials/cosmetics/hats/technocrown/TechnoCrown.java
@@ -16,7 +16,7 @@ public TechnoCrown() {
     }
     public boolean canUse(EntityPlayer player) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), "techno crown")
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), "techno crown");
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), "techno crown") || CosmeticManager.isPreviewing(player.getUniqueID(), "techno crown"));
     }
 
     @Override
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/kzero/KzeroBundle.java b/src/main/java/llc/redstone/hysentials/cosmetics/kzero/KzeroBundle.java
@@ -20,7 +20,8 @@ public KzeroBundle() {
 
     public static boolean canUse(AbstractClientPlayer player, Type type) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase())
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase());
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase()) ||
+            CosmeticManager.isPreviewing(player.getUniqueID(), "kzero " + type.name().toLowerCase()));
     }
 
     public enum Type {
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/wings/dragon/DragonCosmetic.java b/src/main/java/llc/redstone/hysentials/cosmetics/wings/dragon/DragonCosmetic.java
@@ -17,7 +17,7 @@ public DragonCosmetic() {
     }
     public boolean canUse(EntityPlayer player) {
         return CosmeticManager.equippedCosmetic(player.getUniqueID(), "dragon")
-            && CosmeticManager.hasCosmetic(player.getUniqueID(), "dragon");
+            && (CosmeticManager.hasCosmetic(player.getUniqueID(), "dragon") || CosmeticManager.isPreviewing(player.getUniqueID(), "dragon"));
     }
 
     @Override
diff --git a/src/main/java/llc/redstone/hysentials/cosmetics/wings/tdarth/TdarthCosmetic.java b/src/main/java/llc/redstone/hysentials/cosmetics/wings/tdarth/TdarthCosmetic.java
@@ -61,7 +61,7 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
     }
     public boolean canUse(UUID uuid) {
         return CosmeticManager.equippedCosmetic(uuid, "tdarth")
-            && CosmeticManager.hasCosmetic(uuid, "tdarth");
+            && (CosmeticManager.hasCosmetic(uuid, "tdarth") || CosmeticManager.isPreviewing(uuid, "tdarth"));
     }
 
     @Override
diff --git a/src/main/java/llc/redstone/hysentials/mixin/GuiIngameForgeMixin.java b/src/main/java/llc/redstone/hysentials/mixin/GuiIngameForgeMixin.java
@@ -13,6 +13,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraftforge.client.GuiIngameForge;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
@@ -73,6 +74,7 @@ private void cancelSelectedItem(CallbackInfo ci) {
 
     @Inject(method = "renderGameOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;enableAlpha()V", shift = At.Shift.AFTER))
     public void hysentials$renderMacroWheel(float partialTicks, CallbackInfo ci) {
+        GlStateManager.pushMatrix();
         if (HysentialsConfig.macroWheelKeyBind.isActive() && Minecraft.getMinecraft().currentScreen == null && MacroWheelData.MacroWheel.getCooldown() < System.currentTimeMillis()) {
             if (!MacroWheelOverlayKt.getStopped()) {
                 MacroWheelOverlay overlay = MacroWheelOverlay.Companion.newI();
@@ -101,6 +103,7 @@ private void cancelSelectedItem(CallbackInfo ci) {
                 Minecraft.getMinecraft().mouseHelper.grabMouseCursor();
             }
         }
+        GlStateManager.popMatrix();
     }
 
     @Unique
diff --git a/src/main/java/llc/redstone/hysentials/mixin/GuiIngameMixin.java b/src/main/java/llc/redstone/hysentials/mixin/GuiIngameMixin.java
@@ -5,11 +5,17 @@
 import llc.redstone.hysentials.config.HysentialsConfig;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.Scoreboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Collection;
+
 @Mixin(value = GuiIngame.class, priority = 9001)
 public class GuiIngameMixin {
     @Inject(method = "renderBossHealth", at = @At("HEAD"), cancellable = true)
@@ -21,6 +27,11 @@ private void cancelBossBar(CallbackInfo ci) {
         }
     }
 
+    @Redirect(method = "renderScoreboard", at = @At(value = "INVOKE", target = "Lnet/minecraft/scoreboard/Scoreboard;getSortedScores(Lnet/minecraft/scoreboard/ScoreObjective;)Ljava/util/Collection;"))
+    private Collection<Score> injectScore(Scoreboard scoreboard, ScoreObjective scoreObjective) {
+        return scoreboard.getSortedScores(scoreObjective);
+    }
+
     @Inject(method = "renderSelectedItem", at = @At("HEAD"), cancellable = true)
     private void cancelSelectedItem(CallbackInfo ci) {
         if (HysentialsConfig.heldItemTooltipHUD.isEnabled()) {
diff --git a/src/main/kotlin/llc/redstone/hysentials/cosmetic/CosmeticGui.kt b/src/main/kotlin/llc/redstone/hysentials/cosmetic/CosmeticGui.kt
diff --git a/src/main/kotlin/llc/redstone/hysentials/cosmetic/CosmeticUtils.kt b/src/main/kotlin/llc/redstone/hysentials/cosmetic/CosmeticUtils.kt
diff --git a/src/main/kotlin/llc/redstone/hysentials/cosmetic/PreviewHandler.kt b/src/main/kotlin/llc/redstone/hysentials/cosmetic/PreviewHandler.kt
diff --git a/src/main/kotlin/llc/redstone/hysentials/macrowheel/overlay/MacroWheelOverlay.kt b/src/main/kotlin/llc/redstone/hysentials/macrowheel/overlay/MacroWheelOverlay.kt
diff --git a/src/main/kotlin/llc/redstone/hysentials/schema/HysentialsSchema.kt b/src/main/kotlin/llc/redstone/hysentials/schema/HysentialsSchema.kt
diff --git a/src/main/kotlin/llc/redstone/hysentials/utils/Utils.kt b/src/main/kotlin/llc/redstone/hysentials/utils/Utils.kt

Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,7 @@ private static void handleTest(String command, String args) {`
`415`	`415`	`break;`
`416`	`416`	`}`
`417`	`417`
	`418`	`+`
`418`	`419`	`case "locraw": {`
`419`	`420`	`LocrawInfo info = LocrawUtil.INSTANCE.getLocrawInfo();`
`420`	`421`	`if (info != null) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public BackpackCosmetic(String name, boolean catpack) {`
`36`	`36`	`}`
`37`	`37`	`public boolean canUse(EntityPlayer player) {`
`38`	`38`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), name)`
`39`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), name);`
	`39`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), name) \|\| CosmeticManager.isPreviewing(player.getUniqueID(), name));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public ModelBase getModel() {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public BlackCat() {`
`16`	`16`	`}`
`17`	`17`	`public boolean canUse(EntityPlayer player) {`
`18`	`18`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), "black cat")`
`19`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), "black cat");`
	`19`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), "black cat") \|\| CosmeticManager.isPreviewing(player.getUniqueID(), "black cat"));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public BlackCatModel getModel() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public CatHat(String name) {`
`24`	`24`	`}`
`25`	`25`	`public boolean canUse(EntityPlayer player) {`
`26`	`26`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), name)`
`27`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), name);`
	`27`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), name) \|\| CosmeticManager.isPreviewing(player.getUniqueID(), name));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public TechnoCrown() {`
`16`	`16`	`}`
`17`	`17`	`public boolean canUse(EntityPlayer player) {`
`18`	`18`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), "techno crown")`
`19`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), "techno crown");`
	`19`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), "techno crown") \|\| CosmeticManager.isPreviewing(player.getUniqueID(), "techno crown"));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ public KzeroBundle() {`
`20`	`20`
`21`	`21`	`public static boolean canUse(AbstractClientPlayer player, Type type) {`
`22`	`22`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase())`
`23`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase());`
	`23`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), "kzero " + type.name().toLowerCase()) \|\|`
	`24`	`+ CosmeticManager.isPreviewing(player.getUniqueID(), "kzero " + type.name().toLowerCase()));`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public enum Type {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public DragonCosmetic() {`
`17`	`17`	`}`
`18`	`18`	`public boolean canUse(EntityPlayer player) {`
`19`	`19`	`return CosmeticManager.equippedCosmetic(player.getUniqueID(), "dragon")`
`20`		`- && CosmeticManager.hasCosmetic(player.getUniqueID(), "dragon");`
	`20`	`+ && (CosmeticManager.hasCosmetic(player.getUniqueID(), "dragon") \|\| CosmeticManager.isPreviewing(player.getUniqueID(), "dragon"));`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Override`