From e00ce5f633fca0bfb8f81d8550e4eb3f4ed99fb5 Mon Sep 17 00:00:00 2001 From: Cleric_red Date: Fri, 19 Jul 2024 21:24:19 -0400 Subject: [PATCH] Prepping for Cinder 1.2.5 --- .gradle/8.2.1/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.2.1/fileHashes/fileHashes.lock | 2 +- .idea/compiler.xml | 25 ++- .idea/gradle.xml | 11 +- .idea/modules.xml | 3 + .idea/modules/CinderLoE.ideVirtualMain.iml | 13 ++ .idea/modules/CinderLoE.main.iml | 18 ++ .idea/modules/CinderLoE.test.iml | 13 ++ gradle.properties | 2 +- .../com/zivilon/cinder_loe/CinderLoE.java | 190 +++++++++++++++++- .../com/zivilon/cinder_loe/Materials.java | 5 + .../client/model/ModelBodyJade.java | 101 ++++++++++ .../client/model/ModelBodySerpent.java | 90 +++++++++ .../client/model/ModelBreeKettleHelmet.java | 19 +- .../client/model/ModelBrokenHalo.java | 50 +++++ .../client/model/ModelJadeHelmet.java | 128 ++++++++++++ .../client/model/ModelLegsJade.java | 89 ++++++++ .../client/model/ModelRhudaurHelmet.java | 93 +++++++++ .../client/model/ModelUsurperHelmet.java | 78 +++++++ .../client/model/ModelWarlordHelmet.java | 90 +++++++++ .../coremod/LOTRMaterialTransformer.java | 5 + .../zivilon/cinder_loe/items/BrokenHalo.java | 13 ++ .../mixins/MixinLOTRArmorModels.java | 11 +- .../java/com/zivilon/cinder_loe/recipes.java | 30 ++- .../assets/lotr/armor/bree_helmet.png | Bin 3974 -> 7033 bytes .../assets/lotr/armor/event_helmet.png | Bin 0 -> 6478 bytes .../resources/assets/lotr/armor/jade_1.png | Bin 0 -> 5769 bytes .../assets/lotr/armor/jade_chestplate.png | Bin 0 -> 9385 bytes .../assets/lotr/armor/jade_helmet.png | Bin 0 -> 8642 bytes .../assets/lotr/armor/jade_leggings.png | Bin 0 -> 6808 bytes .../assets/lotr/armor/red_dwarf_helmet.png | Bin 9694 -> 7597 bytes .../resources/assets/lotr/armor/rhudaur_1.png | Bin 0 -> 7182 bytes .../resources/assets/lotr/armor/rhudaur_2.png | Bin 0 -> 5886 bytes .../assets/lotr/armor/rhudaur_helmet.png | Bin 0 -> 7670 bytes .../resources/assets/lotr/armor/serpent_1.png | Bin 0 -> 7836 bytes .../resources/assets/lotr/armor/serpent_2.png | Bin 0 -> 6013 bytes .../assets/lotr/armor/serpent_chestplate.png | Bin 0 -> 7573 bytes .../resources/assets/lotr/armor/usurper_1.png | Bin 0 -> 8243 bytes .../resources/assets/lotr/armor/usurper_2.png | Bin 0 -> 6053 bytes .../assets/lotr/armor/usurper_helmet.png | Bin 0 -> 12173 bytes .../resources/assets/lotr/armor/warlord_1.png | Bin 0 -> 10278 bytes .../resources/assets/lotr/armor/warlord_2.png | Bin 0 -> 5541 bytes .../assets/lotr/armor/warlord_helmet.png | Bin 0 -> 9085 bytes .../lotr/textures/blocks/cinder_block.png | Bin 7133 -> 7646 bytes .../textures/blocks/cinder_block.png.mcmeta | 3 + .../textures/blocks/display_sword_rusted.png | Bin 0 -> 5810 bytes .../lotr/textures/blocks/fishbarrel_side.png | Bin 5788 -> 6320 bytes .../textures/blocks/gatecharredportcullis.png | Bin 0 -> 6555 bytes .../lotr/textures/items/banner_blue.png | Bin 0 -> 5039 bytes .../lotr/textures/items/banner_green.png | Bin 0 -> 5049 bytes .../assets/lotr/textures/items/banner_red.png | Bin 0 -> 5044 bytes .../assets/lotr/textures/items/bodyJade.png | Bin 0 -> 5821 bytes .../lotr/textures/items/bodyRhudaur.png | Bin 0 -> 5691 bytes .../lotr/textures/items/bodyUsurper.png | Bin 0 -> 5491 bytes .../lotr/textures/items/bodyWarlord.png | Bin 0 -> 5923 bytes .../lotr/textures/items/bodyserpent.png | Bin 0 -> 5349 bytes .../assets/lotr/textures/items/bootsJade.png | Bin 0 -> 5218 bytes .../lotr/textures/items/bootsRhudaur.png | Bin 0 -> 5538 bytes .../lotr/textures/items/bootsUsurper.png | Bin 0 -> 5183 bytes .../lotr/textures/items/bootsWarlord.png | Bin 0 -> 5428 bytes .../lotr/textures/items/bootsserpent.png | Bin 0 -> 5262 bytes .../lotr/textures/items/chocolatebar.png | Bin 0 -> 779 bytes .../assets/lotr/textures/items/dough.png | Bin 0 -> 716 bytes .../assets/lotr/textures/items/flour.png | Bin 0 -> 4409 bytes .../assets/lotr/textures/items/fruitsalad.png | Bin 0 -> 4508 bytes .../assets/lotr/textures/items/halva.png | Bin 0 -> 995 bytes .../assets/lotr/textures/items/helmetJade.png | Bin 0 -> 5553 bytes .../lotr/textures/items/helmetRhudaur.png | Bin 0 -> 5398 bytes .../lotr/textures/items/helmetUsurper.png | Bin 0 -> 5960 bytes .../lotr/textures/items/helmetWarlord.png | Bin 0 -> 5605 bytes .../lotr/textures/items/helmetbrokenhalo.png | Bin 0 -> 763 bytes .../lotr/textures/items/helmetserpent.png | Bin 0 -> 5002 bytes .../assets/lotr/textures/items/honey.png | Bin 0 -> 852 bytes .../assets/lotr/textures/items/legsJade.png | Bin 0 -> 5593 bytes .../lotr/textures/items/legsRhudaur.png | Bin 0 -> 5423 bytes .../lotr/textures/items/legsUsurper.png | Bin 0 -> 5333 bytes .../lotr/textures/items/legsWarlord.png | Bin 0 -> 5454 bytes .../lotr/textures/items/legsserpent.png | Bin 0 -> 5291 bytes .../assets/lotr/textures/items/pasta.png | Bin 0 -> 890 bytes .../assets/lotr/textures/items/pretzel.png | Bin 0 -> 899 bytes 80 files changed, 1043 insertions(+), 39 deletions(-) create mode 100644 .idea/modules/CinderLoE.ideVirtualMain.iml create mode 100644 .idea/modules/CinderLoE.main.iml create mode 100644 .idea/modules/CinderLoE.test.iml create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelBodyJade.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelBodySerpent.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelBrokenHalo.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelJadeHelmet.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelLegsJade.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelRhudaurHelmet.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelUsurperHelmet.java create mode 100644 src/main/java/com/zivilon/cinder_loe/client/model/ModelWarlordHelmet.java create mode 100644 src/main/java/com/zivilon/cinder_loe/items/BrokenHalo.java create mode 100644 src/main/resources/assets/lotr/armor/event_helmet.png create mode 100644 src/main/resources/assets/lotr/armor/jade_1.png create mode 100644 src/main/resources/assets/lotr/armor/jade_chestplate.png create mode 100644 src/main/resources/assets/lotr/armor/jade_helmet.png create mode 100644 src/main/resources/assets/lotr/armor/jade_leggings.png create mode 100644 src/main/resources/assets/lotr/armor/rhudaur_1.png create mode 100644 src/main/resources/assets/lotr/armor/rhudaur_2.png create mode 100644 src/main/resources/assets/lotr/armor/rhudaur_helmet.png create mode 100644 src/main/resources/assets/lotr/armor/serpent_1.png create mode 100644 src/main/resources/assets/lotr/armor/serpent_2.png create mode 100644 src/main/resources/assets/lotr/armor/serpent_chestplate.png create mode 100644 src/main/resources/assets/lotr/armor/usurper_1.png create mode 100644 src/main/resources/assets/lotr/armor/usurper_2.png create mode 100644 src/main/resources/assets/lotr/armor/usurper_helmet.png create mode 100644 src/main/resources/assets/lotr/armor/warlord_1.png create mode 100644 src/main/resources/assets/lotr/armor/warlord_2.png create mode 100644 src/main/resources/assets/lotr/armor/warlord_helmet.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/cinder_block.png.mcmeta create mode 100644 src/main/resources/assets/lotr/textures/blocks/display_sword_rusted.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/gatecharredportcullis.png create mode 100644 src/main/resources/assets/lotr/textures/items/banner_blue.png create mode 100644 src/main/resources/assets/lotr/textures/items/banner_green.png create mode 100644 src/main/resources/assets/lotr/textures/items/banner_red.png create mode 100644 src/main/resources/assets/lotr/textures/items/bodyJade.png create mode 100644 src/main/resources/assets/lotr/textures/items/bodyRhudaur.png create mode 100644 src/main/resources/assets/lotr/textures/items/bodyUsurper.png create mode 100644 src/main/resources/assets/lotr/textures/items/bodyWarlord.png create mode 100644 src/main/resources/assets/lotr/textures/items/bodyserpent.png create mode 100644 src/main/resources/assets/lotr/textures/items/bootsJade.png create mode 100644 src/main/resources/assets/lotr/textures/items/bootsRhudaur.png create mode 100644 src/main/resources/assets/lotr/textures/items/bootsUsurper.png create mode 100644 src/main/resources/assets/lotr/textures/items/bootsWarlord.png create mode 100644 src/main/resources/assets/lotr/textures/items/bootsserpent.png create mode 100644 src/main/resources/assets/lotr/textures/items/chocolatebar.png create mode 100644 src/main/resources/assets/lotr/textures/items/dough.png create mode 100644 src/main/resources/assets/lotr/textures/items/flour.png create mode 100644 src/main/resources/assets/lotr/textures/items/fruitsalad.png create mode 100644 src/main/resources/assets/lotr/textures/items/halva.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetJade.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetRhudaur.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetUsurper.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetWarlord.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetbrokenhalo.png create mode 100644 src/main/resources/assets/lotr/textures/items/helmetserpent.png create mode 100644 src/main/resources/assets/lotr/textures/items/honey.png create mode 100644 src/main/resources/assets/lotr/textures/items/legsJade.png create mode 100644 src/main/resources/assets/lotr/textures/items/legsRhudaur.png create mode 100644 src/main/resources/assets/lotr/textures/items/legsUsurper.png create mode 100644 src/main/resources/assets/lotr/textures/items/legsWarlord.png create mode 100644 src/main/resources/assets/lotr/textures/items/legsserpent.png create mode 100644 src/main/resources/assets/lotr/textures/items/pasta.png create mode 100644 src/main/resources/assets/lotr/textures/items/pretzel.png diff --git a/.gradle/8.2.1/checksums/checksums.lock b/.gradle/8.2.1/checksums/checksums.lock index 62b96453b767b08b5d9eb4d956dcee5371ac552d..9df0bea7f3f1654b229d9272d59dc703d808a332 100644 GIT binary patch literal 17 VcmZQRdH + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1b56c82..4a0d349 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,16 +5,7 @@