diff options
| author | Lorenz <ESs95s3P5z8Pheb> | 2022-07-08 10:05:54 +0200 |
|---|---|---|
| committer | Lorenz <ESs95s3P5z8Pheb> | 2022-07-08 10:05:54 +0200 |
| commit | a2087e9a2fa43e13e4276b81ac7235f441a5c28d (patch) | |
| tree | 64e9e908ac11cfc5eabb2051b6e0d79b56d876e3 /src/main | |
| parent | 697389e5a2bffdbe40be6ee9418dcf19e64ba3ce (diff) | |
| parent | 1692a86aa2bb70b7b3ec20182fdc26f381cdc3f0 (diff) | |
| download | skyhanni-a2087e9a2fa43e13e4276b81ac7235f441a5c28d.tar.gz skyhanni-a2087e9a2fa43e13e4276b81ac7235f441a5c28d.tar.bz2 skyhanni-a2087e9a2fa43e13e4276b81ac7235f441a5c28d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java | 28 | ||||
| -rw-r--r-- | src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java | 1 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java b/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java index 06275b4dd..b03511271 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java +++ b/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java @@ -12,25 +12,26 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RenderItem.class) public abstract class MixinRenderItem { -// @Inject(method = "renderItemIntoGUI", at = @At("HEAD")) -// private void renderRarity(ItemStack stack, int x, int y, CallbackInfo ci) { -// RenderItemHookKt.renderRarity(stack, x, y, ci); -// } + + // @Inject(method = "renderItemIntoGUI", at = @At("HEAD")) + // private void renderRarity(ItemStack stack, int x, int y, CallbackInfo ci) { + // RenderItemHookKt.renderRarity(stack, x, y, ci); + // } @Inject(method = "renderItemOverlayIntoGUI", at = @At("RETURN")) private void renderItemOverlayPost(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text, CallbackInfo ci) { RenderItemHookKt.renderItemOverlayPost(fr, stack, xPosition, yPosition, text, ci); } -// @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/GlStateManager.scale(FFF)V", shift = At.Shift.AFTER)) -// private void renderItemPre(ItemStack stack, IBakedModel model, CallbackInfo ci) { -// RenderItemHookKt.renderItemPre(stack, model, ci); -// } -// -// @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderEffect(Lnet/minecraft/client/resources/model/IBakedModel;)V", shift = At.Shift.BEFORE), cancellable = true) -// private void modifyGlintRendering(ItemStack stack, IBakedModel model, CallbackInfo ci) { -// RenderItemHookKt.modifyGlintRendering(stack, model, ci); -// } + // @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/GlStateManager.scale(FFF)V", shift = At.Shift.AFTER)) + // private void renderItemPre(ItemStack stack, IBakedModel model, CallbackInfo ci) { + // RenderItemHookKt.renderItemPre(stack, model, ci); + // } + // + // @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderEffect(Lnet/minecraft/client/resources/model/IBakedModel;)V", shift = At.Shift.BEFORE), cancellable = true) + // private void modifyGlintRendering(ItemStack stack, IBakedModel model, CallbackInfo ci) { + // RenderItemHookKt.modifyGlintRendering(stack, model, ci); + // } @Inject(method = "renderEffect", at = @At("HEAD"), cancellable = true) public void onRenderEffect(CallbackInfo ci) { @@ -38,5 +39,4 @@ public abstract class MixinRenderItem { ci.cancel(); } } - } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java index 02f155e96..d33f990e9 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java @@ -43,7 +43,6 @@ public class SkyblockHud { MinecraftForge.EVENT_BUS.register(new HideNotClickableItems()); MinecraftForge.EVENT_BUS.register(new DungeonHighlightClickedBlocks()); MinecraftForge.EVENT_BUS.register(new ItemDisplayOverlayFeatures()); - // MinecraftForge.EVENT_BUS.register(new LeaderboardGetter()); // MinecraftForge.EVENT_BUS.register(new SeasonDateHandler()); // MinecraftForge.EVENT_BUS.register(new LocationHandler()); |