From 2692193e54e4dd6c0117dcdb85368dc83bb04f1a Mon Sep 17 00:00:00 2001 From: Roman / Nea Date: Mon, 18 Apr 2022 17:33:32 +0200 Subject: Mob loot recipe PR (#81) * entity renderer (somewhat functionaL) * more modifiers and entities * Fix cookie fuckup * add neu repo as resource pack, cause why not at this point * add tabs, because i can * add extra skin parts and make less tabs * hot tall men * fix texture offsets and also parts:true * some untested changes * still broken, but better (just like me (stop being edgy nea ( no u )))) * stuff (with er skeletons * niceities * skytils interop * horseys * horseys ouch * panos * stupid tests :angery: * NPE * add drop chance * colored leather armo * finish off * move shit into hover cause items look pretty terrible * Update 2.1.md * better recipe display name * always show mobs toggle * moving parts --- .../resources/assets/notenoughupdates/dream.json | 49 +++++++++++++++++++++ .../textures/gui/crafting_table_tall.png | Bin 0 -> 12019 bytes .../textures/gui/entity_viewer.png | Bin 0 -> 8085 bytes .../notenoughupdates/textures/gui/forge_recipe.png | Bin 889 -> 0 bytes .../textures/gui/forge_recipe_tall.png | Bin 0 -> 9257 bytes .../textures/gui/mob_loot_tall.png | Bin 0 -> 9503 bytes .../assets/notenoughupdates/textures/gui/tab.png | Bin 0 -> 1247 bytes .../textures/gui/villager_recipe.png | Bin 8633 -> 0 bytes .../textures/gui/villager_recipe_tall.png | Bin 0 -> 9218 bytes src/main/resources/mixins.notenoughupdates.json | 7 +++ 10 files changed, 56 insertions(+) create mode 100644 src/main/resources/assets/notenoughupdates/dream.json create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/crafting_table_tall.png create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/entity_viewer.png delete mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe.png create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe_tall.png create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/mob_loot_tall.png create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/tab.png delete mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe.png create mode 100644 src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe_tall.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/notenoughupdates/dream.json b/src/main/resources/assets/notenoughupdates/dream.json new file mode 100644 index 00000000..6f27e89e --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/dream.json @@ -0,0 +1,49 @@ +{ + "entity": "Player", + "modifiers": [ + { + "type": "playerdata", + "skin": "notenoughupdates:dreamskin.png" + }, + { + "type": "riding", + "entity": "ArmorStand", + "modifiers": [ + { + "type": "age", + "baby": true + }, + { + "type": "riding", + "entity": "Zombie", + "modifiers": [ + { + "type": "equipment", + "hand": "BOW", + "feet": "DIAMOND_BOOTS" + }, + { + "type": "age", + "baby": true + }, + { + "type": "riding", + "entity": "Sheep", + "modifiers": [ + { + "type": "age", + "baby": true + } + ] + } + ] + } + ] + }, + { + "type": "equipment", + "hand": "DIAMOND_SWORD", + "feet": "DIAMOND_BOOTS" + } + ] +} diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/crafting_table_tall.png b/src/main/resources/assets/notenoughupdates/textures/gui/crafting_table_tall.png new file mode 100644 index 00000000..5a5fa825 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/crafting_table_tall.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/entity_viewer.png differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe.png b/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe.png deleted file mode 100644 index 2c3d2eb1..00000000 Binary files a/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe.png and /dev/null differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe_tall.png b/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe_tall.png new file mode 100644 index 00000000..b07e5ca1 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/forge_recipe_tall.png differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/mob_loot_tall.png b/src/main/resources/assets/notenoughupdates/textures/gui/mob_loot_tall.png new file mode 100644 index 00000000..facd6d6c Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/mob_loot_tall.png differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/tab.png b/src/main/resources/assets/notenoughupdates/textures/gui/tab.png new file mode 100644 index 00000000..91d317ca Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/tab.png differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe.png b/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe.png deleted file mode 100644 index 42b6241c..00000000 Binary files a/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe.png and /dev/null differ diff --git a/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe_tall.png b/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe_tall.png new file mode 100644 index 00000000..ed982599 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/textures/gui/villager_recipe_tall.png differ diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index a566ee2e..6c95e480 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -3,14 +3,18 @@ "refmap": "mixins.notenoughupdates.refmap.json", "compatibilityLevel": "JAVA_8", "mixins": [ + "AccessorEntityAgeable", + "AccessorEntityArmorStand", "MixinAbstractClientPlayer", "MixinContainer", "MixinEffectRenderer", "MixinEntity", "MixinEntityAgeable", + "MixinEntityHorse", "MixinEntityPlayer", "MixinEntityPlayerSP", "MixinEntityRenderer", + "MixinEntitySkeleton", "MixinGuiChest", "MixinGuiContainer", "MixinGuiIngame", @@ -39,5 +43,8 @@ "MixinVboRenderList", "MixinWorld", "MixinWorldClient" + ], + "client": [ + "AccessorMinecraft" ] } -- cgit