lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tinkered with the beam a bit. Added WIP models for the routing nodes. Added basic item routing node.

Browse source
This commit is contained in:
WayofTime 2016-01-15 21:53:55 -05:00
parent 08e8ebf724
commit 76dceb3534
11 changed files with 283 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/main/resources/assets/bloodmagic/blockstates/BlockInputRoutingNode.json
View file

@ -1,7 +1,45 @@
{
"variants": {
"normal": { "model": "bloodmagic:BlockInputRoutingNode" }
}
"forge_marker": 1,
"defaults": {
"model": "bloodmagic:routing/OutputRoutingNodeCore",
"rotation": [
{
"y": 45
},
{
"x": 45
}
],
"textures": {
"core": "blocks/gold_block",
"attachment": "minecraft:blocks/stone"
},
"uvlock": true // This and all other properties of "defaults" will be inherited by simple submodels. They will NOT be inherited by named submodels.
},
"variants": {
"north": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase"}, // Simple submodel declaration. You can also specify multiple submodels for a variant.
"false": {}
},
"south": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 180},
"false": {}
},
"east": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 90}, // Submodel will be rotated.
"false": {}
},
"west": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 270},
"false": {}
},
"down": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "x": 90},
"false": {}
},
"up": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "x": -90},
"false": {}
} // Must have this in here or the blockstates loader will not know of all the properties and values, and it will create the wrong vanilla state strings.
}
}

45
src/main/resources/assets/bloodmagic/blockstates/BlockItemRoutingNode.json Normal file
View file

@ -0,0 +1,45 @@
{
"forge_marker": 1,
"defaults": {
"model": "bloodmagic:routing/OutputRoutingNodeCore",
"rotation": [
{
"y": 45
},
{
"x": 45
}
],
"textures": {
"core": "blocks/cobblestone",
"attachment": "minecraft:blocks/stone"
},
"uvlock": true // This and all other properties of "defaults" will be inherited by simple submodels. They will NOT be inherited by named submodels.
},
"variants": {
"north": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase"}, // Simple submodel declaration. You can also specify multiple submodels for a variant.
"false": {}
},
"south": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 180},
"false": {}
},
"east": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 90}, // Submodel will be rotated.
"false": {}
},
"west": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "y": 270},
"false": {}
},
"down": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "x": 90},
"false": {}
},
"up": {
"true": {"submodel": "bloodmagic:routing/RoutingNodeBase", "x": -90},
"false": {}
} // Must have this in here or the blockstates loader will not know of all the properties and values, and it will create the wrong vanilla state strings.
}
}

14
src/main/resources/assets/bloodmagic/models/item/BlockInputRoutingNode.json Normal file
View file

@ -0,0 +1,14 @@
{
"parent": "bloodmagic:block/routing/OutputRoutingNodeCore",
"textures": {
"core": "blocks/gold_block",
"attachment": "minecraft:blocks/stone"
},
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

15
src/main/resources/assets/bloodmagic/models/item/BlockItemRoutingNode.json Normal file
View file

@ -0,0 +1,15 @@
{
"parent": "bloodmagic:block/routing/OutputRoutingNodeCore",
"textures": {
"core": "blocks/cobblestone",
"attachment": "minecraft:blocks/stone"
},
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

2
src/main/resources/assets/bloodmagic/shaders/beam-broken.frag
View file

@ -6,5 +6,5 @@
vec4 color = texture2D(bgl_RenderedTexture, texcoord);
float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
gl_FragColor = vec4(color.r * gl_Color.r, color.g * gl_Color.g, max(color.b * gl_Color.b, r), color.a * gl_Color.a);
gl_FragColor = vec4(min(1 - r, color.r * gl_Color.r), min(1 - r, color.g * gl_Color.g), color.b * gl_Color.b, color.a * gl_Color.a);
}