Skip to content

Commit cc06ed8

Browse files
natanfudgenatanfudge
committed
move to submodules
1 parent 1add005 commit cc06ed8

Some content is hidden

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

52 files changed

+204
-203
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "client/src/fudge-lib"]
2+
path = client/src/fudge-lib
3+
url = https://github.com/Caesarea-Labs/fudge-lib

‎.idea/workspace.xml

+88-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package-lock.json

+14-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"dev": "vite",
88
"build": "tsc && vite build",
99
"preview": "vite preview",
10-
"test": "vitest --ui",
11-
"update-lib": "npm update fudge-lib"
10+
"test": "vitest --ui"
1211
},
1312
"eslintConfig": ".eslintrc.json",
1413
"dependencies": {
@@ -18,19 +17,16 @@
1817
"@mui/lab": "^5.0.0-alpha.118",
1918
"@mui/material": "^5.11.7",
2019
"@types/node": "^18.11.18",
21-
"@types/react": "^18.0.20",
22-
"@types/react-dom": "^18.0.10",
2320
"dayjs": "^1.11.7",
2421
"fflate": "^0.7.4",
25-
"fudge-lib": "latest",
2622
"react": "^18.2.0",
2723
"react-dom": "^18.2.0",
2824
"react-infinite-scroll-component": "^6.1.0",
2925
"web-vitals": "^3.1.1"
3026
},
3127
"devDependencies": {
32-
"@types/react": "^18.0.27",
33-
"@types/react-dom": "^18.0.10",
28+
"@types/react": "^18.2.22",
29+
"@types/react-dom": "^18.2.7",
3430
"@vitejs/plugin-react": "^3.1.0",
3531
"@vitejs/plugin-react-swc": "^3.1.0",
3632
"@vitest/ui": "^0.28.4",

‎client/src/crash/model/Mappable.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {ClassMethodSeparator, EnableAssertions} from "../../Constants";
22
import {Mappings} from "../../mappings/Mappings";
3-
import {hashString} from "fudge-lib/dist/collections/hashmap/Hashing";
4-
import "fudge-lib/dist/extensions/Extensions"
53
import {MappingStrategy} from "../../mappings/resolve/MappingStrategy";
4+
import {hashString} from "../../fudge-lib/collections/hashmap/Hashing";
65

76
export interface AnyMappable {
87
remap(mappings: Mappings, reverse: boolean): AnyMappable

‎client/src/crash/parser/CrashReportEnricher.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import {
2020
TraceLine
2121
} from "../model/RichCrashReport";
2222
import {parseCrashReport} from "./CrashReportParser";
23-
import "fudge-lib/dist/extensions/Extensions"
2423
import {JavaClass, SimpleMethod} from "../model/Mappable";
25-
import {typedKeys} from "fudge-lib/dist/methods/Typescript";
24+
import {typedKeys} from "../../fudge-lib/methods/Typescript";
2625

2726
export function parseCrashReportRich(rawReport: string): RichCrashReport {
2827
return enrichCrashReport(parseCrashReport(rawReport));

‎client/src/crash/parser/CrashReportParser.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {CrashReport, CrashReportSection, ExceptionDetails, StackTrace, StackTraceElement, StringMap} from "../model/CrashReport";
2-
import "fudge-lib/dist/extensions/ExtensionsImpl"
3-
import {HashSet} from "fudge-lib/dist/collections/hashmap/HashSet";
42
import {QuiltModsTitle, SystemDetailsTitle} from "./CrashReportEnricher";
3+
import {HashSet} from "../../fudge-lib/collections/hashmap/HashSet";
54

65

76
export function parseCrashReport(rawReport: string): CrashReport {

‎client/src/fudge-commons/simple/Color.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {CSSProperties} from "react";
2-
import {isObj} from "fudge-lib/dist/methods/Typescript";
2+
import {isObj} from "../../fudge-lib/methods/Typescript";
33
//asd
44
export type Color = string | Gradient
55

‎client/src/fudge-commons/simple/SimpleButton.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React from "react";
55
import {SingleChildParentProps} from "./SimpleElementProps";
66
import {ClickCallback} from "./GuiTypes";
77
import {deflattenStyle} from "./impl/SimpleImpl";
8-
import {Require} from "fudge-lib/dist/types/Basic";
8+
import {Require} from "../../fudge-lib/types/Basic";
99

1010
export interface SimpleButtonProps extends Require<SingleChildParentProps,'onClick'> {
1111
variant?: 'text' | 'outlined' | 'contained'

‎client/src/fudge-commons/simple/SimpleIconButton.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {IconButton} from "@mui/material";
22
import React from "react";
33
import {SingleChildParentProps} from "./SimpleElementProps";
44
import {deflattenStyle} from "./impl/SimpleImpl";
5-
import {Require} from "fudge-lib/dist/types/Basic";
5+
import {Require} from "../../fudge-lib/types/Basic";
66

77
export type SimpleIconButtonProps = Require<SingleChildParentProps, 'onClick'>
88

‎client/src/fudge-commons/simple/SimpleImage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ export interface ImageProps extends ElementProps {
1717
* {@link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img}
1818
*/
1919
export function SimpleImage(props: ImageProps) {
20-
// eslint-disable-next-line jsx-a11y/alt-text
2120
return <img {...deflattenStyle(props)}/>
2221
}

‎client/src/fudge-commons/simple/expansion/Api.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import {_implExpansion} from "./Impl";
33
import {_implUseExpansion} from "./Util";
44
import {SingleChildParentProps} from "../SimpleElementProps";
5-
import {Alignment} from "fudge-lib/dist/types/Gui";
5+
import {Alignment} from "../../../fudge-lib/types/Gui";
66

77
export function Expansion(props: ExpansionPropsApi) {
88
return _implExpansion(props);

‎client/src/fudge-commons/simple/expansion/Impl.tsx

+5-9
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import ReactDOM from "react-dom";
44
import {ClickAwayListener} from "@mui/material";
55
import {Wrap} from "../SimpleDiv";
66
import {SingleChildParentProps} from "../SimpleElementProps";
7-
import {Require} from "fudge-lib/dist/types/Basic";
8-
import {NumericAlignment, Rect} from "fudge-lib/dist/types/Gui";
9-
import {getDocumentRelativeRect} from "fudge-lib/dist/methods/Browser";
10-
import {toNumericAlignment} from "fudge-lib/dist/methods/Gui";
11-
import {coercePreferMin} from "fudge-lib/dist/methods/Javascript";
7+
import {Require} from "../../../fudge-lib/types/Basic";
8+
import {NumericAlignment, Rect} from "../../../fudge-lib/types/Gui";
9+
import {getDocumentRelativeRect} from "../../../fudge-lib/methods/Browser";
10+
import {toNumericAlignment} from "../../../fudge-lib/methods/Gui";
11+
import {coercePreferMin} from "../../../fudge-lib/methods/Javascript";
1212

1313
export function _implExpansion(props: ExpansionPropsApi) {
1414
const manualProps: ManualExpansionProps = isManualApi(props) ? props : toManual(props)
@@ -37,7 +37,6 @@ function ExpansionPortal(props: ExpansionProps) {
3737
const [completelyClosed, setCompletelyClosed] = useState(false);
3838
const show = props.show
3939

40-
// eslint-disable-next-line react-hooks/exhaustive-deps
4140
const timeoutHandle = useMemo<TimeoutWrapper>(() => ({timeout: undefined}), [show]);
4241

4342
useEffect(() => {
@@ -53,7 +52,6 @@ function ExpansionPortal(props: ExpansionProps) {
5352
// Existing composition, no need to completely close
5453
stop(timeoutHandle);
5554
};
56-
// eslint-disable-next-line react-hooks/exhaustive-deps
5755
}, [props.animationDurationMillis, show, completelyClosed])
5856

5957
// const
@@ -184,7 +182,6 @@ function SizeCalculator({
184182

185183
useLayoutEffect(() => {
186184
if (!calculate) setCalculate(true)
187-
// eslint-disable-next-line react-hooks/exhaustive-deps
188185
}, [depProps])
189186

190187

@@ -193,7 +190,6 @@ function SizeCalculator({
193190
setRect(getDocumentRelativeRect(ref.current))
194191
setCalculate(false);
195192
}
196-
// eslint-disable-next-line react-hooks/exhaustive-deps
197193
}, [depProps, calculate])
198194

199195
return <Fragment>

‎client/src/fudge-commons/simple/impl/SimpleImpl.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as CSS from "csstype";
44
import {Axes, Directions, Padding, Percent, Size} from "../GuiTypes";
55
import {ElementProps} from "../SimpleElementProps";
66
import {fixAlignment} from "./FlexImpl";
7-
import {isObj} from "fudge-lib/dist/methods/Typescript";
7+
import {isObj} from "../../../fudge-lib/methods/Typescript";
88

99
export function deflattenStyle<T extends ElementProps>(props: T) {
1010
const {

‎client/src/fudge-lib

Submodule fudge-lib added at 0baaf77

‎client/src/mappings/Mappings.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {MappingsImpl} from "./MappingsImpl";
22
import {MappingsBuilder} from "./MappingsBuilder";
33
import {AllowAllMappings} from "./MappingsFilter";
44
import {DescriptoredMethod, JavaClass, JavaMethod, SimpleMethod} from "../crash/model/Mappable";
5-
import {HashMap} from "fudge-lib/dist/collections/hashmap/HashMap";
5+
import {HashMap} from "../fudge-lib/collections/hashmap/HashMap";
66

77
export interface Mappings {
88
mapClass(className: JavaClass, reverse: boolean): JavaClass

‎client/src/mappings/MappingsApi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from "./providers/MappingsProvider";
1010
import {MappingsFilter} from "./MappingsFilter";
1111
import {EmptyMappings, Mappings} from "./Mappings";
12-
import {PromiseMemoryCache} from "fudge-lib/dist/collections/PromiseMemoryCache";
12+
import {PromiseMemoryCache} from "../fudge-lib/collections/PromiseMemoryCache";
1313

1414

1515
export async function buildsOf(namespace: MappingsNamespace, minecraftVersion: string): Promise<MappingsBuilds> {

‎client/src/mappings/MappingsBuilder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ClassMappings, Mappings} from "./Mappings";
22
import {MappingsImpl} from "./MappingsImpl";
33
import {MappingsFilter} from "./MappingsFilter";
4-
import {HashMap, MutableDict} from "fudge-lib/dist/collections/hashmap/HashMap";
54
import {DescriptoredMethod, JavaClass} from "../crash/model/Mappable";
5+
import {HashMap, MutableDict} from "../fudge-lib/collections/hashmap/HashMap";
66

77
export class MappingsBuilder {
88
private readonly classMappings: MutableDict<JavaClass, JavaClass>

‎client/src/mappings/MappingsFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
JavaClass,
77
SimpleMethod
88
} from "../crash/model/Mappable";
9-
import {HashSet} from "fudge-lib/dist/collections/hashmap/HashSet";
10-
import {Lazy} from "fudge-lib/dist/collections/Lazy";
9+
import {HashSet} from "../fudge-lib/collections/hashmap/HashSet";
10+
import {Lazy} from "../fudge-lib/collections/Lazy";
1111

1212

1313
export interface MappingsFilter {

‎client/src/mappings/MappingsImpl.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {ClassMappings, Mappings, SerializedMappings} from "./Mappings";
2-
import {Lazy} from "fudge-lib/dist/collections/Lazy";
32
import {DescriptoredMethod, JavaClass, SimpleMethod} from "../crash/model/Mappable";
4-
import {Dict} from "fudge-lib/dist/collections/hashmap/HashMap";
3+
import {Lazy} from "../fudge-lib/collections/Lazy";
4+
import {Dict} from "../fudge-lib/collections/hashmap/HashMap";
55

66
type SingleDirectionMappingData = Dict<JavaClass, ClassMappings>
77

‎client/src/mappings/providers/ForgeRuntimeMappingsProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// In these versions, Forge uses pure SRG for the names in the Minecraft runtime.
22
// In later versions, Forge uses a combination of SRG and Mojmap. This method is called 'ForgeRuntime' namespace.
3-
import {HashSet} from "fudge-lib/dist/collections/hashmap/HashSet";
43
import {Mappings} from "../Mappings";
54
import {DescriptoredMethod, JavaClass, JavaMethod, SimpleMethod} from "../../crash/model/Mappable";
5+
import {HashSet} from "../../fudge-lib/collections/hashmap/HashSet";
66

77
const forgeSrgRuntimeVersions = HashSet.of(
88
'1.14.2', '1.14.3', '1.14',

‎client/src/mappings/providers/IntermediaryMappingsProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {extractTinyMappings, profiler, profilerDel} from "./ProviderUtils";
22
import {parseTinyFile} from "./TinyMappings";
33
import {MappingsFilter} from "../MappingsFilter";
44
import {Mappings} from "../Mappings";
5-
import {httpGet} from "fudge-lib/dist/methods/Http";
5+
import {httpGet} from "../../fudge-lib/methods/Http";
66

77

88
export async function getIntermediaryMappings(mcVersion: string, filter: MappingsFilter): Promise<Mappings> {

‎client/src/mappings/providers/MappingsProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {getYarnBuilds, getYarnMappings, yarnSupportsMcVersion} from "./YarnMappi
33
import {getIntermediaryMappings} from "./IntermediaryMappingsProvider";
44
import {MappingsFilter} from "../MappingsFilter";
55
import {EmptyMappings, Mappings} from "../Mappings";
6-
import {PromiseMemoryCache} from "fudge-lib/dist/collections/PromiseMemoryCache";
76
import {getSrgMappings} from "./SrgMappingsProvider";
87
import {getMcpBuilds, getMcpMappings, mcpSupportsMcVersion} from "./McpMappingsProvider";
98
import {getMojangMappings, mojmapSupportedMinecraftVersion} from "./MojangMappingsProvider";
@@ -14,6 +13,7 @@ import {
1413
} from "./ForgeRuntimeMappingsProvider";
1514
import {getMappingsCached} from "../MappingsApi";
1615
import {getQuiltBuilds, getQuiltMappings, quiltSupportsMcVersion} from "./QuiltMappingsProvider";
16+
import {PromiseMemoryCache} from "../../fudge-lib/collections/PromiseMemoryCache";
1717

1818

1919
export type MappingsBuilds = string[];

‎client/src/mappings/providers/McpMappingsProvider.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import {Mappings} from "../Mappings";
22
import {MappingsFilter} from "../MappingsFilter";
33
import {isOlderThan1_12_2} from "./ProviderUtils";
4-
import {extractFromZip} from "fudge-lib/dist/methods/Zip";
54
import {strFromU8} from "fflate";
65
import {CrashyServer, HttpStatusCode} from "../../server/CrashyServer";
7-
import {HashSet} from "fudge-lib/dist/collections/hashmap/HashSet";
86
import {MappingsBuilder} from "../MappingsBuilder";
97
import {DescriptoredMethod, JavaClass, SimpleMethod} from "../../crash/model/Mappable";
108
import {StringMap} from "../../crash/model/CrashReport";
11-
import {httpGet} from "fudge-lib/dist/methods/Http";
9+
import {HashSet} from "../../fudge-lib/collections/hashmap/HashSet";
10+
import {httpGet} from "../../fudge-lib/methods/Http";
1211

1312

1413
const mcpSupportedMcVersions = HashSet.of(

0 commit comments

Comments
 (0)