From 9eb3097b5aca043a380fe826f652dd789b20bb78 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Sun, 29 Nov 2015 19:33:17 -0500 Subject: [PATCH] Added assets --- .gitignore | 1 + .../blockstates/BlockBloodLight.json | 10 ++++++++ .../bloodmagic/blockstates/BlockCrystal.json | 22 ++++++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 11 +++++++++ .../models/block/BlockBloodLight.json | 15 ++++++++++++ .../models/block/BlockCrystal0.json | 6 +++++ .../models/block/BlockCrystal1.json | 6 +++++ .../models/item/BlockBloodLight.json | 10 ++++++++ .../bloodmagic/models/item/BlockCrystal0.json | 10 ++++++++ .../bloodmagic/models/item/BlockCrystal1.json | 10 ++++++++ .../models/item/ItemAltarMaker.json | 6 +++++ .../textures/blocks/BlockBloodLight.png | Bin 220 -> 466 bytes .../bloodmagic/textures/items/AltarMaker.png | Bin 0 -> 452 bytes 13 files changed, 107 insertions(+) create mode 100644 src/main/resources/assets/bloodmagic/blockstates/BlockBloodLight.json create mode 100644 src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodLight.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodLight.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json create mode 100644 src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png diff --git a/.gitignore b/.gitignore index 3facbeb5..85e34f08 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ options.txt BloodMagic_Client.launch BloodMagic_Server.launch +usercache.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodLight.json b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodLight.json new file mode 100644 index 00000000..c67139da --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodLight.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": { + "model": "bloodmagic:BlockBloodLight", + "textures": { + "all": "bloodmagic:blocks/BlockBloodLight" + } + } + } +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json b/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json new file mode 100644 index 00000000..2119d373 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { }, + "model": "cube_all", + "uvlock": true + }, + "variants": { + "type": { + "normal": { + "textures": { + "all": "bloodmagic:blocks/ShardCluster" + } + }, + "brick": { + "textures": { + "all": "bloodmagic:blocks/ShardClusterBrick" + } + } + } + } +} diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 23d24751..3d573bf5 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -66,6 +66,8 @@ item.BloodMagic.sigil.water.name=Water Sigil item.BloodMagic.sigil.lava.name=Lava Sigil item.BloodMagic.sigil.void.name=Void Sigil +item.BloodMagic.altarMaker.name=Altar Maker + # Blocks tile.BloodMagic.fluid.lifeEssence.name=Life Essence @@ -94,11 +96,15 @@ tile.BloodMagic.ritualStone.dawn.name=Ritual Stone of Dawn tile.BloodMagic.bloodstonebrick.normal.name=Bloodstone Brick tile.BloodMagic.bloodstonebrick.large.name=Large Bloodstone Brick +tile.BloodMagic.crystal.normal.name=Crystal Cluster +tile.BloodMagic.crystal.brick.name=Crystal Cluster Brick +tile.BloodMagic.bloodLight.name=Blood Light # Tooltips tooltip.BloodMagic.orb.desc=Stores raw Life Essence tooltip.BloodMagic.orb.owner=Added by: %s tooltip.BloodMagic.currentOwner=Owner: %s +tooltip.BloodMagic.currentTier=Current tier: tooltip.BloodMagic.sigil.air.desc=&oI feel lighter already... tooltip.BloodMagic.sigil.bloodLight.desc=&oI see a light! @@ -119,6 +125,11 @@ tooltip.BloodMagic.activationCrystal.weak=Activates low-level rituals tooltip.BloodMagic.activationCrystal.awakened=Activates more powerful rituals tooltip.BloodMagic.activationCrystal.creative=Creative Only - Activates any ritual +# Miscs +misc.altarMaker.setTier=Set Tier to: %d +misc.altarMaker.building=Building a: Tier %d Altar +misc.altarMaker.destroy=Destroyed a: Tier %d Altar + # JustEnoughItems jei.BloodMagic.recipe.altar=Blood Altar jei.BloodMagic.recipe.requiredLP=LP: %d diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodLight.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodLight.json new file mode 100644 index 00000000..5a2673b2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodLight.json @@ -0,0 +1,15 @@ +{ + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 0, 0, 0 ], + "faces": { + "down": { "texture": "#down", "cullface": "down" }, + "up": { "texture": "#up", "cullface": "up" }, + "north": { "texture": "#north", "cullface": "north" }, + "south": { "texture": "#south", "cullface": "south" }, + "west": { "texture": "#west", "cullface": "west" }, + "east": { "texture": "#east", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json new file mode 100644 index 00000000..6e7787eb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/ShardCluster" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json new file mode 100644 index 00000000..ad9dce6c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/ShardClusterBrick" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodLight.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodLight.json new file mode 100644 index 00000000..68fd1bc5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodLight.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodLight", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json new file mode 100644 index 00000000..b5780718 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockCrystal0", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json new file mode 100644 index 00000000..c111c164 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockCrystal1", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json b/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json new file mode 100644 index 00000000..a97bee66 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemAltarMaker.json @@ -0,0 +1,6 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/AltarMaker" + } +} diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/BlockBloodLight.png b/src/main/resources/assets/bloodmagic/textures/blocks/BlockBloodLight.png index 67bede34b0014ac5964d4adb386140460a1d1485..cb77176b549b82adfbc3aaa433ce595707c8f924 100644 GIT binary patch delta 394 zcmV;50d@Y|0n!7IDlz{6{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2j2@F10*q6Z{^I9TPuG7Hc3Q5R5;6xlRZuYK@5ezh0P|Kguj3kQBl!w3nZ?;b#$qO31h_X)JJk}Kc?cn4ktp7|0Di!$!maU@L{Ccu+) oV*}GcWq!_f##^s3mF;K!1&x_>vD!EV#sB~S07*qoM6N<$f(wGGs{jB1 delta 146 zcmcb_e1~y@mZ2sCJA;d3PAVG%0|RG)M`SSr1Gg{;GcwGYBLNg-FY)wsWxvPB$|o%P z;!_*n#Axj>1_w_U#}JFt$!n5Nrz~LEU;qSb()RdHdv@XfDjpvmk)}Xq4hex@@lzGQ v?AOYTJ<#MoX~q{rsopDHtWJf!{0s~ccez-(%qn&OEnx6;^>bP0l+XkK+^a3o diff --git a/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png b/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png new file mode 100644 index 0000000000000000000000000000000000000000..431492cccf672520fb3b204a347040d5b7a43b06 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~x2!0uNPGP6RX`!x%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq_xO)5S5w;`G(Yj($vz0#3H}&t`|z$kls%EaW>E*}T^Z{NgVt*WX`sc4Hz( zqlxeL_a?raigUyhjb?7RnNzYcqNC%%oW&Ykx880$R;aT#?mfG`mB@x`o8s0R9(!@M zq$}|0-uw11AB3~K-@DH)E@+x+{$0JJ2@WEzHnufk`@ilukYREt%G;%0 zHGUeWZJ(#GJeOI0wQKGE1J(Uor-iL