Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"comlink": "^4.4.2",
"dagre": "^0.8.5",
"dexie": "^4.3.0",
"fuse.js": "^7.1.0",
"monaco-editor": "^0.55.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
Expand Down
34 changes: 26 additions & 8 deletions src/logic/JarFile.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,47 @@
import { BehaviorSubject, combineLatest, distinct, distinctUntilChanged, map, Observable, switchMap, throttleTime } from 'rxjs';
import { combineLatest, distinctUntilChanged, map, Observable } from 'rxjs';
import { minecraftJar } from './MinecraftApi';
import { performSearch } from './Search';
import { searchQuery } from './State';
import Fuse from 'fuse.js';

export const fileList = minecraftJar.pipe(
distinctUntilChanged(),
map(jar => Object.keys(jar.jar.entries))
);

// File list that only contains outer class files
export const classesList = fileList.pipe(
export const outerClassesList = fileList.pipe(
map(files => files.filter(file => file.endsWith('.class') && !file.includes('$')))
);

export const outerClassSearch = outerClassesList.pipe(
map(classes => {
const list = classes.map(className => {
let simpleClassName = className;

const pos = className.lastIndexOf('/');
if (pos !== -1) simpleClassName = className.substring(pos);

return { 'class': simpleClassName, key: className };
});

return new Fuse(list, {
minMatchCharLength: 3,
keys: ['class']
});
})
);

const debouncedSearchQuery: Observable<string> = searchQuery.pipe(
throttleTime(200),
distinctUntilChanged()
);

export const searchResults: Observable<string[]> = combineLatest([classesList, debouncedSearchQuery]).pipe(
switchMap(([classes, query]) => {
return [performSearch(query, classes)];
export const searchResults: Observable<string[]> = combineLatest([outerClassSearch, debouncedSearchQuery]).pipe(
map(([search, query]) => {
const results = search.search(query);
return results.map(r => r.item.key);
})
);

export const isSearching = searchQuery.pipe(
map((query) => query.length > 0)
);
);
4 changes: 2 additions & 2 deletions src/ui/Code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { currentResult, isDecompiling } from '../logic/Decompiler';
import { useEffect, useRef, useState } from 'react';
import { editor, Range } from "monaco-editor";
import { isThin } from '../logic/Browser';
import { classesList } from '../logic/JarFile';
import { outerClassesList } from '../logic/JarFile';
import { getOpenTab } from '../logic/Tabs';
import { message, Spin } from 'antd';
import { LoadingOutlined } from '@ant-design/icons';
Expand Down Expand Up @@ -40,7 +40,7 @@ const Code = () => {
const monaco = useMonaco();

const decompileResult = useObservable(currentResult);
const classList = useObservable(classesList);
const classList = useObservable(outerClassesList);
const editorRef = useRef<editor.IStandaloneCodeEditor | null>(null);
const hideMinimap = useObservable(isThin);
const decompiling = useObservable(isDecompiling);
Expand Down
4 changes: 2 additions & 2 deletions src/ui/EmptyState.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { GithubOutlined, SearchOutlined, LinkOutlined, BranchesOutlined, CopyOutlined, CodeOutlined, FileSearchOutlined, AimOutlined } from '@ant-design/icons';
import { Card, Typography, Space, Tooltip, theme } from 'antd';
import { classesList } from "../logic/JarFile";
import { outerClassesList } from "../logic/JarFile";
import { openTab } from "../logic/Tabs";
import { useObservable } from "../utils/UseObservable";

Expand All @@ -10,7 +10,7 @@ const { useToken } = theme;

export const EmptyState = () => {
const { token } = useToken();
const outerClasses = useObservable(classesList);
const outerClasses = useObservable(outerClassesList);

const openRandomClass = () => {
if (outerClasses && outerClasses.length > 0) {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/FileList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tree, Dropdown, message } from 'antd';
import type { TreeDataNode, TreeProps, MenuProps } from 'antd';
import { CaretDownFilled } from '@ant-design/icons';
import { combineLatest, from, map, Observable, shareReplay, switchMap, startWith } from 'rxjs';
import { classesList } from '../logic/JarFile';
import { outerClassesList } from '../logic/JarFile';
import { useObservable } from '../utils/UseObservable';
import { useCallback, useEffect, useMemo, useState } from 'react';
import type { Key } from 'antd/es/table/interface';
Expand All @@ -30,7 +30,7 @@ const classData: Observable<Map<string, ClassData> | null> = jarIndex.pipe(
);

const fileTree: Observable<TreeDataNode[]> = combineLatest([
classesList,
outerClassesList,
classData,
compactPackages.observable
]).pipe(
Expand Down Expand Up @@ -231,7 +231,7 @@ const FileList = () => {

const jar = useObservable(minecraftJar);
const selectedKeys = useObservable(selectedFileKeys);
const classes = useObservable(classesList);
const classes = useObservable(outerClassesList);
const onSelect: TreeProps['onSelect'] = useCallback((selectedKeys: Key[]) => {
if (selectedKeys.length === 0) return;
if (!classes || !classes.includes(selectedKeys[0] as string)) return;
Expand Down