diff --git a/build.gradle b/build.gradle index c626474..e76be14 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ dependencies { //runtimeOnly fg.deobf("curse.maven:oculus-581495:3770744") runtimeOnly fg.deobf("curse.maven:create-328085:3737418") runtimeOnly fg.deobf("curse.maven:flywheel-486392:3737402") - implementation fg.deobf("curse.maven:jei-238222:3758750") +// implementation fg.deobf("curse.maven:jei-238222:3758750") annotationProcessor 'org.spongepowered:mixin:0.8.3:processor' } diff --git a/build/libs/rubidium_extras-1.18.2_v1.3.3-i18n.jar b/build/libs/rubidium_extras-1.18.2_v1.3.3-i18n.jar new file mode 100644 index 0000000..3f8b309 Binary files /dev/null and b/build/libs/rubidium_extras-1.18.2_v1.3.3-i18n.jar differ diff --git a/gradle.properties b/gradle.properties index bb9ddaa..383fac5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.daemon = false # mod version info mod_id = rubidium_extras -mod_version = 1.3.2-i18n-Hotfix3 +mod_version = 1.3.3-i18n minecraft_version = 1.18.2 forge_version = 40.1.0 mappings_version=1.18.2 diff --git a/src/main/java/vice/rubidium_extras/config/MagnesiumExtrasConfig.java b/src/main/java/vice/rubidium_extras/config/MagnesiumExtrasConfig.java index a4e9b8e..46eaacf 100644 --- a/src/main/java/vice/rubidium_extras/config/MagnesiumExtrasConfig.java +++ b/src/main/java/vice/rubidium_extras/config/MagnesiumExtrasConfig.java @@ -31,7 +31,7 @@ public class MagnesiumExtrasConfig public static ConfigValue fog; public static ConfigValue enableDistanceChecks; - public static ConfigValue hideJEI; +// public static ConfigValue hideJEI; // Ok Zoomer public static ZoomValues zoomValues = new ZoomValues(); @@ -74,7 +74,7 @@ public class MagnesiumExtrasConfig cloudHeight = b.define("Cloud Height [Raw, Default 256]", 256); fadeInQuality = b.define("Chunk Fade In Quality (OFF, FAST, FANCY)", "FANCY"); fog = b.define("Render Fog", true); - hideJEI = b.define("Hide JEI Until Searching", true); +// hideJEI = b.define("Hide JEI Until Searching", true); fullScreenMode = b.defineEnum("Use Borderless Fullscreen", FullscreenMode.FULLSCREEN); }); diff --git a/src/main/java/vice/rubidium_extras/mixins/JEI/IngredientListOverlayMixin.java b/src/main/java/vice/rubidium_extras/mixins/JEI/IngredientListOverlayMixin.java index cd91926..e190013 100644 --- a/src/main/java/vice/rubidium_extras/mixins/JEI/IngredientListOverlayMixin.java +++ b/src/main/java/vice/rubidium_extras/mixins/JEI/IngredientListOverlayMixin.java @@ -1,58 +1,58 @@ package vice.rubidium_extras.mixins.JEI; -import com.mojang.blaze3d.vertex.PoseStack; -import mezz.jei.api.gui.handlers.IGuiProperties; -import mezz.jei.gui.elements.GuiIconToggleButton; -import mezz.jei.gui.overlay.IngredientListOverlay; -import mezz.jei.input.GuiTextFieldFilter; -import net.minecraft.client.Minecraft; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import vice.rubidium_extras.config.MagnesiumExtrasConfig; - -@Mixin(value = IngredientListOverlay.class, remap = false) -public class IngredientListOverlayMixin -{ - @Shadow - @Final - private GuiTextFieldFilter searchField; - - @Shadow private IGuiProperties guiProperties; - - @Shadow @Final private GuiIconToggleButton configButton; - - @Inject(cancellable = true, - at = @At(value = "INVOKE", target = "Lmezz/jei/gui/overlay/IngredientGridWithNavigation;draw(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/vertex/PoseStack;IIF)V"), - method = "drawScreen") - public void render(Minecraft minecraft, PoseStack poseStack, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) - { - if (!MagnesiumExtrasConfig.hideJEI.get()) - return; - - String value = searchField.getValue(); - if (value.equals("")) { - if (guiProperties != null) { - configButton.draw(poseStack, mouseX, mouseY, partialTicks); - } - ci.cancel(); - } - } - - @Inject(cancellable = true, - at = @At(value = "HEAD"), - method = "drawTooltips") - public void render(Minecraft minecraft, PoseStack poseStack, int mouseX, int mouseY, CallbackInfo ci) - { - if (!MagnesiumExtrasConfig.hideJEI.get()) - return; - - String value = searchField.getValue(); - if (value.equals("")) { - ci.cancel(); - } - } -} \ No newline at end of file +//import com.mojang.blaze3d.vertex.PoseStack; +//import mezz.jei.api.gui.handlers.IGuiProperties; +//import mezz.jei.gui.elements.GuiIconToggleButton; +//import mezz.jei.gui.overlay.IngredientListOverlay; +//import mezz.jei.input.GuiTextFieldFilter; +//import net.minecraft.client.Minecraft; +//import org.spongepowered.asm.mixin.Final; +//import org.spongepowered.asm.mixin.Mixin; +//import org.spongepowered.asm.mixin.Shadow; +//import org.spongepowered.asm.mixin.injection.At; +//import org.spongepowered.asm.mixin.injection.Inject; +//import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +//import vice.rubidium_extras.config.MagnesiumExtrasConfig; + +//@Mixin(value = IngredientListOverlay.class, remap = false) +//public class IngredientListOverlayMixin +//{ +// @Shadow +// @Final +// private GuiTextFieldFilter searchField; +// +// @Shadow private IGuiProperties guiProperties; +// +// @Shadow @Final private GuiIconToggleButton configButton; +// +// @Inject(cancellable = true, +// at = @At(value = "INVOKE", target = "Lmezz/jei/gui/overlay/IngredientGridWithNavigation;draw(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/vertex/PoseStack;IIF)V"), +// method = "drawScreen") +// public void render(Minecraft minecraft, PoseStack poseStack, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) +// { +// if (!MagnesiumExtrasConfig.hideJEI.get()) +// return; +// +// String value = searchField.getValue(); +// if (value.equals("")) { +// if (guiProperties != null) { +// configButton.draw(poseStack, mouseX, mouseY, partialTicks); +// } +// ci.cancel(); +// } +// } +// +// @Inject(cancellable = true, +// at = @At(value = "HEAD"), +// method = "drawTooltips") +// public void render(Minecraft minecraft, PoseStack poseStack, int mouseX, int mouseY, CallbackInfo ci) +// { +// if (!MagnesiumExtrasConfig.hideJEI.get()) +// return; +// +// String value = searchField.getValue(); +// if (value.equals("")) { +// ci.cancel(); +// } +// } +//} \ No newline at end of file diff --git a/src/main/java/vice/rubidium_extras/mixins/SodiumConfig/SodiumGameOptionsMixin.java b/src/main/java/vice/rubidium_extras/mixins/SodiumConfig/SodiumGameOptionsMixin.java index 8fdde88..39c845b 100644 --- a/src/main/java/vice/rubidium_extras/mixins/SodiumConfig/SodiumGameOptionsMixin.java +++ b/src/main/java/vice/rubidium_extras/mixins/SodiumConfig/SodiumGameOptionsMixin.java @@ -148,15 +148,15 @@ private static void Inject(CallbackInfoReturnable cir, List hideJEI = OptionImpl.createBuilder(Boolean.class, sodiumOpts) - .setName(Component.nullToEmpty(I18n.get("rb_extra.hide_jei_until_searching.name"))) - .setTooltip(Component.nullToEmpty(I18n.get("rb_extra.hide_jei_until_searching.tooltip"))) - .setControl(TickBoxControl::new) - .setBinding( - (options, value) -> MagnesiumExtrasConfig.hideJEI.set(value), - (options) -> MagnesiumExtrasConfig.hideJEI.get()) - .setImpact(OptionImpact.LOW) - .build(); +// OptionImpl hideJEI = OptionImpl.createBuilder(Boolean.class, sodiumOpts) +// .setName(Component.nullToEmpty(I18n.get("rb_extra.hide_jei_until_searching.name"))) +// .setTooltip(Component.nullToEmpty(I18n.get("rb_extra.hide_jei_until_searching.tooltip"))) +// .setControl(TickBoxControl::new) +// .setBinding( +// (options, value) -> MagnesiumExtrasConfig.hideJEI.set(value), +// (options) -> MagnesiumExtrasConfig.hideJEI.get()) +// .setImpact(OptionImpact.LOW) +// .build(); OptionImpl cloudHeight = OptionImpl.createBuilder(Integer.TYPE, sodiumOpts) .setName(Component.nullToEmpty(I18n.get("rb_extra.cloud_height.name"))) diff --git a/src/main/resources/assets/rubidium_extras/lang/en_us.json b/src/main/resources/assets/rubidium_extras/lang/en_us.json index 27bad09..8c2708b 100644 --- a/src/main/resources/assets/rubidium_extras/lang/en_us.json +++ b/src/main/resources/assets/rubidium_extras/lang/en_us.json @@ -33,8 +33,6 @@ "rb_extra.cloud_height.tooltip": "Raises cloud height.", "rb_extra.fog.name": "Enable fog", "rb_extra.fog.tooltip": "Toggles off all fog in the overworld.", - "rb_extra.hide_jei_until_searching.name": "Hide JEI Until Searching", - "rb_extra.hide_jei_until_searching.tooltip": "Toggles off JEI items unless you search for something. Press space to search for everything.", "rb_extra.full_screen_mode.name": "Fullscreen Mode", "rb_extra.full_screen_mode.tooltip": "Windowed - the game will display in a small window.\nBorderless - the game will be fullscreened, and locked to your monitor's refresh rate, but allow you to tab out easily.\nFullscreen - the game will display in native fullscreen mode.", diff --git a/src/main/resources/assets/rubidium_extras/lang/zh_cn.json b/src/main/resources/assets/rubidium_extras/lang/zh_cn.json index 958bf0e..07acde6 100644 --- a/src/main/resources/assets/rubidium_extras/lang/zh_cn.json +++ b/src/main/resources/assets/rubidium_extras/lang/zh_cn.json @@ -33,8 +33,6 @@ "rb_extra.cloud_height.tooltip": "提高云层高度。", "rb_extra.fog.name": "启用雾", "rb_extra.fog.tooltip": "关掉主世界所有的雾。", - "rb_extra.hide_jei_until_searching.name": "在搜索前隐藏JEI", - "rb_extra.hide_jei_until_searching.tooltip": "关闭JEI物品，除非你搜索到什么。按空格键可以搜索所有东西。", "rb_extra.full_screen_mode.name": "全屏模式", "rb_extra.full_screen_mode.tooltip": "窗口 - 游戏将在一个小窗口中显示。\n无边框 - 游戏将是全屏的，并锁定在你的显示器的刷新率上，但允许你轻松地退出。\n全屏 - 游戏将以原版全屏模式显示。", diff --git a/src/main/resources/rubidium_extras.mixins.json b/src/main/resources/rubidium_extras.mixins.json index 1557953..3bcb1e5 100644 --- a/src/main/resources/rubidium_extras.mixins.json +++ b/src/main/resources/rubidium_extras.mixins.json @@ -5,7 +5,6 @@ "refmap": "rubidium_extras.refmap.json", "mixins": [ "fog.MixinSodiumWorldRenderer", - "JEI.IngredientListOverlayMixin", "SodiumConfig.SodiumGameOptionsMixin", "Zoom.PlayerInventoryMixin" ],