0.2.7 refactors #178

modmuss50 · 2020-02-17T20:14:42Z

This PR contains a bit of cleanup to loom, as well as almost drop in support for access winders, and fixes for idea 2020.

This has the abbility to generate project based jars.

modmuss50 · 2020-02-18T20:41:20Z

Ok, I have something mostly working (not tested a lot, inner classes dont work for example).

I have been testing with the following file:

ae\v1	v1	named
public	class	net/minecraft/client/MinecraftClient
public	field	net/minecraft/client/MinecraftClient	resourcePackDir	Ljava/io/File;
protected	method	net/minecraft/client/MinecraftClient	initializeSearchableContainers	()V
public	class	net/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$SortTask
public	field	net/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$SortTask	data	Lnet/minecraft/client/render/chunk/ChunkBuilder$ChunkData;

Loom remaps this and places it in META-INF of the jar:

ae\v1	intermediary
public	class	net/minecraft/class_846$class_851$class_4579
public	class	net/minecraft/class_310
protected	method	net/minecraft/class_310	method_1546	()V
public	field	net/minecraft/class_310	field_1757	Ljava/io/File;
public	field	net/minecraft/class_846$class_851$class_4579	field_20841	Lnet/minecraft/class_846$class_849;

The format is still wide open for changes, im already not sure on forcing tabs as my ide sometimes changes them to tabs.

2xsaiko · 2020-02-18T21:04:40Z

im already not sure on forcing tabs as my ide sometimes changes them to tabs.

Why not accept any amount of whitespace as a seperator?

modmuss50 · 2020-02-18T21:20:27Z

Ok, done that for now, Im still not super happy with the file format. Right now there are no limits on what you can make public, people seem undecided on allowing methods/fields to only be protected.

Code cleanup Remap if needed when reading

2xsaiko · 2020-02-19T12:10:25Z

src/main/java/net/fabricmc/loom/processors/AccessEscalator.java

