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

Update to 1.17.1

Browse Source
This commit is contained in:
Marcel Konrad
2021-07-26 00:49:42 +02:00
parent cd058e9582
commit ea35dcb6f3
134 changed files with 1711 additions and 1809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,10 +7,10 @@ import java.util.Map;
import javax.annotation.Nullable;
import exopandora.worldhandler.builder.impl.BuilderUsercontent;
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.util.Util;
import net.minecraft.util.text.ChatType;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -40,7 +40,7 @@ public class UsercontentAPI
{
if(object != null)
{
Minecraft.getInstance().gui.handleChat(ChatType.CHAT, new StringTextComponent(object.toString()), Util.NIL_UUID);
Minecraft.getInstance().gui.handleChat(ChatType.CHAT, new TextComponent(object.toString()), Util.NIL_UUID);
}
}

6
src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java
View File

@@ -14,6 +14,7 @@ import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import org.apache.commons.io.IOUtils;
import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -27,11 +28,10 @@ import exopandora.worldhandler.builder.types.ArgumentType;
import exopandora.worldhandler.gui.widget.button.EnumIcon;
import exopandora.worldhandler.usercontent.model.Action;
import exopandora.worldhandler.usercontent.model.BooleanExpression;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import exopandora.worldhandler.usercontent.model.JsonMenu;
import exopandora.worldhandler.usercontent.model.JsonUsercontent;
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
import net.minecraft.util.ResourceLocation;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;

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

@@ -6,12 +6,12 @@ import exopandora.worldhandler.WorldHandler;
import exopandora.worldhandler.gui.content.Content;
import exopandora.worldhandler.gui.menu.impl.ILogicMapped;
import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.usercontent.model.AbstractJsonWidget;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.util.ActionHandler;
import net.minecraft.util.text.IFormattableTextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -56,20 +56,20 @@ public abstract class AbstractWidgetFactory
}
@Override
public IFormattableTextComponent translate(JsonItem item)
public MutableComponent translate(JsonItem item)
{
if(item.getTranslation() != null)
{
return new TranslationTextComponent(item.getTranslation());
return new TranslatableComponent(item.getTranslation());
}
return new StringTextComponent(item.getId());
return new TextComponent(item.getId());
}
@Override
public IFormattableTextComponent toTooltip(JsonItem item)
public MutableComponent toTooltip(JsonItem item)
{
return new StringTextComponent(item.getId());
return new TextComponent(item.getId());
}
@Override

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

@@ -12,11 +12,11 @@ import exopandora.worldhandler.gui.menu.impl.MenuPageList;
import exopandora.worldhandler.gui.widget.button.GuiButtonBase;
import exopandora.worldhandler.gui.widget.button.GuiButtonTooltip;
import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.AbstractJsonWidget;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.usercontent.model.JsonMenu;
import exopandora.worldhandler.usercontent.model.AbstractJsonWidget;
import exopandora.worldhandler.util.ActionHandler;
import net.minecraft.util.text.IFormattableTextComponent;
import net.minecraft.network.chat.MutableComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -68,7 +68,7 @@ public class MenuFactory extends AbstractWidgetFactory
}
@Override
public GuiButtonBase onRegister(int x, int y, int width, int height, IFormattableTextComponent text, JsonItem item, ActionHandler actionHandler)
public GuiButtonBase onRegister(int x, int y, int width, int height, MutableComponent text, JsonItem item, ActionHandler actionHandler)
{
return new GuiButtonTooltip(x, y, width, height, text, this.toTooltip(item), actionHandler);
}

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

@@ -16,11 +16,11 @@ import exopandora.worldhandler.gui.widget.button.GuiSlider;
import exopandora.worldhandler.gui.widget.button.GuiTextFieldTooltip;
import exopandora.worldhandler.gui.widget.button.LogicSliderSimple;
import exopandora.worldhandler.usercontent.UsercontentAPI;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import exopandora.worldhandler.usercontent.model.JsonItem;
import exopandora.worldhandler.usercontent.model.JsonWidget;
import exopandora.worldhandler.util.TextUtils;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ForgeRegistries;
@@ -34,7 +34,7 @@ public class WidgetFactory extends AbstractWidgetFactory
}
@Nullable
public Widget createWidget(JsonWidget widget, Content content, Container container, int x, int y)
public AbstractWidget createWidget(JsonWidget widget, Content content, Container container, int x, int y)
{
if(JsonWidget.Type.BUTTON.equals(widget.getType()))
{