Skip to content

Commit 5193b83

Browse files
committed
Fix conflict
2 parents 2027242 + 736cb53 commit 5193b83

File tree

96 files changed

+3161
-896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3161
-896
lines changed

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,50 @@
22

33
Blockbuster's change log
44

5+
## Version 1.1
6+
7+
Second version of Blockbuster mod. This release removes the "Name Tag" mechanism
8+
(redundant running here and there with intention to register/give recording name
9+
to the actor/director map block) and substituted this with _nice looking_ GUIs.
10+
11+
Basically, this release mostly focuses on enhancing GUI and the look of the mod.
12+
13+
**Tutorial video** for 1.1:
14+
Coming soon
15+
16+
* Update to Minecraft 1.9.4 and Forge 12.17.0.1976 (thanks to [Lightwave](http://www.minecraftforge.net/forum/index.php?action=profile;u=36902))
17+
* Added GUIs for director and director map blocks
18+
* Added HUD overlay while player recording (red circle with caption in top-left
19+
corner of the screen)
20+
* Added arm pose while holding a bow
21+
* Added `stop-director` command which allows you to stop playback of director at
22+
specified position
23+
* Renamed _skin manager device_ to _actor manager device_
24+
* Changed actor behavior regarding name of the recording, now file name of the
25+
recording is not depends on the actor's name tag, but stored in separate
26+
field in actor's class. Use _actor configuration device_ to change to which
27+
file actor is being recorded (see Recording ID field)
28+
* Changed (improved) camera and actor configuration GUIs
29+
* Changed camera's model and texture
30+
* Fixed place block action, now actors can place any block (before, they couldn't place redstone wire)
31+
* Fixed crash on dedicated server
32+
* Removed "Name Tag" mechanism
33+
* Reduced the amount of console messages
34+
* Recording format was broken, so old recordings won't work
35+
36+
P.S.: where "_nice looking_ GUIs" is a subjective statement
37+
538
## Version 1.0
639

740
First version of Blockbuster mod. This release provides really basic features
841
that allows to capture simple Minecraft machinimas and cinematics for
942
adventure maps.
1043

44+
**Tutorial video** for 1.0:
45+
<a href="https://www.youtube.com/watch?v=LPJb49VUUqk">
46+
<img src="https://img.youtube.com/vi/LPJb49VUUqk/0.jpg">
47+
</a>
48+
1149
* Supports Minecraft 1.9.0 and Forge 12.6.1.1907
1250
* Added director and director map blocks
1351
* Added skin manager, camera, camera configuration, register, and playback button items

IDEAS.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Ideas for next Blockbuster versions
22

3-
There's some ideas that I might implement in next Blockbuster mod:
3+
There's some ideas that I want to implement in next Blockbuster mod:
44

55
* Record cameras (basic movement and jumps between cameras), so you wouldn't need
66
to follow the actors by yourself every time
77
* Advanced cameras configuration
88
* Setting custom path
99
* Setting look target (always align towards target)
10-
* In-game subtitles during playback (like printing letter by letter "Washington D.C., USA" captions in movies)
1110
* Add more of recording stuff like:
1211
* Use and throw potions
13-
* Set shit on file with flint and steel
12+
* Set shit on fire with flint and steel
1413
* Kick asses with diamond sword/axe
1514
* Use put stuff in chests
1615
* Use furnances
@@ -24,7 +23,11 @@ There's some ideas that I might implement in next Blockbuster mod:
2423
5, run like a pussy, and jump into lava. Something like that.
2524
* Area redstone sensor (to avoid using pressure plates)
2625
* Make commands accept spaced strings (this one is simple)
27-
* Create GUI for managing actors in director blocks (more GUIs!)
2826
* Support of multi-player world skins
2927
* Rewrite recording code (pixel -> vector, I'll get what I mean)
3028
* Custom actor models (not only player-like, but also custom one)
29+
* If you gonna do it, also supply minecraft vanilla mobs with skins and
30+
create a tool to create those models (that's to me)
31+
* Also add the ability to morph player into this entity
32+
* Custom actor actions (like dancing, waving with hands like crazy person, or making a blow kiss)
33+
* Animating actor skins (basically to create illusion of lip syncing or eyes blinking)

LICENSE.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# License
2+
3+
This project uses portion of code (`noname.blockbuster.recording` package)
4+
from [Mocap mod](https://github.com/EchebKeso/Mocap)
5+
[licensed](https://github.com/EchebKeso/Mocap/blob/master/licence.md) under GPL.
6+
7+
8+
The MIT License (MIT)
9+
10+
Copyright (c) 2016 McHorse
11+
12+
Permission is hereby granted, free of charge, to any person obtaining a copy
13+
of this software and associated documentation files (the "Software"), to deal
14+
in the Software without restriction, including without limitation the rights
15+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
16+
copies of the Software, and to permit persons to whom the Software is furnished
17+
to do so, subject to the following conditions:
18+
19+
The above copyright notice and this permission notice shall be included in
20+
all copies or substantial portions of the Software.
21+
22+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
25+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
26+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
27+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
28+
DEALINGS IN THE SOFTWARE.

MANUAL.md

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
# Manual
2+
3+
For version 1.1.
4+
5+
## Player's recording
6+
7+
Player's actions can be recorded via `record` command or by interacting (right
8+
clicking the) with actors.
9+
10+
Following actions are fully supported by this mod:
11+
12+
* Basic walking, jumping, looking, sprinting, swinging with left hand, and
13+
sneaking
14+
* Interacting with blocks (opening doors/gates, pushing buttons, toggling
15+
levers)
16+
* Placing/breaking blocks
17+
* Holding items in both arms
18+
* Equipping armor
19+
* Send (formatted messages) in chat (use `[` instead of `§` for formatting)
20+
* Mounting entities
21+
* Shoot arrow
22+
* Flying elytra
23+
24+
Recorded actions are stored in the `blockbuster/records` folder in world's save
25+
folder.
26+
27+
Recorded player actions can be played either by `play` command or by an actor
28+
entity tied to director block.
29+
30+
See Commands section for more reference about the commands.
31+
32+
**Side note**: this mod records only player's actions, not his visual look, so
33+
recording yourself with morphing mods, or mods that modify your player model
34+
won't affect the playbacked actors (actors will not look like a chicken or will
35+
not have hat or cape).
36+
37+
## Director block
38+
39+
*Director block* is a special block, that comes with this mod, which is
40+
responsible for managing scene (like real life director). Its purpose is to tie
41+
together actors and cameras.
42+
43+
With the power of *director block* you can playback all registered actors
44+
together without having to setup big contraptions from redstone and command
45+
blocks.
46+
47+
To register an actor or a camera to *director block*, you should use *register
48+
item*. Right click on actor or camera first, to take a sample of entity's UUID
49+
onto *register item*, and then right click *register item* on *director block*.
50+
If you have succesfully registered the entity (actor or camera), you'll get
51+
message in the chat that entity was succesfully registered.
52+
53+
When you'll register your actors and cameras, you'll be able to use full
54+
potential of this mod. Already recorded actors will be played when you'll start
55+
recording another actor, and cameras will disappear when *director block* starts
56+
playing and will appear again when *director block* will stop playing.
57+
58+
When the camera is registered to your *director block*, you can switch between
59+
cameras using `[` and `]` keys (`[` is for previous, and `]` is for next
60+
camera). The order in which you'll be switched around, is depends on the order
61+
in which you registered the cameras, you can name all your cameras from "Camera
62+
1" to "Camera N" and see the order of your cameras by right clicking *director
63+
block*.
64+
65+
To playback the scene, you need to attach a *playback button* to *director
66+
block*. Simply right click *director block* while holding *playback button* in
67+
your hand, and use the *playback button* (right click while holding *playback*
68+
item), to playback the scene.
69+
70+
You can manage director block's cast by right clicking the director block, the
71+
GUI will pop up. You'll see a scroll list with entries of registered entities,
72+
their name, icon (which signify either that's an actor or a camera) and two
73+
buttons for managing the entity (edit or remove). In previous version you would
74+
have to break the block to reset the scene.
75+
76+
By the way, all of these items are available in creative "Blockbuster" tab.
77+
78+
### Director map block
79+
80+
*Director map block* is another variation of *director block* designed for
81+
adventure maps (cinematics FTW). It's just like *director block*, but functions
82+
more as `play` command.
83+
84+
To register replay with *director map block* you need to open up *director map
85+
block*'s GUI (right click the block). Then input your new actor's recording id
86+
(file name from which actor would be played), and press "Add" button, after that
87+
a new entry will appear in the scroll box below "Add" button.
88+
89+
You can edit following actor's properties: name tag, recording id, skin and
90+
invincibility.
91+
92+
When you'll register your actors, you can playback this block with playback
93+
button (just as with regular *director block*). Redstone hooks are also
94+
supported by *director map* block.
95+
96+
Note: *director map block* doesn't support cameras, yet. That would be cool,
97+
though.
98+
99+
### Redstone Hooks
100+
101+
When *director block* starts playing the scene, it emits redstone signal on the
102+
west side of the block (the side of the block where a play white triangle is
103+
drawn). When *director block* stops playing the scene, it emits redstone signal
104+
on the east side of the block (the side of the block where a stop white square
105+
is drawn).
106+
107+
This can be useful for reseting the scene. You might want to explode a TNT while
108+
recording your scene, so to avoid tedious rebuilding, you can use stop hook
109+
(when block stops playing) and attach redstone with command block that resets
110+
the scene (using `/clone` command, for example).
111+
112+
Or maybe you want start playing a tune, or summon some zombies when the director
113+
starts playing, no worries, use the redstone play hook.
114+
115+
## Actors
116+
117+
Actors are the entities that you are used to playback your actions. Actors, by
118+
default, look like crash test dummies, but you may change their skin using the
119+
*actor configuration* item. First you'll have to put some skins into
120+
`minecraft/config/blockbuster/skins` folder, and then you can select a skin from
121+
this folder using GUI. In this GUI you can also change other properties such as
122+
name, recording file name, skin and invincibility.
123+
124+
To record the actor, you must attach it first to *director block*, and simply
125+
right click it, and start performing some sick movements. When you'll be done,
126+
you need to stop the recording either by right clicking actor again or entering
127+
`record` command with his name (actually, you can use any name for file, as long
128+
as you providing the first argument).
129+
130+
For adventure maps makers: you can put skins into world's save folder
131+
`blockbuster/skins` to transfer the skins with the map, but they won't work in
132+
multiplayer.
133+
134+
Player records are saved in `blockbuster/records` folder in world's save folder.
135+
136+
Note: Blockbuster mod supports only 64x32 textured skins, for now.
137+
138+
## Cameras
139+
140+
Cameras are special rideable entities which is used as cameras. They're not
141+
acturally recording the scene, they're just giving you ability to traverse the
142+
space more freely.
143+
144+
Camera is a flying rideable entity with some configuration properties. With the
145+
help of *camera configuration* item, you can change camera's characteristic,
146+
such as: speed, maximum acceleration, acceleration rate, and direction of
147+
movement (any direction, or only horizontal).
148+
149+
If the camera is attached to the *director block*, then you can jump between
150+
cameras using "[" and "]" keys, you can rebind those keys in the Settings ->
151+
Controls menu.
152+
153+
Also, if the camera is attached to the *director block*, during scene's
154+
playback, all attached cameras to current scene will be hidden, and will appear
155+
as soon as *director block* will stop playing the scene.
156+
157+
## Commands
158+
159+
This mod provides two commands:
160+
161+
1. `record` command which records player's actions to file name provided
162+
specified in first argument, and stops the recording (run `record` again)
163+
2. `play` command which playbacks player's actions from a file specified with
164+
actor's custom tag name and skin, 2nd through 4th are optional arguments
165+
invulnerability, if it's 1, actor is invulnerable, if it's 0, actor is
166+
vulnurable
167+
3. `play-director` command which triggers playback of director block located on
168+
specified position
169+
4. `stop-director` command which stops playback of director block located on
170+
specified position
171+
172+
Examples:
173+
174+
# Record player's actions to file named "football"
175+
/record football
176+
177+
# To stop the recording
178+
/record footbal
179+
180+
# Play football recording with actor's custom tag name "DavidBeckham" and
181+
# skin "DavidBeckhamsSkin"
182+
/play football DavidBeckham DavidBeckhamsSkin
183+
184+
# Play football recording with actor's custom tag name "DavidBeckham" and
185+
# skin "DavidBeckhamsSkin" and make actor invulnerable
186+
/play football DavidBeckham DavidBeckhamsSkin 1
187+
188+
# Play director block that is located on X: 19, Y: 4, Z:-100
189+
/play-director 19 4 -100
190+
191+
# Stop director block that is located on X: 19, Y: 4, Z:-100
192+
/stop-director 19 4 -100
193+
194+
Note: all arguments (file name, actor's custom tag name, and actor's skin) can't
195+
have spaces. That's due to the fact how minecraft's command handler parses
196+
arguments.

0 commit comments

Comments
 (0)