Skip to content

Commit 7b6bed6

Browse files
committed
generateTOC has preliminary disabled code for evaluation by Walter. Would like to know if it's worth pursuing.
blocks.js has many significant updates. Note "breaking fix" of a "redston" item for "redstone". Existing apps will need to correct this if they use it.
1 parent e6c95ec commit 7b6bed6

2 files changed

Lines changed: 74 additions & 10 deletions

File tree

src/docs/js/generateTOC.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,34 @@ for (var i = 0; i < contents.length; i++){
4040
if (line.match(/^##\s+/)){
4141
var h2 = line.match(/^##\s+(.*)/)[1].trim();
4242
var link = createLink(h2);
43-
java.lang.System.out.println (' * [' + h2 + '](#' + link + ')');
43+
java.lang.System.out.println(' * [' + h2 + '](#' + link + ')');
4444
}
4545
if (line.match(/^###\s+/)){
4646
var h3 = line.match(/^###\s+(.*)/)[1].trim();
4747
var link = createLink(h3);
48-
java.lang.System.out.println (' * [' + h3 + '](#' + link + ')');
48+
java.lang.System.out.println(' * [' + h3 + '](#' + link + ')');
4949
}
5050
}
51+
52+
/**
53+
* // tg 20161022 Sort secondary topics, with some exceptions
54+
* // Still work in progress. Ignore
55+
* var sortedContents =[];
56+
* var sortedTemp = [];
57+
*
58+
* for (var i = 0; i < contents.length; i++) {
59+
* line = contents[i];
60+
* if(line.match(/^##\s+/)) {
61+
* if (sortedTemp.length > 0) {
62+
* sortedContents.push(sortedTemp.sort());
63+
* sortedContents.push(line);
64+
* } else {
65+
* if (line.match(/^###\s+/)) {
66+
* sortedTemp.push(line);
67+
* } else {
68+
* sortedContents.push(line);
69+
* }
70+
* }
71+
* }
72+
* contents = sortedContents;
73+
*/

src/main/js/modules/blocks.js

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ var blocks = {
2828
grass: 2,
2929
dirt: 3,
3030
cobblestone: 4,
31-
oak: 5, spruce: '5:1', birch: '5:2', jungle: '5:3',
32-
sapling: { oak: 6, spruce: '6:1', birch: '6:2', jungle: '6:3' },
31+
oak: 5, spruce: '5:1', birch: '5:2', jungle: '5:3', acacia: '5:4', dark_oak: '5:5',
32+
sapling: { oak: 6, spruce: '6:1', birch: '6:2', jungle: '6:3', acacia: '6:4', dark_oak: '6:5' },
3333
bedrock: 7,
3434
water: 8,
3535
water_still: 9,
@@ -43,11 +43,17 @@ var blocks = {
4343
wood: 17,
4444
leaves: 18,
4545
sponge: 19,
46+
sponge_wet: '19:1',
4647
glass: 20,
4748
lapis_lazuli_ore: 21,
4849
lapis_lazuli_block: 22,
4950
dispenser: 23,
5051
sandstone: 24,
52+
sandstone_chiseled: '24:1',
53+
sandstone_smooth: '24:2',
54+
sandstone_red: 179,
55+
sandstone_red_chiseled: '179:1',
56+
sandstone_red_smooth: '179:2',
5157
note: 25,
5258
bed: 26,
5359
powered_rail: 27,
@@ -70,17 +76,29 @@ var blocks = {
7076
double_slab: {
7177
stone: 43,
7278
sandstone: '43:1',
79+
sandstone_red: 181,,
80+
sandstone_red_smooth: '181:8',
7381
wooden: '43:2',
82+
wood: {
83+
oak: 125,
84+
spruce: '125:1',
85+
birch: '125:2',
86+
jungle: '125:3',
87+
acacia: '125:4',
88+
dark_oak: '125:5'
89+
},
7490
cobblestone: '43:3',
7591
brick: '43:4',
7692
stonebrick: '43:5',
7793
netherbrick:'43:6',
7894
quartz: '43:7',
7995
smooth_stone: '43:8',
8096
smooth_sandstone: '43:9',
81-
tile_quartz: '43:15'
97+
tile_quartz: '43:15',
98+
purpur: 204,
8299
},
83100
slab: {
101+
stone: '44:0',
84102
sandstone: '44:1',
85103
wooden: '44:2',
86104
cobblestone: '44:3',
@@ -91,6 +109,7 @@ var blocks = {
91109
upper: {
92110
stone: '44:8',
93111
sandstone: '44:9',
112+
sandstone_red: '182:8',
94113
wooden: '44:10',
95114
cobblestone: '44:11',
96115
brick: '44:12',
@@ -100,14 +119,20 @@ var blocks = {
100119
oak: '126:8',
101120
spruce: '126:9',
102121
birch: '126:10',
103-
jungle: '126:11'
122+
jungle: '126:11',
123+
acacia: '126:12',
124+
dark_oak: '126:13'
104125
},
105126
snow: 78,
106127
stone: 44,
107128
oak: 126,
108129
spruce: '126:1',
109130
birch: '126:2',
110-
jungle: '126:3'
131+
jungle: '126:3',
132+
acacia: '126:4',
133+
dark_oak: '126:5'
134+
sandstone_red: 182,
135+
purpur: 205,
111136
},
112137
// see brick.red 45
113138
tnt: 46,
@@ -127,7 +152,11 @@ var blocks = {
127152
spruce: 134,
128153
birch: 135,
129154
jungle: 136,
130-
quartz: 156
155+
quartz: 156,
156+
acacia: 163,
157+
dark_oak: 164,
158+
sandstone_red: 180,
159+
purpur: 203,
131160
},
132161
chest: 54,
133162
redstone_wire: 55,
@@ -167,7 +196,7 @@ var blocks = {
167196
jackolantern: 91,
168197
cake: 92,
169198
redstone_repeater: 93,
170-
redeston_repeater_active: 94,
199+
redstone_repeater_active: 94,
171200
stained_glass: {
172201
white: 95 // all other colors added below
173202
},
@@ -215,6 +244,7 @@ var blocks = {
215244
flowerpot: 140,
216245
carrots: 141,
217246
potatoes: 142,
247+
beetroot: 207,
218248
button_wood: 143,
219249
skull: 144, mobhead: 144,
220250
anvil: 145,
@@ -257,6 +287,8 @@ var blocks = {
257287
packed_ice: 174,
258288
double_plant: 175,
259289
sunflower: 175,
290+
purpur: 201,
291+
purpur_pillar: 202,
260292
flower: {
261293
sunflower: 175,
262294
lilac: '175:1',
@@ -267,7 +299,16 @@ var blocks = {
267299
yellow: 37,
268300
dandelion: 37,
269301
rose: 38,
270-
red: 38
302+
red: 38,
303+
poppy: 38,
304+
blueorchid: '38:1',
305+
allium: '38:2',
306+
azure_bluet: '38:3',
307+
red_tulip: '38:4',
308+
orange_tulip: '38:5',
309+
white_tulip: '38:6',
310+
pink_tulip: '38:7',
311+
oxeye_daisy: '38:8'
271312
},
272313
bonemeal: '351:15',
273314
banner: {

0 commit comments

Comments
 (0)