From a1fa5a67caebf754a0fcc43168672823ede0db93 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 4 Jun 2021 01:18:28 +0800 Subject: merge is pain --- .../assets/notenoughupdates/capes/furf.png | Bin 12443 -> 15699 bytes .../assets/notenoughupdates/collectionlog.png | Bin 0 -> 12083 bytes .../assets/notenoughupdates/custom_enchant_gui.png | Bin 0 -> 5086 bytes src/main/resources/mixins.notenoughupdates.json | 50 ++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/notenoughupdates/collectionlog.png create mode 100644 src/main/resources/assets/notenoughupdates/custom_enchant_gui.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/notenoughupdates/capes/furf.png b/src/main/resources/assets/notenoughupdates/capes/furf.png index d7d5a99f..ce9f4c19 100644 Binary files a/src/main/resources/assets/notenoughupdates/capes/furf.png and b/src/main/resources/assets/notenoughupdates/capes/furf.png differ diff --git a/src/main/resources/assets/notenoughupdates/collectionlog.png b/src/main/resources/assets/notenoughupdates/collectionlog.png new file mode 100644 index 00000000..c30a0b8f Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/collectionlog.png differ diff --git a/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png new file mode 100644 index 00000000..1ad77d97 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/custom_enchant_gui.png differ diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index 4c0261bb..0d415976 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -3,39 +3,39 @@ "refmap": "mixins.notenoughupdates.refmap.json", "compatibilityLevel": "JAVA_8", "mixins": [ - "MixinItemStack", - "MixinInventoryEffectRenderer", - "MixinGuiIngame", - "MixinRenderItem", + "MixinAbstractClientPlayer", + "MixinContainer", + "MixinEffectRenderer", + "MixinEntityPlayer", + "MixinEntityPlayerSP", "MixinEntityRenderer", - "MixinRenderGlobal", - "MixinNetHandlerPlayClient", "MixinGuiChest", "MixinGuiContainer", - "MixinVboRenderList", - "MixinRenderList", - "MixinEntityPlayer", - "MixinTileEntitySpecialRenderer", - "MixinRender", - "MixinRenderFish", - "MixinContainer", - "MixinWorld", - "MixinPlayerControllerMP", - "MixinEffectRenderer", - "MixinRendererLivingEntity", + "MixinGuiIngame", + "MixinGuiInventory", "MixinGuiScreen", - "MixinTileEntitySkullRenderer", + "MixinInventoryEffectRenderer", + "MixinInventoryPlayer", "MixinItemCameraTransforms", - "MixinGuiInventory", + "MixinItemRenderer", + "MixinItemStack", "MixinLayerArmorBase", - "MixinTextureManager", "MixinLayerCustomHead", - "MixinMouseHelper", - "MixinAbstractClientPlayer", - "MixinInventoryPlayer", - "MixinItemRenderer", - "MixinEntityPlayerSP", "MixinLoadingScreenRenderer", + "MixinMouseHelper", + "MixinNetHandlerPlayClient", + "MixinPlayerControllerMP", + "MixinRender", + "MixinRendererLivingEntity", + "MixinRenderFish", + "MixinRenderGlobal", + "MixinRenderItem", + "MixinRenderList", + "MixinTextureManager", + "MixinTileEntitySkullRenderer", + "MixinTileEntitySpecialRenderer", + "MixinVboRenderList", + "MixinWorld", "MixinWorldClient" ] } \ No newline at end of file -- cgit