From f2f2eedda86142a5c9b090f164c9a64d92e1ea66 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Sun, 26 Nov 2017 02:38:49 -0600 Subject: Added more materials, broke something in the tool table. --- .../resources/assets/tinkersdefense/materials/amber.json | 10 ++++++++++ .../assets/tinkersdefense/materials/amethyst.json | 10 ++++++++++ .../resources/assets/tinkersdefense/materials/cheese.json | 10 ++++++++++ .../assets/tinkersdefense/materials/citrine.json | 10 ++++++++++ .../assets/tinkersdefense/materials/diamond.json | 6 ++++++ .../assets/tinkersdefense/materials/emerald.json | 6 ++++++ .../assets/tinkersdefense/materials/enderpearl.json | 6 ++++++ .../resources/assets/tinkersdefense/materials/garnet.json | 10 ++++++++++ .../assets/tinkersdefense/materials/ghasttear.json | 9 +++++++++ .../resources/assets/tinkersdefense/materials/glass.json | 6 ++++++ .../assets/tinkersdefense/materials/glowstone.json | 6 ++++++ .../assets/tinkersdefense/materials/greencandy.json | 6 ++++++ .../resources/assets/tinkersdefense/materials/lapis.json | 6 ++++++ .../resources/assets/tinkersdefense/materials/opal.json | 6 ++++++ .../resources/assets/tinkersdefense/materials/quartz.json | 6 ++++++ .../assets/tinkersdefense/materials/redcandy.json | 6 ++++++ .../resources/assets/tinkersdefense/materials/ruby.json | 10 ++++++++++ .../assets/tinkersdefense/materials/sapphire.json | 10 ++++++++++ .../assets/tinkersdefense/materials/starruby.json | 10 ++++++++++ .../assets/tinkersdefense/materials/starsapphire.json | 10 ++++++++++ .../assets/tinkersdefense/materials/tanzanite.json | 10 ++++++++++ .../resources/assets/tinkersdefense/materials/topaz.json | 10 ++++++++++ .../assets/tinkersdefense/textures/items/_chainmail.png | Bin 0 -> 562 bytes .../assets/tinkersdefense/textures/items/_chainmaille.png | Bin 562 -> 0 bytes .../tinkersdefense/textures/items/armor/shoes/_broken.png | Bin 0 -> 230 bytes .../tinkersdefense/textures/materials/ender_pearl.png | Bin 0 -> 773 bytes .../tinkersdefense/textures/materials/facetedgem.png | Bin 0 -> 537 bytes .../tinkersdefense/textures/materials/greencandy.png | Bin 0 -> 171 bytes .../assets/tinkersdefense/textures/materials/opal.png | Bin 0 -> 798 bytes .../assets/tinkersdefense/textures/materials/redcandy.png | Bin 0 -> 170 bytes .../assets/tinkersdefense/textures/materials/stargem.png | Bin 0 -> 653 bytes .../assets/tinkersdefense/textures/materials/starruby.png | Bin 0 -> 739 bytes .../tinkersdefense/textures/materials/starsapphire.png | Bin 0 -> 742 bytes src/main/resources/mcmod.info | 8 ++++---- 34 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/tinkersdefense/materials/amber.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/amethyst.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/cheese.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/citrine.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/diamond.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/emerald.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/enderpearl.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/garnet.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/ghasttear.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/glass.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/glowstone.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/greencandy.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/lapis.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/opal.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/quartz.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/redcandy.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/ruby.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/sapphire.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/starruby.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/starsapphire.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/tanzanite.json create mode 100644 src/main/resources/assets/tinkersdefense/materials/topaz.json create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png delete mode 100644 src/main/resources/assets/tinkersdefense/textures/items/_chainmaille.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/opal.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/stargem.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/starruby.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/tinkersdefense/materials/amber.json b/src/main/resources/assets/tinkersdefense/materials/amber.json new file mode 100644 index 0000000..811dc05 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/amber.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/opal", + "color": "dba827", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/amethyst.json b/src/main/resources/assets/tinkersdefense/materials/amethyst.json new file mode 100644 index 0000000..b92d2c1 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/amethyst.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "b436e2", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/cheese.json b/src/main/resources/assets/tinkersdefense/materials/cheese.json new file mode 100644 index 0000000..9eaa178 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/cheese.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "minecraft:blocks/sponge", + "color": "ffff88", + "shinyness": 1.0, + "brightness": 0.0, + "hueshift": 0.0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/citrine.json b/src/main/resources/assets/tinkersdefense/materials/citrine.json new file mode 100644 index 0000000..ee6d378 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/citrine.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "ffe877", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/diamond.json b/src/main/resources/assets/tinkersdefense/materials/diamond.json new file mode 100644 index 0000000..59545d6 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/diamond.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "minecraft:blocks/diamond_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/emerald.json b/src/main/resources/assets/tinkersdefense/materials/emerald.json new file mode 100644 index 0000000..d72f1ea --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/emerald.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "minecraft:blocks/emerald_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/enderpearl.json b/src/main/resources/assets/tinkersdefense/materials/enderpearl.json new file mode 100644 index 0000000..bbc84ba --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/enderpearl.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "tinkersdefense:materials/ender_pearl" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/garnet.json b/src/main/resources/assets/tinkersdefense/materials/garnet.json new file mode 100644 index 0000000..142faca --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/garnet.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "9e1c1c", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/ghasttear.json b/src/main/resources/assets/tinkersdefense/materials/ghasttear.json new file mode 100644 index 0000000..c63d9f3 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/ghasttear.json @@ -0,0 +1,9 @@ +{ + "type": "metal", + "parameters": { + "color": "e8fbff", + "shinyness": 1, + "brightness": 1, + "hueshift": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/glass.json b/src/main/resources/assets/tinkersdefense/materials/glass.json new file mode 100644 index 0000000..21cc94a --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/glass.json @@ -0,0 +1,6 @@ +{ + "type": "alpha_color", + "parameters": { + "color": "ffffff" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/glowstone.json b/src/main/resources/assets/tinkersdefense/materials/glowstone.json new file mode 100644 index 0000000..9abfcda --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/glowstone.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "minecraft:blocks/glowstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/greencandy.json b/src/main/resources/assets/tinkersdefense/materials/greencandy.json new file mode 100644 index 0000000..5c3f699 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/greencandy.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "tinkersdefense:materials/greencandy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/lapis.json b/src/main/resources/assets/tinkersdefense/materials/lapis.json new file mode 100644 index 0000000..70a86d5 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/lapis.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "minecraft:blocks/lapis_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/opal.json b/src/main/resources/assets/tinkersdefense/materials/opal.json new file mode 100644 index 0000000..dbef40b --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/opal.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "tinkersdefense:materials/opal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/quartz.json b/src/main/resources/assets/tinkersdefense/materials/quartz.json new file mode 100644 index 0000000..817ad2c --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/quartz.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "minecraft:blocks/quartz_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/redcandy.json b/src/main/resources/assets/tinkersdefense/materials/redcandy.json new file mode 100644 index 0000000..8f71374 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/redcandy.json @@ -0,0 +1,6 @@ +{ + "type": "block", + "parameters": { + "texture": "tinkersdefense:materials/redcandy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/ruby.json b/src/main/resources/assets/tinkersdefense/materials/ruby.json new file mode 100644 index 0000000..90f6a4f --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/ruby.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "ff0061", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/sapphire.json b/src/main/resources/assets/tinkersdefense/materials/sapphire.json new file mode 100644 index 0000000..a4cf3ac --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/sapphire.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "6e00ff", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/starruby.json b/src/main/resources/assets/tinkersdefense/materials/starruby.json new file mode 100644 index 0000000..d83fdbc --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/starruby.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/stargem", + "color": "b00063", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/starsapphire.json b/src/main/resources/assets/tinkersdefense/materials/starsapphire.json new file mode 100644 index 0000000..1dd9441 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/starsapphire.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/stargem", + "color": "7a629e", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/tanzanite.json b/src/main/resources/assets/tinkersdefense/materials/tanzanite.json new file mode 100644 index 0000000..d7679d3 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/tanzanite.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "8860e5", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/materials/topaz.json b/src/main/resources/assets/tinkersdefense/materials/topaz.json new file mode 100644 index 0000000..8f474d3 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/materials/topaz.json @@ -0,0 +1,10 @@ +{ + "type": "metal_textured", + "parameters": { + "texture": "tinkersdefense:materials/facetedgem", + "color": "ffc551", + "shinyness": 0.6, + "brightness": 0.4, + "hueshift": 0.1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png b/src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png new file mode 100644 index 0000000..403e542 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_chainmaille.png b/src/main/resources/assets/tinkersdefense/textures/items/_chainmaille.png deleted file mode 100644 index 403e542..0000000 Binary files a/src/main/resources/assets/tinkersdefense/textures/items/_chainmaille.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png new file mode 100644 index 0000000..9df5a27 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png b/src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png new file mode 100644 index 0000000..b88747b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png b/src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png new file mode 100644 index 0000000..2935594 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png b/src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png new file mode 100644 index 0000000..450e2e8 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/opal.png b/src/main/resources/assets/tinkersdefense/textures/materials/opal.png new file mode 100644 index 0000000..1f71770 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/opal.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png b/src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png new file mode 100644 index 0000000..7b2a24c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/stargem.png b/src/main/resources/assets/tinkersdefense/textures/materials/stargem.png new file mode 100644 index 0000000..f98e536 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/stargem.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/starruby.png b/src/main/resources/assets/tinkersdefense/textures/materials/starruby.png new file mode 100644 index 0000000..ec8191b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/starruby.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png b/src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png new file mode 100644 index 0000000..9a924eb Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5b87739..b549b4d 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,12 +3,12 @@ "modid": "tinkersdefense", "name": "Tinkers' Defense", "description": "A defense related expansion for TConstruct", - "version": "1.4.1.0a", - "mcversion": "1.10.2", + "version": "1.4.2.1a", + "mcversion": "1.12.2", "url": "", "authorList": ["Sir Lance"], - "requiredMods": [ "Forge", "tconstruct","Baubles"], - "dependencies": ["tconstruct","Baubles"], + "requiredMods": [ "forge", "tconstruct","baubles"], + "dependencies": ["tconstruct","baubles"], "useDependencyInformation": "true" } ] -- cgit v1.2.3