Skip to content

Commit 8ad1699

Browse files
fix: normalize mixin targets to a format that RPMod/remap can read
Cherry-pick from d0e3abfc2f903c9b6bd80c356b0523ffd442e2f1 on Skytils/Skytils
1 parent d4101aa commit 8ad1699

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/main/java/gg/skytils/skytilsmod/mixins/transformers/MixinMinecraft.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public abstract class MixinMinecraft implements Executor {
4444
@Shadow
4545
public abstract ListenableFuture<Object> addScheduledTask(Runnable runnableToSchedule);
4646

47-
@Inject(method = "clickMouse()V", at = @At(value = "INVOKE", target = "net/minecraft/client/entity/EntityPlayerSP.swingItem()V", shift = At.Shift.AFTER))
47+
@Inject(method = "clickMouse()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;swingItem()V", shift = At.Shift.AFTER))
4848
private void clickMouse(CallbackInfo info) {
4949
if (!Utils.INSTANCE.getInSkyblock()) return;
5050

51-
ItemStack item = thePlayer.getHeldItem();
51+
ItemStack item = this.thePlayer.getHeldItem();
5252
if (item != null) {
5353
NBTTagCompound extraAttr = ItemUtil.getExtraAttributes(item);
5454
String itemId = ItemUtil.getSkyBlockItemID(extraAttr);

src/main/java/gg/skytils/skytilsmod/mixins/transformers/crash/MixinCrashReport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public abstract class MixinCrashReport {
4242
@Unique
4343
private final CrashReportHook hook = new CrashReportHook((CrashReport) (Object) this);
4444

45-
@Inject(method = "getCompleteReport", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;append(Ljava/lang/String;)Ljava/lang/StringBuilder;", args = "ldc=---- Minecraft Crash Report ----\n;captureargs=true", shift = At.Shift.AFTER, remap = false, ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
45+
@Inject(method = "getCompleteReport", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;append(Ljava/lang/String;)Ljava/lang/StringBuilder;", shift = At.Shift.AFTER, remap = false, ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
4646
private void thereIsNoOtherWay(CallbackInfoReturnable<String> cir, StringBuilder stringbuilder) {
4747
hook.checkSkytilsCrash(cir, stringbuilder);
4848
}
4949

50-
@ModifyArg(method = "getCompleteReport", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;append(Ljava/lang/String;)Ljava/lang/StringBuilder;", remap = false, ordinal = 10, args = "matches=method::getCauseStackTraceOrString"))
50+
@ModifyArg(method = "getCompleteReport", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;append(Ljava/lang/String;)Ljava/lang/StringBuilder;", remap = false, ordinal = 10))
5151
private String otherReplaceCauseForLauncher(String theCauseStackTraceOrString) {
5252
return hook.generateCauseForLauncher(theCauseStackTraceOrString);
5353
}
@@ -60,6 +60,6 @@ private String replaceWittyComment(String comment) {
6060

6161
@Inject(method = "populateEnvironment", at = @At("RETURN"))
6262
private void addDataToCrashReport(CallbackInfo ci) {
63-
hook.addDataToCrashReport(theReportCategory);
63+
hook.addDataToCrashReport(this.theReportCategory);
6464
}
6565
}

src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderEntityItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
@Mixin(RenderEntityItem.class)
3030
public abstract class MixinRenderEntityItem {
31-
@Inject(method = "doRender", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/GlStateManager.pushMatrix()V", shift = At.Shift.AFTER, ordinal = 1))
31+
@Inject(method = "doRender", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER, ordinal = 1))
3232
private void scaleItemDrop(EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) {
3333
RenderEntityItemHookKt.scaleItemDrop(entity, x, y, z, entityYaw, partialTicks, ci);
3434
}

src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private void renderItemOverlayPost(FontRenderer fr, ItemStack stack, int xPositi
4040
RenderItemHookKt.renderItemOverlayPost(fr, stack, xPosition, yPosition, text, ci);
4141
}
4242

43-
@Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/GlStateManager.scale(FFF)V", shift = At.Shift.AFTER))
43+
@Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;scale(FFF)V", shift = At.Shift.AFTER))
4444
private void renderItemPre(ItemStack stack, IBakedModel model, CallbackInfo ci) {
4545
RenderItemHookKt.renderItemPre(stack, model, ci);
4646
}

0 commit comments

Comments
 (0)