Skip to content

Commit d356305

Browse files
committed
update CraftedCore
1 parent b371cdb commit d356305

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

common/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
modApi("dev.tocraft:craftedcore:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
6+
modApi("dev.tocraft:craftedcore:${parent!!.name}-${rootProject.properties["craftedcore_version"]}") {
7+
exclude("me.shedaniel.cloth")
8+
}
79
}

common/src/main/java/dev/tocraft/skinshifter/SkinShifter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.minecraft.nbt.Tag;
55
import net.minecraft.server.level.ServerPlayer;
66
import net.minecraft.world.entity.player.Player;
7+
import org.jetbrains.annotations.NotNull;
78
import tocraft.craftedcore.config.ConfigLoader;
89
import tocraft.craftedcore.event.common.CommandEvents;
910
import tocraft.craftedcore.patched.TComponent;
@@ -18,7 +19,7 @@
1819
@SuppressWarnings("unused")
1920
public class SkinShifter {
2021
public static final String MODID = "skinshifter";
21-
public static final SkinShifterConfig CONFIG = ConfigLoader.read(MODID, SkinShifterConfig.class);
22+
public static final SkinShifterConfig CONFIG = ConfigLoader.register(MODID);
2223

2324
public void initialize() {
2425
SkinPlayerData.initialize();
@@ -32,7 +33,7 @@ public void initialize() {
3233
* @param player the player the skin should be set of
3334
* @param skinPlayer the uuid of the owner of the new skin
3435
*/
35-
public static void setSkin(ServerPlayer player, UUID skinPlayer) {
36+
public static void setSkin(@NotNull ServerPlayer player, UUID skinPlayer) {
3637
if (Objects.equals(player.getUUID(), skinPlayer)) {
3738
SkinPlayerData.setSkin(player, null);
3839
} else {

common/src/main/java/dev/tocraft/skinshifter/SkinShifterCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.minecraft.commands.arguments.MessageArgument;
1515
import net.minecraft.commands.arguments.UuidArgument;
1616
import net.minecraft.server.level.ServerPlayer;
17+
import org.jetbrains.annotations.NotNull;
1718
import tocraft.craftedcore.event.common.CommandEvents;
1819
import tocraft.craftedcore.patched.CCommandSourceStack;
1920
import tocraft.craftedcore.patched.TComponent;
@@ -35,7 +36,7 @@ public void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBu
3536
//$$ }
3637
//#endif
3738

38-
private void onRegister(CommandDispatcher<CommandSourceStack> dispatcher) {
39+
private void onRegister(@NotNull CommandDispatcher<CommandSourceStack> dispatcher) {
3940
LiteralCommandNode<CommandSourceStack> rootNode = Commands.literal(SkinShifter.MODID).requires(source -> source.hasPermission(SkinShifter.CONFIG.baseCommandOPLevel) || source.hasPermission(SkinShifter.CONFIG.selfCommandOPLevel)).build();
4041
LiteralCommandNode<CommandSourceStack> set = Commands.literal("set")
4142
.then(Commands.argument("player", EntityArgument.player())

fabric/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ tasks.withType<ProcessResources> {
1414
}
1515

1616
dependencies {
17-
modApi("dev.tocraft:craftedcore-fabric:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
17+
modApi("dev.tocraft:craftedcore-fabric:${parent!!.name}-${rootProject.properties["craftedcore_version"]}") {
18+
exclude("net.fabricmc.fabric-api")
19+
exclude("com.terraformersmc")
20+
exclude("me.shedaniel.cloth")
21+
}
1822
}

forge/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ loom {
1919
}
2020

2121
dependencies {
22-
modApi("dev.tocraft:craftedcore-forge:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
22+
modApi("dev.tocraft:craftedcore-forge:${parent!!.name}-${rootProject.properties["craftedcore_version"]}") {
23+
exclude("me.shedaniel.cloth")
24+
}
2325
}

neoforge/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ tasks.withType<ProcessResources> {
1818
}
1919

2020
dependencies {
21-
modApi("dev.tocraft:craftedcore-neoforge:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
21+
modApi("dev.tocraft:craftedcore-neoforge:${parent!!.name}-${rootProject.properties["craftedcore_version"]}") {
22+
exclude("me.shedaniel.cloth")
23+
}
2224
}

0 commit comments

Comments
 (0)