Compare commits

..
Author SHA1 Message Date
UltraProdigy d5669e3000 ci: run build and test on release branches 2026-11-09 01:43:44 -05:00
6 changed files with 2 additions and 18 deletions

No files matched your search

+2 -2
View File
@@ -3,9 +3,9 @@ name: Build and test
on:
pull_request:
branches: [ master, main ]
branches: [ master, main, release/** ]
push:
branches: [ master, main ]
branches: [ master, main, release/** ]
jobs:
build-and-test:
@@ -53,7 +53,6 @@ public class ProxyClient extends ProxyServer {
ModuleRegistrar.instance().addConfig("General", "general.showents");
ModuleRegistrar.instance().addConfig("General", "general.showhp");
ModuleRegistrar.instance().addConfig("General", "general.showcrop");
if (LoadedMods.NEI) ModuleRegistrar.instance().addConfig("General", "general.showsecondlangname");
ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth());
ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack());
@@ -1,7 +1,6 @@
package mcp.mobius.waila.handlers;
import static mcp.mobius.waila.api.SpecialChars.BLUE;
import static mcp.mobius.waila.api.SpecialChars.GRAY;
import static mcp.mobius.waila.api.SpecialChars.ITALIC;
import java.util.List;
@@ -18,10 +17,8 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.handlers.nei.NEIHandler;
import mcp.mobius.waila.overlay.DisplayUtil;
import mcp.mobius.waila.utils.Constants;
import mcp.mobius.waila.utils.LoadedMods;
import mcp.mobius.waila.utils.ModIdentification;
public class HUDHandlerBlocks implements IWailaDataProvider {
@@ -52,11 +49,6 @@ public class HUDHandlerBlocks implements IWailaDataProvider {
if (currenttip.isEmpty()) currenttip.add("< Unnamed >");
else {
if (LoadedMods.NEI && config.getConfig("general.showsecondlangname")) {
String secondName = NEIHandler.getSecondLanguageName(itemStack);
if (!secondName.isEmpty()) currenttip.add(GRAY + secondName);
}
if (ConfigHandler.instance()
.getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)) {
currenttip.add(
@@ -16,7 +16,6 @@ import codechicken.nei.api.API;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import codechicken.nei.util.ItemUntranslator;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.overlay.RayTracing;
@@ -40,10 +39,6 @@ public class NEIHandler {
API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I);
}
public static String getSecondLanguageName(ItemStack stack) {
return ItemUntranslator.getInstance().getItemStackDisplayName(stack);
}
public static boolean firstInventory = true;
public static void openRecipeGUI(boolean recipe) {
@@ -153,7 +153,6 @@ option.stevescarts.shifttoggle=Shift toggle
option.general.showents=Show entities
option.general.showhp=Show entities health
option.general.showcrop=Show crop growth
option.general.showsecondlangname=Show second language name (NEI)
option.thaumcraft.aspects=Show aspects
nei.options.keys.showenchant=Show enchanting values
@@ -147,5 +147,4 @@ option.stevescarts.colorblind=Режим цветокоррекции
option.stevescarts.shifttoggle=Приседание показывает
option.general.showhp=Показывать здоровье сущностей
option.general.showcrop=Показывать рост растений
option.general.showsecondlangname=Показывать название на втором языке (NEI)
option.thaumcraft.aspects=Показывать аспекты