Skip to content

Commit 5694f8f

Browse files
chore: fix remaining compile errors
1 parent f974f35 commit 5694f8f

File tree

6 files changed

+16
-30
lines changed

6 files changed

+16
-30
lines changed

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/accessors/AccessorEnumDyeColor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525

2626
@Mixin(DyeColor.class)
2727
public interface AccessorEnumDyeColor {
28-
@Accessor("field_0_8583")
29-
Formatting getChatColor();
28+
/* @Accessor("field_0_8583")
29+
Formatting getChatColor();*/
3030
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/accessors/AccessorGuiEditSign.java

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,16 @@
1818

1919
package gg.skytils.skytilsmod.mixins.transformers.accessors;
2020

21-
import net.minecraft.client.gui.widget.ClickableWidget;
22-
import net.minecraft.client.gui.screen.ingame.SignEditScreen;
2321
import net.minecraft.block.entity.SignBlockEntity;
22+
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
2423
import org.spongepowered.asm.mixin.Mixin;
2524
import org.spongepowered.asm.mixin.gen.Accessor;
2625

27-
@Mixin(SignEditScreen.class)
26+
@Mixin(AbstractSignEditScreen.class)
2827
public interface AccessorGuiEditSign {
2928
/**
3029
* Reference to the sign object.
3130
*/
32-
@Accessor("sign")
31+
@Accessor("blockEntity")
3332
SignBlockEntity getTileSign();
34-
35-
/**
36-
* Counts the number of screen updates.
37-
*/
38-
@Accessor("ticksSinceOpened")
39-
int getUpdateCounter();
40-
41-
/**
42-
* The index of the line that is being edited.
43-
*/
44-
@Accessor("currentRow")
45-
int getEditLine();
46-
47-
/**
48-
* "Done" button for the GUI.
49-
*/
50-
@Accessor("field_3032")
51-
ClickableWidget getDoneBtn();
5233
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/accessors/AccessorWorld.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import net.minecraft.world.World;
2222
import net.minecraft.world.chunk.BlockEntityTickInvoker;
2323
import org.spongepowered.asm.mixin.Mixin;
24-
import org.spongepowered.asm.mixin.Unique;
24+
import org.spongepowered.asm.mixin.gen.Accessor;
2525

2626
import java.util.List;
2727

2828
@Mixin(World.class)
2929
public interface AccessorWorld {
30-
@Unique
30+
@Accessor
3131
List<BlockEntityTickInvoker> getBlockEntityTickers();
3232
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinLayerCustomHead.java

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

2121
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2222
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
23-
import gg.skytils.skytilsmod.mixins.hooks.renderer.LayerCustomHeadHookKt;
23+
// import gg.skytils.skytilsmod.mixins.hooks.renderer.LayerCustomHeadHookKt;
2424
import net.minecraft.client.render.entity.feature.HeadFeatureRenderer;
2525
import net.minecraft.entity.LivingEntity;
2626
import net.minecraft.entity.player.PlayerEntity;

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinTileEntitySkullRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package gg.skytils.skytilsmod.mixins.transformers.renderer;
2020

2121
import com.mojang.authlib.GameProfile;
22-
import gg.skytils.skytilsmod.mixins.hooks.renderer.TileEntitySkullRendererHookKt;
22+
// import gg.skytils.skytilsmod.mixins.hooks.renderer.TileEntitySkullRendererHookKt;
2323
import net.minecraft.client.render.entity.model.EntityModel;
2424
import net.minecraft.client.render.block.entity.SkullBlockEntityRenderer;
2525
import net.minecraft.client.render.block.entity.BlockEntityRenderer;

mod/src/main/java/gg/skytils/skytilsmod/tweaker/TweakerUtil.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static void showMessage(String errorMessage, JButton... options) {
7272

7373
Icon icon = null;
7474
try {
75-
URL url = SkytilsLoadingPlugin.class.getResource("/assets/skytils/sychicpet.gif");
75+
URL url = TweakerUtil.class.getResource("/assets/skytils/sychicpet.gif");
7676
if (url != null) {
7777
icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(url).getScaledInstance(50, 50, Image.SCALE_DEFAULT));
7878
}
@@ -121,7 +121,12 @@ static void runStage(String className, String methodName, Object... params) thro
121121
}
122122

123123
static Class<?> getClassForLaunch(String name, boolean initialize) throws ClassNotFoundException {
124-
return Class.forName(name, initialize, Launch.classLoader);
124+
//#if MC==10809
125+
//$$ ClassLoader classLoader = Launch.classLoader;
126+
//#else
127+
ClassLoader classLoader = FabricLauncherBase.getLauncher().getTargetClassLoader();
128+
//#endif
129+
return Class.forName(name, initialize, classLoader);
125130
}
126131

127132
static Field findField(final Class<?> clazz, final String name) throws ReflectiveOperationException {

0 commit comments

Comments
 (0)