+			switch (split[1]) {
+			case "class":
+				if (split.length != 3) {
+					throw new RuntimeException("Failed to parse access escalator. at line:" + line);


Instead of aborting immediately, I'd add the encountered errors to a list and continue trying to parse the file, then abort after it's done, that way you can see all the errors at once (and on top of that you don't get a completely irrelevant stack trace except for the message)
I'd also make the error more descriptive, something like

syntax error: expected '<class name> <access level>' after 'class' at /path/to/inputfile.txt:40: | 40 | class sdas as das das d asd as | ^~~~~~~~~~~~~~~~~~~~~~~~

Same goes for all the other parse errors.

I can easily make the erros more descriptive, im not sure if its worth the effort to go to make it super detailed.

Yeah it doesn't have to be this detailed, one line error messages would definitely be enough, the main thing I would want is that it doesn't immediately throw when it encounters the first error.

modmuss50 · 2020-02-19T13:01:08Z

Updated file format:

ae\v1	named
# Comments like this are supported
public	class	net/minecraft/client/MinecraftClient # And comments can be put here as well
public	field	net/minecraft/client/MinecraftClient	resourcePackDir	Ljava/io/File;
protected	method	net/minecraft/client/MinecraftClient	initializeSearchableContainers	()V
mutable	field	net/minecraft/client/MinecraftClient	COMPLETED_UNIT_FUTURE	Ljava/util/concurrent/CompletableFuture;
public	field	net/minecraft/client/MinecraftClient	COMPLETED_UNIT_FUTURE	Ljava/util/concurrent/CompletableFuture;

public	class	net/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$SortTask
public	field	net/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$SortTask	data	Lnet/minecraft/client/render/chunk/ChunkBuilder$ChunkData;

Tabs are required, it will complain quite quickly if you use spaces.

…and will benefit idea 2020 Add some basic validation to the AccessWidenerRemapper, will present any issues with the mappings when building (May need a way to disable?) + Some bugs fixes

…ble with 2019

modmuss50 · 2020-02-28T21:11:09Z

Im going to move out the AccessWinder stuff into another PR, as my reactors should be good enough for 0.2.7 even without them.

…path.

sfPlayer1

No obvious issues

liach · 2020-03-05T20:40:44Z

Access changer should be ok as we don't recompile decompiled code like the other silly project does

liach

No major problems

modmuss50 added 2 commits February 17, 2020 20:13

Rough work on project based jars, skeleton for AccessEscalators?

d3bc915

First working draft

04ca486

Minor changes

4b082ad

Add support for mutable, better error checking when parsing file.

228cf3f

Code cleanup Remap if needed when reading

2xsaiko suggested changes Feb 19, 2020

View reviewed changes

Fix inner classes and genSources

84b78c9

modmuss50 added 2 commits February 19, 2020 13:03

Fix CME

2d4071c

Caching, only regen jar when input changes

fd007eb

modmuss50 mentioned this pull request Feb 19, 2020

AccessWidener FabricMC/fabric-loader#206

Merged

modmuss50 added 6 commits February 20, 2020 20:10

Some work, untested

0326fcb

Fix writing, fix checkstyle issues

9f48b71

More fixes

0f4f6fa

Move jars into a maven file structure, cleans up the file structure, …

83d2741

…and will benefit idea 2020 Add some basic validation to the AccessWidenerRemapper, will present any issues with the mappings when building (May need a way to disable?) + Some bugs fixes

Fix issues with source jars in idea 2020, should be backwards compati…

01dda72

…ble with 2019

Move to lorenz-tiny

ea6db85

modmuss50 added 2 commits February 28, 2020 21:20

Build fix + small cleanup

860d829

Remove accesswidener's for now

cd54d71

modmuss50 changed the title ~~Rough work on project based jars, skeleton for AccessEscalators?~~ 0.2.7 refactors Feb 28, 2020

modmuss50 mentioned this pull request Feb 28, 2020

Access widener loom support #182

Merged

Update dev launch injector, should fix all issues with spaces in the …

e5f91b2

…path.

sfPlayer1 approved these changes Mar 5, 2020

View reviewed changes

liach approved these changes Mar 5, 2020

View reviewed changes

2xsaiko approved these changes Mar 5, 2020

View reviewed changes

modmuss50 merged commit ee462f8 into FabricMC:dev/0.2.7 Mar 6, 2020

Juuxel mentioned this pull request May 1, 2020

Create version directories for each Minecraft mapped version Chocohead/Fabric-Loom#5

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

0.2.7 refactors #178

0.2.7 refactors #178

modmuss50 commented Feb 17, 2020 •

edited

Loading

modmuss50 commented Feb 18, 2020 •

edited

Loading

2xsaiko commented Feb 18, 2020 •

edited

Loading

modmuss50 commented Feb 18, 2020

2xsaiko Feb 19, 2020

modmuss50 Feb 19, 2020

2xsaiko Feb 19, 2020

modmuss50 commented Feb 19, 2020

modmuss50 commented Feb 28, 2020

sfPlayer1 left a comment

liach commented Mar 5, 2020

liach left a comment

0.2.7 refactors #178

0.2.7 refactors #178

Conversation

modmuss50 commented Feb 17, 2020 • edited Loading

modmuss50 commented Feb 18, 2020 • edited Loading

2xsaiko commented Feb 18, 2020 • edited Loading

modmuss50 commented Feb 18, 2020

2xsaiko Feb 19, 2020

Choose a reason for hiding this comment

modmuss50 Feb 19, 2020

Choose a reason for hiding this comment

2xsaiko Feb 19, 2020

Choose a reason for hiding this comment

modmuss50 commented Feb 19, 2020

modmuss50 commented Feb 28, 2020

sfPlayer1 left a comment

Choose a reason for hiding this comment

liach commented Mar 5, 2020

liach left a comment

Choose a reason for hiding this comment

modmuss50 commented Feb 17, 2020 •

edited

Loading

modmuss50 commented Feb 18, 2020 •

edited

Loading

2xsaiko commented Feb 18, 2020 •

edited

Loading