Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert from ASM to Mixins #2192

Merged
merged 46 commits into from
Jun 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
183010b
Change some ASM to Mixins
ALongStringOfNumbers Jul 22, 2023
c092ec8
In progress
ALongStringOfNumbers Jul 22, 2023
0dd66ac
More Conversions
ALongStringOfNumbers Jul 22, 2023
7e94841
Another conversion, needs testing
ALongStringOfNumbers Jul 22, 2023
c804947
continue work
ALongStringOfNumbers Jul 30, 2023
76c67b8
More work
ALongStringOfNumbers Oct 30, 2023
3f02f7f
In progress work
ALongStringOfNumbers Nov 15, 2023
6887973
possibly working RecipeRepairItemMixin
serenibyss Nov 24, 2023
4a2d5a1
Remove NC Mixin/ASM, as our compat is more broken than what is being …
ALongStringOfNumbers Nov 24, 2023
8be86ed
Some Fixes
ALongStringOfNumbers Nov 24, 2023
2f7ce68
Compile
ALongStringOfNumbers Nov 25, 2023
a7cd3c9
Fix Rebase issues and spotless
ALongStringOfNumbers Nov 30, 2023
67b0f1b
1 spotless isn't enough apparently
ALongStringOfNumbers Nov 30, 2023
7e99118
another one down
ALongStringOfNumbers Nov 30, 2023
385deaa
spotless
serenibyss Dec 4, 2023
ef43ef3
Rebase fixes
ALongStringOfNumbers Dec 4, 2023
8a66b63
Another one down
ALongStringOfNumbers Dec 7, 2023
c2426ff
CTM mixins
ALongStringOfNumbers Dec 13, 2023
fd06dfb
Fix RenderChunkMixin, needs verification
ALongStringOfNumbers Dec 14, 2023
7b78eb3
Some cleanup
ALongStringOfNumbers Dec 19, 2023
1c8ed6f
Fix JEI Mixin
ALongStringOfNumbers Dec 21, 2023
f15f673
Remove overwrite
ALongStringOfNumbers Jan 1, 2024
8903d8b
Fix CTM mixin
ALongStringOfNumbers Jan 9, 2024
88cda82
Specify ordinal
ALongStringOfNumbers Jan 9, 2024
510c2d3
Spotless
ALongStringOfNumbers Jan 14, 2024
4576844
Hopefully everything?
ALongStringOfNumbers Jan 15, 2024
0a3a632
Should Fix Special Armor mixin
ALongStringOfNumbers Jan 29, 2024
8d1b586
Switch to new Mod loaded checks
ALongStringOfNumbers Feb 6, 2024
e93367a
In progress fixes, doesn't all work yet
ALongStringOfNumbers Feb 23, 2024
d160a65
Fix up rebase
ALongStringOfNumbers Feb 25, 2024
37f7c08
Non-deprecated wrap
ALongStringOfNumbers Feb 25, 2024
82a2948
Some fixes, specify ordinals
ALongStringOfNumbers Feb 25, 2024
98b8f4e
fix RecipeRepairItemMixin
ghzdude Feb 25, 2024
efdb299
combine two mixins into one
ghzdude Feb 25, 2024
90e3e96
spotless
ghzdude Mar 9, 2024
458edf2
Spotless
ALongStringOfNumbers May 5, 2024
124369c
convert vintigium asm into mixin
ghzdude Jun 11, 2024
6523f5b
remove AT target for manager mixin
ghzdude Jun 11, 2024
50333f1
a
ghzdude Jun 11, 2024
fd0ca7e
Fix lang
ALongStringOfNumbers Jun 11, 2024
e06da75
Remove outdated TODOs
ALongStringOfNumbers Jun 11, 2024
57a2c66
back to compileOnly
ghzdude Jun 18, 2024
424aaf0
make fields mutable and modify in static init
ghzdude Jun 18, 2024
31d39c8
spotless weee
ghzdude Jun 18, 2024
4b02bc5
remove interface accessor
ghzdude Jun 19, 2024
174cb14
some clean up + javadoc
ghzdude Jun 19, 2024
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
Prev Previous commit
Next Next commit
1 spotless isn't enough apparently
ALongStringOfNumbers committed Jun 11, 2024
commit 67b0f1b26f98d8841132d2072892f8dd35d921bb
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ public class RecipeRepairItemMixin {
cancellable = true)
public void gregtechCEu$matches(InventoryCrafting inv, World worldIn, CallbackInfoReturnable<Boolean> cir,
@Local LocalRef<ItemStack> itemstack, @Local LocalRef<ItemStack> itemstack1) {

if (itemstack.get().getItem() instanceof IGTTool first &&
itemstack1.get().getItem() instanceof IGTTool second) {
if (first.isElectric() || second.isElectric()) {