Skip to content

Commit

Permalink
Updated to 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
MehradN committed Jul 2, 2023
1 parent d271929 commit 74cd781
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import java.util.HashMap;
import java.util.Map;

@Environment(EnvType.CLIENT)
public class ModMenuEntrypoint implements ModMenuApi {
@Override
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
import ir.mehradn.mehradconfig.MehradConfig;
import ir.mehradn.mehradconfig.gui.ConfigScreenBuilder;
import ir.mehradn.mehradconfig.gui.screen.MehradConfigScreen;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.screens.Screen;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;

/**
* This class is used for registering your configs for ModMenu.
*
* @see #register
*/
@Environment(EnvType.CLIENT)
public class ModMenuSupport {
static final Map<String, ConfigScreenLoader> screenBuilders = new HashMap<>();

Expand All @@ -27,6 +31,7 @@ public static void register(String modId, Supplier<MehradConfig> configConstruct
screenBuilders.put(modId, new ConfigScreenLoader(configConstructor, configScreenBuilder));
}

@Environment(EnvType.CLIENT)
record ConfigScreenLoader(Supplier<MehradConfig> configConstructor, ConfigScreenBuilder configScreenBuilder) {
MehradConfigScreen build(Screen parentScreen) {
return this.configScreenBuilder.buildAndLoad(this.configConstructor, parentScreen);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ir.mehradn.mehradconfig.gui.screen;

import com.mojang.blaze3d.vertex.PoseStack;
import ir.mehradn.mehradconfig.MehradConfig;
import ir.mehradn.mehradconfig.entry.ConfigEntry;
import ir.mehradn.mehradconfig.gui.ConfigScreenBuilder;
import ir.mehradn.mehradconfig.gui.EntryWidgetFactory;
import ir.mehradn.mehradconfig.gui.widget.ConfigEntryWidget;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.MultiLineTextWidget;
import net.minecraft.client.gui.navigation.ScreenRectangle;
Expand Down Expand Up @@ -104,7 +104,7 @@ public void init() {
}

@Override
public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) {
public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
Component description = Component.empty();
for (int i = 0; i < this.entryWidgets.size(); i++) {
ConfigEntryWidget<?> widget = this.entryWidgets.get(i);
Expand All @@ -115,9 +115,9 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic
}
this.hoverText.setMessage(description);

renderBackground(poseStack);
drawCenteredString(poseStack, this.font, this.title, this.width / 2, 15, 0xFFFFFF);
super.render(poseStack, mouseX, mouseY, partialTick);
renderBackground(guiGraphics);
guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 0xFFFFFF);
super.render(guiGraphics, mouseX, mouseY, partialTick);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public BooleanWidget(int x, int y, int width, int height,
((Widget)this.widget).setReport(this::reportValueChange);
}

@Environment(EnvType.CLIENT)
private static class Widget extends AbstractButton {
private final ConfigEntry<Boolean> entry;
private final TextProvider textProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ protected void onValueChanged() {
* @see ConfigEntry#getTranslatedTitle
* @see ConfigEntry#getTranslatedValue
*/
@Environment(EnvType.CLIENT)
public interface TextProvider {
/**
* The returned text should be based on the current value of the entry,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public EnumWidget(int x, int y, int width, int height,
((Widget<?>)this.widget).setReport(this::reportValueChange);
}

@Environment(EnvType.CLIENT)
private static class Widget <T extends Enum<T>> extends AbstractButton {
private final Class<T> enumClass;
private final ConfigEntry<T> entry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import net.minecraft.client.gui.components.AbstractSliderButton;

/**
* SliderNumberWidget is a widget for displaying and updating integer config entries in gui using an slider.
* SliderNumberWidget is a widget for displaying and updating integer config entries in gui using a slider.
* It works for config entries that have a constant min and max.
*/
@Environment(EnvType.CLIENT)
Expand All @@ -29,6 +29,7 @@ public void reportValueChange() {
((Widget)this.widget).updateSlider();
}

@Environment(EnvType.CLIENT)
private static class Widget extends AbstractSliderButton {
private final int min;
private final int max;
Expand Down

0 comments on commit 74cd781

Please sign in to comment.