MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update to 1.16.1

Browse Source
This commit is contained in:
Marcel Konrad
2020-07-01 23:44:51 +02:00
parent 8918475788
commit cdc222b1e7
91 changed files with 1887 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/exopandora/worldhandler/usercontent/UsercontentAPI.java
View File

@@ -8,6 +8,7 @@ import javax.annotation.Nullable;
import exopandora.worldhandler.builder.impl.BuilderUsercontent;
import net.minecraft.client.Minecraft;
import net.minecraft.util.Util;
import net.minecraft.util.text.ChatType;
import net.minecraft.util.text.StringTextComponent;
import net.minecraftforge.api.distmarker.Dist;
@@ -39,7 +40,7 @@ public class UsercontentAPI
{
if(object != null)
{
Minecraft.getInstance().ingameGUI.addChatMessage(ChatType.CHAT, new StringTextComponent(object.toString()));
Minecraft.getInstance().ingameGUI.func_238450_a_(ChatType.CHAT, new StringTextComponent(object.toString()), Util.field_240973_b_);
}
}

14
src/main/java/exopandora/worldhandler/usercontent/factory/ButtonFactory.java
View File

@@ -16,9 +16,9 @@ import exopandora.worldhandler.gui.button.LogicSliderSimple;
import exopandora.worldhandler.gui.container.Container;
import exopandora.worldhandler.gui.content.Content;
import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.util.TextFormatting;
import exopandora.worldhandler.usercontent.model.JsonButton;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.util.TextUtils;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
@@ -44,8 +44,8 @@ public class ButtonFactory extends WidgetFactory
button.getDimensions().getY() + y,
button.getDimensions().getWidth(),
button.getDimensions().getHeight(),
TextFormatting.formatNonnull(button.getText()),
TextFormatting.formatNullable(button.getAttributes() != null ? button.getAttributes().getTooltip() : null),
TextUtils.formatNonnull(button.getText()),
TextUtils.formatNonnull(button.getAttributes() != null ? button.getAttributes().getTooltip() : null),
this.getActionHandlerFactory().createActionHandler(content, button.getAction())
);
}
@@ -70,7 +70,7 @@ public class ButtonFactory extends WidgetFactory
button.getDimensions().getWidth(),
button.getDimensions().getHeight(),
button.getAttributes().getIcon(),
TextFormatting.formatNonnull(button.getAttributes().getTooltip()),
TextUtils.formatNonnull(button.getAttributes().getTooltip()),
this.getActionHandlerFactory().createActionHandler(content, button.getAction())
);
}
@@ -100,7 +100,7 @@ public class ButtonFactory extends WidgetFactory
button.getAttributes().getMax(),
button.getAttributes().getStart(),
container,
new LogicSliderSimple(button.getAttributes().getId(), TextFormatting.formatNullable(button.getText()), responder)
new LogicSliderSimple(button.getAttributes().getId(), TextUtils.formatNonnull(button.getText()), responder)
);
}
else if(JsonButton.Type.TEXTFIELD.equals(button.getType()))
@@ -111,7 +111,7 @@ public class ButtonFactory extends WidgetFactory
button.getDimensions().getY() + y,
button.getDimensions().getWidth(),
button.getDimensions().getHeight(),
TextFormatting.formatNullable(button.getText())
TextUtils.formatNonnull(button.getText())
);
textfield.setValidator(Predicates.notNull());
textfield.setText(this.getApi().getValue(button.getAttributes().getId()));

5
src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java
View File

@@ -10,10 +10,11 @@ import exopandora.worldhandler.gui.menu.Menu;
import exopandora.worldhandler.gui.menu.impl.ILogicPageList;
import exopandora.worldhandler.gui.menu.impl.MenuPageList;
import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.JsonMenu;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.usercontent.model.JsonMenu;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import exopandora.worldhandler.util.ActionHandler;
import net.minecraft.util.text.IFormattableTextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -65,7 +66,7 @@ public class MenuFactory extends WidgetFactory
}
@Override
public GuiButtonBase onRegister(int x, int y, int width, int height, String text, JsonItem item, ActionHandler actionHandler)
public GuiButtonBase onRegister(int x, int y, int width, int height, IFormattableTextComponent text, JsonItem item, ActionHandler actionHandler)
{
return new GuiButtonTooltip(x, y, width, height, text, this.toTooltip(item), actionHandler);
}

18
src/main/java/exopandora/worldhandler/usercontent/factory/WidgetFactory.java
View File

@@ -7,7 +7,9 @@ import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import exopandora.worldhandler.util.ActionHandler;
import exopandora.worldhandler.util.TextFormatting;
import net.minecraft.util.text.IFormattableTextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -50,16 +52,20 @@ public abstract class WidgetFactory
}
@Override
public String translate(JsonItem item)
public IFormattableTextComponent translate(JsonItem item)
{
String translation = TextFormatting.formatNullable(item.getTranslation());
return translation == null ? item.getId() : translation;
if(item.getTranslation() != null)
{
return new TranslationTextComponent(item.getTranslation());
}
return new StringTextComponent(item.getId());
}
@Override
public String toTooltip(JsonItem item)
public IFormattableTextComponent toTooltip(JsonItem item)
{
return item.getId();
return new StringTextComponent(item.getId());
}
@Override