Skip to content

Commit 3512997

Browse files
PointerRainPointerRain
committed
Rename project
1 parent 20c6f82 commit 3512997

35 files changed

+266
-260
lines changed

‎build.gradle‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id 'fabric-loom' version '1.11-SNAPSHOT'
3-
id 'maven-publish'
2+
id 'fabric-loom' version "${loom_version}"
3+
id 'maven-publish'
44
}
55

66
version = project.mod_version
@@ -30,7 +30,7 @@ loom {
3030
splitEnvironmentSourceSets()
3131

3232
mods {
33-
"sc-name-link" {
33+
"scnicknamer" {
3434
sourceSet sourceSets.main
3535
sourceSet sourceSets.client
3636
}
@@ -60,9 +60,11 @@ dependencies {
6060

6161
processResources {
6262
inputs.property "version", project.version
63+
inputs.property "loader_version", project.loader_version
6364

6465
filesMatching("fabric.mod.json") {
65-
expand "version": inputs.properties.version
66+
expand "version": inputs.properties.version,
67+
"loader_version": inputs.properties.loader_version
6668
}
6769
}
6870

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.7
8-
yarn_mappings=1.21.7+build.6
7+
minecraft_version=1.21.8
8+
yarn_mappings=1.21.8+build.1
99
loader_version=0.16.14
1010
loom_version=1.11-SNAPSHOT
1111

1212
# Mod Properties
13-
mod_version=1.3.1
13+
mod_version=1.4.0-a4
1414
maven_group=golden.scnicknamer
1515
archives_base_name=scnicknamer
1616

1717
# Dependencies
18-
fabric_version=0.128.2+1.21.7
18+
fabric_version=0.130.0+1.21.8
1919
modmenu_version=15.0.0-beta.3
2020
clothconfig_version=19.0.147

src/client/java/golden/scnamelink/CommandManager.java renamed to src/client/java/golden/scnicknamer/CommandManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golden.scnamelink;
1+
package golden.scnicknamer;
22

33
import com.mojang.brigadier.CommandDispatcher;
44
import com.mojang.brigadier.arguments.StringArgumentType;
@@ -10,16 +10,16 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
1010
dispatcher.register(ClientCommandManager.literal("scnamelink")
1111
// .then(ClientCommandManager.literal("reload")
1212
// .executes(context -> {
13-
// SpooncraftNameLinkClient.getMappings(null);
13+
// SCNicknamerClient.getMappings(null);
1414
// context.getSource().sendFeedback(Text.literal("Reloaded SCNameLink mappings"));
1515
// return 1;
1616
// }))
1717
.then(ClientCommandManager.literal("load")
1818
.then(ClientCommandManager.argument("source", StringArgumentType.greedyString())
1919
.executes(context -> {
2020
String source = StringArgumentType.getString(context, "source");
21-
SpooncraftNameLinkClient.getMappings(source);
22-
context.getSource().sendFeedback(SpooncraftNameLinkClient.getStatusString());
21+
SCNicknamerClient.getMappings(source);
22+
context.getSource().sendFeedback(SCNicknamerClient.getStatusString());
2323
return 1;
2424
}))));
2525
}

src/client/java/golden/scnamelink/DisplayMapping.java renamed to src/client/java/golden/scnicknamer/DisplayMapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golden.scnamelink;
1+
package golden.scnicknamer;
22

33
import java.util.UUID;
44

src/client/java/golden/scnamelink/NameLinkAPI.java renamed to src/client/java/golden/scnicknamer/NameLinkAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golden.scnamelink;
1+
package golden.scnicknamer;
22

33
import com.google.gson.Gson;
44
import com.google.gson.reflect.TypeToken;

src/client/java/golden/scnamelink/SpooncraftNameLinkClient.java renamed to src/client/java/golden/scnicknamer/SCNicknamerClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package golden.scnamelink;
1+
package golden.scnicknamer;
22

3-
import golden.scnamelink.config.SCNameLinkConfig;
3+
import golden.scnicknamer.config.SCNicknamerConfig;
44
import me.shedaniel.autoconfig.AutoConfig;
55
import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
66
import net.fabricmc.api.ClientModInitializer;
@@ -18,15 +18,15 @@
1818
/**
1919
* Client-side mod initializer for the Minecraft mod "Spooncraft Name Link".
2020
*/
21-
public class SpooncraftNameLinkClient implements ClientModInitializer {
21+
public class SCNicknamerClient implements ClientModInitializer {
2222

2323
// The mod ID as used in logging
2424
static final String MOD_ID = "scnamelink";
2525

2626
// Logger for outputting information to the console and log files
2727
static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
2828

29-
static SCNameLinkConfig config;
29+
static SCNicknamerConfig config;
3030

3131
// List of mappings for replacement and optional color changes
3232
private static List<DisplayMapping> mappings = new ArrayList<>();
@@ -200,8 +200,8 @@ public static Text getStatusString() {
200200

201201
@Override
202202
public void onInitializeClient() {
203-
AutoConfig.register(SCNameLinkConfig.class, Toml4jConfigSerializer::new);
204-
config = AutoConfig.getConfigHolder(SCNameLinkConfig.class).getConfig();
203+
AutoConfig.register(SCNicknamerConfig.class, Toml4jConfigSerializer::new);
204+
config = AutoConfig.getConfigHolder(SCNicknamerConfig.class).getConfig();
205205

206206
final int count = getMappings(config.apiLink);
207207
if (count > 0) {

src/client/java/golden/scnamelink/mixin/client/ChatHudMixin.java renamed to src/client/java/golden/scnicknamer/client/ChatHudMixin.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package golden.scnamelink.mixin.client;
1+
package golden.scnicknamer.client;
22

3-
import golden.scnamelink.SpooncraftNameLinkClient;
4-
import golden.scnamelink.config.SCNameLinkConfig;
3+
import golden.scnicknamer.SCNicknamerClient;
4+
import golden.scnicknamer.config.SCNicknamerConfig;
55
import me.shedaniel.autoconfig.AutoConfig;
66
import net.minecraft.client.gui.hud.ChatHud;
77
import net.minecraft.text.Text;
@@ -12,7 +12,7 @@
1212

1313
@Mixin (ChatHud.class)
1414
public class ChatHudMixin {
15-
SCNameLinkConfig CONFIG = AutoConfig.getConfigHolder(SCNameLinkConfig.class).getConfig();
15+
SCNicknamerConfig CONFIG = AutoConfig.getConfigHolder(SCNicknamerConfig.class).getConfig();
1616

1717
@ModifyArgs (method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V",
1818
at = @At(value = "INVOKE",
@@ -25,7 +25,7 @@ public void onReceivingMessages(Args args) {
2525

2626
Text message = args.get(1);
2727

28-
args.set(1, SpooncraftNameLinkClient.getStyledChat(message, CONFIG.replacechat,
29-
CONFIG.colourchat));
28+
args.set(1, SCNicknamerClient.getStyledChat(message, CONFIG.replacechat,
29+
CONFIG.colourchat));
3030
}
3131
}

src/client/java/golden/scnamelink/mixin/client/ClientPlayNetworkHandlerMixin.java renamed to src/client/java/golden/scnicknamer/client/ClientPlayNetworkHandlerMixin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package golden.scnamelink.mixin.client;
1+
package golden.scnicknamer.client;
22

3-
import golden.scnamelink.NameLinkAPI;
4-
import golden.scnamelink.SpooncraftNameLinkClient;
3+
import golden.scnicknamer.NameLinkAPI;
4+
import golden.scnicknamer.SCNicknamerClient;
55
import net.minecraft.client.MinecraftClient;
66
import net.minecraft.client.gui.hud.ChatHud;
77
import net.minecraft.client.network.ClientPlayNetworkHandler;
@@ -17,7 +17,7 @@ public class ClientPlayNetworkHandlerMixin {
1717
public void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
1818
ChatHud chatHud = MinecraftClient.getInstance().inGameHud.getChatHud();
1919
if (chatHud != null && !NameLinkAPI.getStatus().equals("Success") && !NameLinkAPI.getStatus().equals("Disabled")) {
20-
chatHud.addMessage(SpooncraftNameLinkClient.getStatusString());
20+
chatHud.addMessage(SCNicknamerClient.getStatusString());
2121
}
2222
}
2323
}

src/client/java/golden/scnamelink/mixin/client/HoverEventMixin.java renamed to src/client/java/golden/scnicknamer/client/HoverEventMixin.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package golden.scnamelink.mixin.client;
1+
package golden.scnicknamer.client;
22

3-
import golden.scnamelink.DisplayMapping;
4-
import golden.scnamelink.SpooncraftNameLinkClient;
3+
import golden.scnicknamer.DisplayMapping;
4+
import golden.scnicknamer.SCNicknamerClient;
55
import net.minecraft.entity.EntityType;
66
import net.minecraft.text.HoverEvent;
77
import net.minecraft.text.Text;
@@ -41,10 +41,10 @@ public abstract class HoverEventMixin {
4141
this.tooltip.add(Text.translatable("gui.entity_tooltip.type",
4242
this.entityType.getName()));
4343
if (this.entityType == EntityType.PLAYER && this.name.isPresent()) {
44-
DisplayMapping mapping = SpooncraftNameLinkClient.getMapping(this.uuid,
45-
this.name.get().getString());
44+
DisplayMapping mapping = SCNicknamerClient.getMapping(this.uuid,
45+
this.name.get().getString());
4646
if (mapping != null && mapping.discord_nick != null) {
47-
this.tooltip.add(Text.translatable("gui.scnamelink.hover_nickname",
47+
this.tooltip.add(Text.translatable("gui.scnicknamer.hover_nickname",
4848
mapping.discord_nick));
4949
}
5050
}

src/client/java/golden/scnamelink/mixin/client/PlayerEntityRendererMixin.java renamed to src/client/java/golden/scnicknamer/client/PlayerEntityRendererMixin.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package golden.scnamelink.mixin.client;
1+
package golden.scnicknamer.client;
22

3-
import golden.scnamelink.SpooncraftNameLinkClient;
4-
import golden.scnamelink.config.SCNameLinkConfig;
3+
import golden.scnicknamer.SCNicknamerClient;
4+
import golden.scnicknamer.config.SCNicknamerConfig;
55

66
import me.shedaniel.autoconfig.AutoConfig;
77
import net.minecraft.client.render.entity.PlayerEntityRenderer;
@@ -16,7 +16,7 @@
1616
@Mixin (PlayerEntityRenderer.class)
1717
public abstract class PlayerEntityRendererMixin {
1818
@Unique
19-
SCNameLinkConfig CONFIG = AutoConfig.getConfigHolder(SCNameLinkConfig.class).getConfig();
19+
SCNicknamerConfig CONFIG = AutoConfig.getConfigHolder(SCNicknamerConfig.class).getConfig();
2020

2121
@ModifyArgs(method = "renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
2222
at = @At(value = "INVOKE",
@@ -29,8 +29,8 @@ protected void renderLabelIfPresent(Args args) {
2929

3030
PlayerEntityRenderState player = args.get(0);
3131
Text display_name = args.get(1);
32-
Text label = SpooncraftNameLinkClient.getStyledName(display_name, player.name,
33-
CONFIG.replacenametag, CONFIG.colournametag);
32+
Text label = SCNicknamerClient.getStyledName(display_name, player.name,
33+
CONFIG.replacenametag, CONFIG.colournametag);
3434
args.set(1, label);
3535
}
3636
}

0 commit comments

Comments
 (0)