entity renderer (somewhat functionaL)

13 files changed, 415 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/EntityViewerCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/EntityViewerCommand.java
new file mode 100644
index 00000000..c7b1862e
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/EntityViewerCommand.java
@@ -0,0 +1,81 @@
+package io.github.moulberry.notenoughupdates.commands;
+
+import com.google.common.collect.Lists;
+import io.github.moulberry.notenoughupdates.miscfeatures.entityviewer.EntityViewer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+public class EntityViewerCommand extends ClientCommandBase {
+    public EntityViewerCommand() {
+        super("neushowentity");
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return Lists.newArrayList("neuentityviewer");
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return EnumChatFormatting.RED + "Use /neushowentity list";
+    }
+
+    public void showUsage(ICommandSender sender) {
+        sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+    }
+
+    private final Queue<EntityViewer> queuedGUIS = new ConcurrentLinkedDeque<>();
+
+    @SubscribeEvent
+    public void onTick(TickEvent event) {
+        if (Minecraft.getMinecraft().currentScreen == null) {
+            EntityViewer poll = queuedGUIS.poll();
+            if (poll == null) return;
+            Minecraft.getMinecraft().displayGuiScreen(poll);
+        }
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] strings) throws CommandException {
+        if (strings.length == 0) {
+            showUsage(sender);
+            return;
+        }
+        if (strings[0].equals("list")) {
+            for (String label : EntityViewer.validEntities.keySet()) {
+                sender.addChatMessage(new ChatComponentText(EnumChatFormatting.BLUE + " " + label)
+                        .setChatStyle(new ChatStyle().setChatClickEvent(
+                                new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/neuentityviewer " + label))));
+            }
+            return;
+        }
+        EntityLivingBase entityLivingBase;
+        if (strings[0].startsWith("@")) {
+            ResourceLocation resourceLocation = new ResourceLocation(strings[0].substring(1));
+            entityLivingBase = EntityViewer.constructEntity(resourceLocation);
+        } else {
+            entityLivingBase = EntityViewer.constructEntity(strings[0], Arrays.copyOfRange(strings, 1, strings.length));
+        }
+        if (entityLivingBase == null) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Could not create that entity"));
+            return;
+        }
+        queuedGUIS.add(new EntityViewer(strings[0], entityLivingBase));
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/ChargedModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/ChargedModifier.java
new file mode 100644
index 00000000..17dce66d
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/ChargedModifier.java
@@ -0,0 +1,17 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCreeper;
+
+public class ChargedModifier extends EntityViewerModifier {
+
+    @Override
+    public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
+        if (base instanceof EntityCreeper) {
+            base.getDataWatcher().updateObject(17, (byte) 1);
+            return base;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java
new file mode 100644
index 00000000..7997db02
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java
@@ -0,0 +1,153 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.inventory.GuiInventory;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.*;
+import net.minecraft.entity.passive.*;
+import net.minecraft.util.ResourceLocation;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public class EntityViewer extends GuiScreen {
+
+    public static Map<String, Supplier<? extends EntityLivingBase>> validEntities = new HashMap<String, Supplier<? extends EntityLivingBase>>() {{
+        put("Zombie", () -> new EntityZombie(null));
+        put("Chicken", () -> new EntityChicken(null));
+        put("Slime", () -> new EntitySlime(null));
+        put("Wolf", () -> new EntityWolf(null));
+        put("Skeleton", () -> new EntitySkeleton(null));
+        put("Creeper", () -> new EntityCreeper(null));
+        put("Ocelot", () -> new EntityOcelot(null));
+        put("Blaze", () -> new EntityBlaze(null));
+        put("Rabbit", () -> new EntityRabbit(null));
+        put("Sheep", () -> new EntitySheep(null));
+        put("Horse", () -> new EntityHorse(null));
+        put("Eisengolem", () -> new EntityIronGolem(null));
+        put("Silverfish", () -> new EntitySilverfish(null));
+        put("Witch", () -> new EntityWitch(null));
+        put("Endermite", () -> new EntityEndermite(null));
+        put("Snowman", () -> new EntitySnowman(null));
+        put("Villager", () -> new EntityVillager(null));
+        put("Guardian", () -> new EntityGuardian(null));
+        put("Squid", () -> new EntitySquid(null));
+        put("Bat", () -> new EntityBat(null));
+        put("Spider", () -> new EntitySpider(null));
+        put("CaveSpider", () -> new EntityCaveSpider(null));
+        put("Pigman", () -> new EntityPigZombie(null));
+        put("Enderman", () -> new EntityEnderman(null));
+        put("Player", () -> new GUIClientPlayer());
+    }};
+
+    public static Map<String, EntityViewerModifier> validModifiers = new HashMap<String, EntityViewerModifier>() {{
+        put("playerdata", new SkinModifier());
+        put("equipment", new EquipmentModifier());
+        put("riding", new RidingModifier());
+        put("charged", new ChargedModifier());
+        put("invisible", new InvisibleModifier());
+    }};
+
+    public int guiLeft = 0;
+    public int guiTop = 0;
+    public int xSize = 176;
+    public int ySize = 166;
+
+    private final String label;
+    private final EntityLivingBase entity;
+    private static final ResourceLocation BACKGROUND = new ResourceLocation("notenoughupdates", "textures/gui/entity_viewer.png");
+
+    public EntityViewer(String label, EntityLivingBase entity) {
+        this.label = label;
+        this.entity = entity;
+    }
+
+    public static EntityLivingBase constructEntity(ResourceLocation resourceLocation) {
+        Gson gson = NotEnoughUpdates.INSTANCE.manager.gson;
+        try (Reader is = new InputStreamReader(
+                Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation).getInputStream(), StandardCharsets.UTF_8)) {
+            return constructEntity(gson.fromJson(is, JsonObject.class));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static EntityLivingBase constructEntity(JsonObject info) {
+        List<JsonObject> modifiers = info.has("modifiers") ?
+                StreamSupport.stream(info.get("modifiers").getAsJsonArray().spliterator(), false)
+                        .map(JsonElement::getAsJsonObject).collect(Collectors.toList())
+                : Collections.emptyList();
+        return EntityViewer.constructEntity(info.get("entity").getAsString(), modifiers);
+    }
+
+    public static EntityLivingBase constructEntity(String string, String[] modifiers) {
+        Gson gson = NotEnoughUpdates.INSTANCE.manager.gson;
+        return constructEntity(string, Arrays.stream(modifiers).map(it -> gson.fromJson(it, JsonObject.class)).collect(Collectors.toList()));
+    }
+
+    public static EntityLivingBase constructEntity(String string, List<JsonObject> modifiers) {
+        Supplier<? extends EntityLivingBase> aClass = validEntities.get(string);
+        if (aClass == null) {
+            System.err.println("Could not find entity of type: " + string);
+            return null;
+        }
+        try {
+            EntityLivingBase entity = aClass.get();
+            for (JsonObject modifier : modifiers) {
+                String type = modifier.get("type").getAsString();
+                EntityViewerModifier entityViewerModifier = validModifiers.get(type);
+                entity = entityViewerModifier.applyModifier(entity, modifier);
+                if (entity == null) break;
+            }
+            return entity;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        drawDefaultBackground();
+        FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj;
+
+        this.guiLeft = (width - this.xSize) / 2;
+        this.guiTop = (height - this.ySize) / 2;
+
+
+        Minecraft.getMinecraft().getTextureManager().bindTexture(BACKGROUND);
+        drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize);
+
+
+        Utils.drawStringScaledMaxWidth(label, fontRenderer, guiLeft + 10, guiTop + 10, false, 100, 0xFF00FF);
+
+        GlStateManager.color(1F, 1F, 1F, 1F);
+
+        int scale = 30;
+        float bottomOffset = 0F;
+        EntityLivingBase stack = entity;
+        while (true) {
+            GuiInventory.drawEntityOnScreen(guiLeft + 90, (int) (guiTop + 75 - bottomOffset * scale), scale, guiLeft - mouseX + 80, guiTop + 60 - mouseY, stack);
+            bottomOffset += stack.height;
+            if (!(stack.riddenByEntity instanceof EntityLivingBase)) {
+                break;
+            }
+            stack = (EntityLivingBase) stack.riddenByEntity;
+        }
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewerModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewerModifier.java
new file mode 100644
index 00000000..bab6c354
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewerModifier.java
@@ -0,0 +1,8 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import net.minecraft.entity.EntityLivingBase;
+
+public abstract class EntityViewerModifier {
+    public abstract EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info);
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java
new file mode 100644
index 00000000..ed1a932b
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java
@@ -0,0 +1,24 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import io.github.moulberry.notenoughupdates.NEUManager;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import net.minecraft.entity.EntityLivingBase;
+
+public class EquipmentModifier extends EntityViewerModifier {
+    @Override
+    public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
+        NEUManager manager = NotEnoughUpdates.INSTANCE.manager;
+        if (info.has("hand"))
+            base.setCurrentItemOrArmor(0, manager.createItem(info.get("hand").getAsString()));
+        if (info.has("helmet"))
+            base.setCurrentItemOrArmor(4, manager.createItem(info.get("helmet").getAsString()));
+        if (info.has("chestplate"))
+            base.setCurrentItemOrArmor(3, manager.createItem(info.get("chestplate").getAsString()));
+        if (info.has("leggings"))
+            base.setCurrentItemOrArmor(2, manager.createItem(info.get("leggings").getAsString()));
+        if (info.has("feet"))
+            base.setCurrentItemOrArmor(1, manager.createItem(info.get("feet").getAsString()));
+        return base;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/GUIClientPlayer.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/GUIClientPlayer.java
new file mode 100644
index 00000000..bbff2db1
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/GUIClientPlayer.java
@@ -0,0 +1,40 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.client.resources.DefaultPlayerSkin;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.UUID;
+
+public class GUIClientPlayer extends AbstractClientPlayer {
+    public GUIClientPlayer() {
+        super(null, new GameProfile(UUID.randomUUID(), "GuiPlayer"));
+    }
+
+    ResourceLocation overrideSkin = DefaultPlayerSkin.getDefaultSkinLegacy();
+    ResourceLocation overrideCape = null;
+    boolean overrideIsSlim = false;
+    NetworkPlayerInfo playerInfo = new NetworkPlayerInfo(this.getGameProfile()) {
+        @Override
+        public String getSkinType() {
+            return overrideIsSlim ? "slim" : "default";
+        }
+
+        @Override
+        public ResourceLocation getLocationSkin() {
+            return overrideSkin;
+        }
+
+        @Override
+        public ResourceLocation getLocationCape() {
+            return overrideCape;
+        }
+    };
+
+    @Override
+    protected NetworkPlayerInfo getPlayerInfo() {
+        return playerInfo;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/InvisibleModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/InvisibleModifier.java
new file mode 100644
index 00000000..c2138b3f
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/InvisibleModifier.java
@@ -0,0 +1,12 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import net.minecraft.entity.EntityLivingBase;
+
+public class InvisibleModifier extends EntityViewerModifier {
+    @Override
+    public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
+        base.setInvisible(!info.has("invisible") || info.get("invisible").getAsBoolean());
+        return base;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/RidingModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/RidingModifier.java
new file mode 100644
index 00000000..9879542a
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/RidingModifier.java
@@ -0,0 +1,14 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import net.minecraft.entity.EntityLivingBase;
+
+public class RidingModifier extends EntityViewerModifier {
+    @Override
+    public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
+        EntityLivingBase newEntity = EntityViewer.constructEntity(info);
+        if (newEntity == null) return null;
+        newEntity.mountEntity(base);
+        return base;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/SkinModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/SkinModifier.java
new file mode 100644
index 00000000..13b4fd7c
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/SkinModifier.java
@@ -0,0 +1,24 @@
+package io.github.moulberry.notenoughupdates.miscfeatures.entityviewer;
+
+import com.google.gson.JsonObject;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
+
+public class SkinModifier extends EntityViewerModifier {
+    @Override
+    public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
+        if (base instanceof GUIClientPlayer) {
+            GUIClientPlayer player = (GUIClientPlayer) base;
+            if (info.has("cape")) {
+                player.overrideCape = new ResourceLocation(info.get("cape").getAsString());
+            }
+            if (info.has("skin")) {
+                player.overrideSkin = new ResourceLocation(info.get("skin").getAsString());
+            }
+            if (info.has("slim")) {
+                player.overrideIsSlim = info.get("slim").getAsBoolean();
+            }
+        }
+        return base;
+    }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityHorse.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityHorse.java
new file mode 100644
index 00000000..fe88922e
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityHorse.java
@@ -0,0 +1,17 @@
+package io.github.moulberry.notenoughupdates.mixins;
+
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(EntityHorse.class)
+public class MixinEntityHorse {
+    @Redirect(method = "updateHorseSlots", at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;isRemote:Z"))
+    public boolean onUpdateHorseSlots(World instance) {
+        if (instance == null)
+            return true;
+        return instance.isRemote;
+    }
+}
diff --git a/src/main/resources/assets/notenoughupdates/dream.json b/src/main/resources/assets/notenoughupdates/dream.json
new file mode 100644
index 00000000..3b83e14c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dream.json
@@ -0,0 +1,24 @@
+{
+  "entity": "Player",
+  "modifiers": [
+	{
+	  "type": "playerdata",
+	  "skin": "notenoughupdates:dreamskin.png"
+	},
+	{
+	  "type": "riding",
+	  "entity": "Chicken",
+	  "modifiers": [
+		{
+		  "type": "riding",
+		  "entity": "Squid"
+		}
+	  ]
+	},
+	{
+	  "type": "equipment",
+	  "hand": "DIAMOND_SWORD",
+	  "feet": "DIAMOND_BOOTS"
+	}
+  ]
+}
diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/entity_viewer.png b/src/main/resources/assets/notenoughupdates/textures/gui/entity_viewer.png
new file mode 100644
index 00000000..18085170
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/textures/gui/entity_viewer.png
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index a566ee2e..71e10d46 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -8,6 +8,7 @@
 	"MixinEffectRenderer",
 	"MixinEntity",
 	"MixinEntityAgeable",
+	"MixinEntityHorse",
 	"MixinEntityPlayer",
 	"MixinEntityPlayerSP",
 	"MixinEntityRenderer",