Tooltippable

Author: moehreag

src/main/java/io/github/moehreag/axolotlclient/config/options/Option.java

@@ -6,7 +6,7 @@
 
 import java.util.Objects;
 
-public interface Option {
+public interface Option extends Tooltippable {
 
     OptionType getType();
 
@@ -22,10 +22,4 @@ default Text getTranslatedName(){
 
     JsonElement getJson();
 
-	default @Nullable Text getTooltip(){
-		if(!Objects.equals(Text.translatable(getName() + ".tooltip").getString(), getName() + ".tooltip")) {
-			return Text.translatable(getName() + ".tooltip");
-		}
-		return null;
-	}
 }

src/main/java/io/github/moehreag/axolotlclient/config/options/OptionCategory.java

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public class OptionCategory {
+public class OptionCategory implements Tooltippable {
 
     Identifier Id;
 	String name;
@@ -47,11 +47,4 @@ public String getName() {
     }
 
     public Text getTranslatedName(){return Text.translatable(name);}
-
-	public @Nullable Text getTooltip(){
-		if(!Objects.equals(Text.translatable(getName() + ".tooltip").getString(), getName() + ".tooltip")) {
-			return Text.translatable(getName() + ".tooltip");
-		}
-		return null;
-	}
 }

src/main/java/io/github/moehreag/axolotlclient/config/options/Tooltippable.java

@@ -0,0 +1,19 @@
+package io.github.moehreag.axolotlclient.config.options;
+
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public interface Tooltippable {
+
+	String getName();
+
+
+	default @Nullable Text getTooltip(){
+		if(!Objects.equals(Text.translatable(getName() + ".tooltip").getString(), getName() + ".tooltip")) {
+			return Text.translatable(getName()+ ".tooltip");
+		}
+		return null;
+	}
+}

src/main/java/io/github/moehreag/axolotlclient/config/screen/ButtonWidgetList.java

@@ -16,6 +16,7 @@
 import io.github.moehreag.axolotlclient.config.options.Option;
 import io.github.moehreag.axolotlclient.config.options.OptionCategory;
 import io.github.moehreag.axolotlclient.config.options.StringOption;
+import io.github.moehreag.axolotlclient.config.options.Tooltippable;
 import io.github.moehreag.axolotlclient.config.screen.widgets.BooleanWidget;
 import io.github.moehreag.axolotlclient.config.screen.widgets.CategoryWidget;
 import io.github.moehreag.axolotlclient.config.screen.widgets.ColorOptionWidget;
@@ -222,7 +223,7 @@ public void render(MatrixStack matrices, int index, int y, int x, int entryWidth
 
         }
 
-		protected void renderTooltip(MatrixStack matrices, Option option, int x, int y){
+		protected void renderTooltip(MatrixStack matrices, Tooltippable option, int x, int y){
 			if(MinecraftClient.getInstance().currentScreen instanceof OptionsScreenBuilder &&
 				AxolotlClient.CONFIG.showOptionTooltips.get() && option.getTooltip()!=null){
 				GL11.glDisable(GL11.GL_SCISSOR_TEST);
@@ -231,15 +232,6 @@ protected void renderTooltip(MatrixStack matrices, Option option, int x, int y){
 			}
 		}
 
-		protected void renderTooltip(MatrixStack matrices, OptionCategory category, int x, int y){
-			if(MinecraftClient.getInstance().currentScreen instanceof OptionsScreenBuilder &&
-				AxolotlClient.CONFIG.showCategoryTooltips.get() && category.getTooltip()!=null){
-				GL11.glDisable(GL11.GL_SCISSOR_TEST);
-				((OptionsScreenBuilder) MinecraftClient.getInstance().currentScreen).renderTooltip(matrices, category, x, y);
-				Util.applyScissor(new Rectangle(0, top, width, bottom-top));
-			}
-		}
-
 	    @Override
 	    public boolean mouseClicked(double mouseX, double mouseY, int button) {
             if (this.left.isMouseOver(mouseX, mouseY)) {

src/main/java/io/github/moehreag/axolotlclient/config/screen/OptionsScreenBuilder.java

@@ -5,6 +5,7 @@
 import io.github.moehreag.axolotlclient.config.options.ColorOption;
 import io.github.moehreag.axolotlclient.config.options.Option;
 import io.github.moehreag.axolotlclient.config.options.OptionCategory;
+import io.github.moehreag.axolotlclient.config.options.Tooltippable;
 import io.github.moehreag.axolotlclient.config.screen.widgets.ColorSelectionWidget;
 import io.github.moehreag.axolotlclient.modules.hud.util.DrawUtil;
 import net.minecraft.client.MinecraftClient;
@@ -111,16 +112,9 @@ public boolean charTyped(char chr, int modifiers) {
 		return list.charTyped(chr, modifiers);
 	}
 
-	public void renderTooltip(MatrixStack matrices, Option option, int x, int y){
+	public void renderTooltip(MatrixStack matrices, Tooltippable option, int x, int y){
 		List<Text> text = new ArrayList<>();
-		String[] tooltip = Objects.requireNonNull(option.getTooltip()).getString().split("\n");
-		for(String s:tooltip) text.add(Text.literal(s));
-		this.renderTooltip(matrices, text, x, y);
-	}
-
-	public void renderTooltip(MatrixStack matrices, OptionCategory category, int x, int y){
-		List<Text> text = new ArrayList<>();
-		String[] tooltip = Objects.requireNonNull(category.getTooltip()).getString().split("\n");
+		String[] tooltip = Objects.requireNonNull(option.getTooltip()).getString().split("<br>");
 		for(String s:tooltip) text.add(Text.literal(s));
 		this.renderTooltip(matrices, text, x, y);
 	}

src/main/java/io/github/moehreag/axolotlclient/modules/hud/util/ItemUtil.java

@@ -146,28 +146,27 @@ public static void renderGuiItemModel(MatrixStack matrices, ItemStack stack, flo
 		RenderSystem.enableBlend();
 		RenderSystem.blendFunc(GlStateManager.class_4535.SRC_ALPHA, GlStateManager.class_4534.ONE_MINUS_SRC_ALPHA);
 		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-		MatrixStack matrixStack = RenderSystem.getModelViewStack();
-		matrixStack.push();
-		matrixStack.translate(x, y, 100.0F + MinecraftClient.getInstance().getItemRenderer().zOffset);
-		matrixStack.translate(8.0, 8.0, 0.0);
-		matrixStack.scale(1.0F, -1.0F, 1.0F);
-		matrixStack.scale(16.0F, 16.0F, 16.0F);
+		matrices.push();
+		matrices.translate(x, y, (100.0F + client.getItemRenderer().zOffset));
+		matrices.translate(8.0D, 8.0D, 0.0D);
+		matrices.scale(1.0F, -1.0F, 1.0F);
+		matrices.scale(16.0F, 16.0F, 16.0F);
 		RenderSystem.applyModelViewMatrix();
-		MatrixStack matrixStack2 = new MatrixStack();
 		VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers();
 		boolean bl = !model.isSideLit();
 		if (bl) {
 			DiffuseLighting.setupFlatGuiLighting();
 		}
 
-		MinecraftClient.getInstance().getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, matrixStack2, immediate, 15728880, OverlayTexture.DEFAULT_UV, model);
+		client.getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, matrices, immediate, 15728880,
+			OverlayTexture.DEFAULT_UV, model);
 		immediate.draw();
 		RenderSystem.enableDepthTest();
 		if (bl) {
 			DiffuseLighting.setup3DGuiLighting();
 		}
 
-		matrixStack.pop();
+		matrices.pop();
 		RenderSystem.applyModelViewMatrix();
 	}
 

src/main/resources/assets/axolotlclient/lang/en_us.json

@@ -17,7 +17,7 @@
 	"nightMode": "Night Mode",
 	"nightMode.tooltip": "Reduces blue colors.",
 	"quickToggles": "Quick Toggles",
-	"quickToggles.tooltip": "Whether to show small switches on categories\ncontaining an 'enabled' option.",
+	"quickToggles.tooltip": "Whether to show small switches on categories<br>containing an 'enabled' option.",
 	"showOptionTooltips": "Show Option Tooltips",
 	"showOptionTooltips.tooltip": "Whether to show Tooltips on Options in the menu.",
 	"showCategoryTooltips": "Show Category Tooltips",