Skip to content

Commit 6647daa

Browse files
robotgryphonrobotgryphon
committed
Reintroduce JADE support and debug/F3 showing room owner info
1 parent deda03e commit 6647daa

File tree

8 files changed

+211
-136
lines changed

8 files changed

+211
-136
lines changed

‎gradle/mods.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jei = "17.3.0.49"
44
# Jade
55
[libraries.jade]
66
module = "curse.maven:jade-324717"
7-
version = "5109393"
7+
version = "6853386"
88

99
# Just Enough Items
1010
[libraries.jeiCommon]

‎neoforge-main/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ dependencies {
240240
// KubeJS Support
241241
compileOnly(mods.kubeJS)
242242
compileOnly(mods.rhino)
243+
244+
// Jade Support
245+
compileOnly(mods.jade)
243246
}
244247

245248
tasks.withType<Test> {

neoforge-main/src/main/java/dev/compactmods/machines/client/render/PlayerFaceRenderer.java renamed to neoforge-main/src/main/java/dev/compactmods/machines/client/render/CMPlayerFaceRenderer.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package dev.compactmods.machines.client.render;
22

33
import com.mojang.authlib.GameProfile;
4-
import com.mojang.blaze3d.vertex.PoseStack;
54
import net.minecraft.Util;
65
import net.minecraft.client.Minecraft;
76
import net.minecraft.client.gui.GuiGraphics;
87

9-
public class PlayerFaceRenderer {
8+
public class CMPlayerFaceRenderer {
109
public static final GameProfile EMPTY_PROFILE = new GameProfile(Util.NIL_UUID, "Empty Player");
1110

12-
public static void render(GameProfile profile, GuiGraphics graphics, PoseStack poseStack, int x, int y) {
11+
public static void render(GameProfile profile, GuiGraphics graphics, int x, int y, int size) {
1312
final var skins = Minecraft.getInstance().getSkinManager();
1413
final var playerSkin = skins.getInsecureSkin(profile);
1514

1615
// pose, x, y, ???, hatLayer, upsideDown
17-
net.minecraft.client.gui.components.PlayerFaceRenderer.draw(graphics, playerSkin.texture(), x, y, 12, false, false);
16+
net.minecraft.client.gui.components.PlayerFaceRenderer.draw(graphics, playerSkin.texture(), x, y, size, false, false);
1817
}
1918
}

‎neoforge-main/src/main/java/dev/compactmods/machines/compat/jade/BoundMachineProviders.java‎

Lines changed: 101 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,101 @@
1-
//package dev.compactmods.machines.compat.jade;
2-
//
3-
//import com.mojang.authlib.GameProfile;
4-
//import dev.compactmods.machines.api.CompactMachinesApi;
5-
//import dev.compactmods.machines.i18n.MachineTranslations;
6-
//import dev.compactmods.machines.api.room.CompactMachines.roomApi();
7-
//import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
8-
//import net.minecraft.ChatFormatting;
9-
//import net.minecraft.Util;
10-
//import net.minecraft.nbt.CompoundTag;
11-
//import net.minecraft.network.chat.Component;
12-
//import net.minecraft.resources.ResourceLocation;
13-
//import snownee.jade.api.BlockAccessor;
14-
//import snownee.jade.api.IBlockComponentProvider;
15-
//import snownee.jade.api.IServerDataProvider;
16-
//import snownee.jade.api.ITooltip;
17-
//import snownee.jade.api.config.IPluginConfig;
18-
//
19-
//public class BoundMachineProviders {
20-
//
21-
// public static final ResourceLocation UID = CompactMachinesApi.modRL("bound_machine");
22-
//
23-
// public static final IBlockComponentProvider COMPONENT_PROVIDER = new IBlockComponentProvider() {
24-
// @Override
25-
// public void appendTooltip(ITooltip tooltip, BlockAccessor blockAccessor, IPluginConfig config) {
26-
// final var serverData = blockAccessor.getServerData();
27-
//
28-
// if (config.get(CompactMachinesApi.modRL("show_owner")) && serverData.contains("owner")) {
29-
// final var owner = blockAccessor.getLevel().getPlayerByUUID(serverData.getUUID("owner"));
30-
// if (owner != null) {
31-
// GameProfile ownerProfile = owner.getGameProfile();
32-
// tooltip.add(Component
33-
// .translatable(MachineTranslations.IDs.OWNER, ownerProfile.getName())
34-
// .withStyle(ChatFormatting.GRAY));
35-
// }
36-
// }
37-
//
38-
// if (serverData.contains("room_code")) {
39-
// tooltip.add(Component
40-
// .translatable(MachineTranslations.IDs.BOUND_TO, serverData.getString("room_code"))
41-
// .withStyle(ChatFormatting.DARK_GRAY));
42-
// }
43-
// }
44-
//
45-
// @Override
46-
// public ResourceLocation getUid() {
47-
// return UID;
48-
// }
49-
// };
50-
//
51-
// public static final IServerDataProvider<BlockAccessor> SERVER_DATA = new IServerDataProvider<>() {
52-
// @Override
53-
// public void appendServerData(CompoundTag tag, BlockAccessor blockAccessor) {
54-
// final var player = blockAccessor.getPlayer();
55-
// if (blockAccessor.getBlockEntity() instanceof BoundCompactMachineBlockEntity machine) {
56-
// var owner = machine.getOwnerUUID().orElse(Util.NIL_UUID);
57-
// tag.putUUID("owner", owner);
58-
//
59-
// CompactMachines.roomApi().room(machine.connectedRoom()).ifPresent(inst -> {
60-
// tag.putString("room_code", inst.code());
61-
// });
62-
// }
63-
// }
64-
//
65-
// @Override
66-
// public ResourceLocation getUid() {
67-
// return UID;
68-
// }
69-
// };
70-
//}
1+
package dev.compactmods.machines.compat.jade;
2+
3+
import com.mojang.authlib.GameProfile;
4+
import com.mojang.serialization.Codec;
5+
import dev.compactmods.machines.api.CompactMachines;
6+
import dev.compactmods.machines.api.attachment.CMDataAttachments;
7+
import dev.compactmods.machines.i18n.MachineTranslations;
8+
import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
9+
import dev.compactmods.machines.room.Rooms;
10+
import net.minecraft.ChatFormatting;
11+
import net.minecraft.core.UUIDUtil;
12+
import net.minecraft.nbt.CompoundTag;
13+
import net.minecraft.network.chat.Component;
14+
import net.minecraft.resources.ResourceLocation;
15+
import net.minecraft.util.Mth;
16+
import net.minecraft.world.item.ItemStack;
17+
import net.minecraft.world.phys.Vec2;
18+
import snownee.jade.api.BlockAccessor;
19+
import snownee.jade.api.IBlockComponentProvider;
20+
import snownee.jade.api.IServerDataProvider;
21+
import snownee.jade.api.ITooltip;
22+
import snownee.jade.api.config.IPluginConfig;
23+
import snownee.jade.api.ui.BoxStyle;
24+
import snownee.jade.api.ui.IBoxElement;
25+
import snownee.jade.api.ui.IElement;
26+
import snownee.jade.api.ui.IElementHelper;
27+
import snownee.jade.api.ui.ScreenDirection;
28+
import snownee.jade.impl.ui.ElementHelper;
29+
30+
public class BoundMachineProviders {
31+
32+
public static final ResourceLocation UID = CompactMachines.modRL("bound_machine");
33+
34+
public static final IBlockComponentProvider COMPONENT_PROVIDER = new IBlockComponentProvider() {
35+
@Override
36+
public void appendTooltip(ITooltip tooltip, BlockAccessor blockAccessor, IPluginConfig config) {
37+
final var serverData = blockAccessor.getServerData();
38+
39+
final var el = IElementHelper.get();
40+
41+
if (serverData.contains("room_code")) {
42+
final var boundTxt = el.text(Component
43+
.literal(serverData.getString("room_code"))
44+
.withStyle(ChatFormatting.DARK_GRAY));
45+
46+
tooltip.add(boundTxt);
47+
}
48+
49+
if (config.get(CompactMachines.modRL("show_owner")) && serverData.contains("owner")) {
50+
final var owner = blockAccessor.getLevel().getPlayerByUUID(serverData.getUUID("owner"));
51+
if (owner != null) {
52+
GameProfile ownerProfile = owner.getGameProfile();
53+
54+
final var face = new PlayerFaceElement(ownerProfile)
55+
.size(new Vec2(12, 12))
56+
.message(null);
57+
58+
var ownerName = el.text(Component
59+
.translatable(MachineTranslations.IDs.OWNER, ownerProfile.getName())
60+
.withStyle(ChatFormatting.DARK_GRAY));
61+
62+
int sizeDiffY = Mth.floor(face.getSize().y - ownerName.getSize().y) / 2;
63+
ownerName.translate(new Vec2(0, sizeDiffY));
64+
65+
var ownerTT = el.tooltip();
66+
ownerTT.add(face);
67+
ownerTT.append(el.spacer(4, 0));
68+
ownerTT.append(ownerName);
69+
70+
var box = el.box(ownerTT, BoxStyle.getTransparent());
71+
tooltip.add(box);
72+
}
73+
}
74+
}
75+
76+
@Override
77+
public ResourceLocation getUid() {
78+
return UID;
79+
}
80+
};
81+
82+
public static final IServerDataProvider<BlockAccessor> SERVER_DATA = new IServerDataProvider<>() {
83+
@Override
84+
public void appendServerData(CompoundTag tag, BlockAccessor blockAccessor) {
85+
final var player = blockAccessor.getPlayer();
86+
if (blockAccessor.getBlockEntity() instanceof BoundCompactMachineBlockEntity machine) {
87+
CompactMachines.room(machine.connectedRoom()).ifPresent(inst -> {
88+
tag.store("room_code", Codec.STRING, inst.code());
89+
inst.getExistingData(CMDataAttachments.ROOM_OWNER).ifPresent(owner -> {
90+
tag.store("owner", UUIDUtil.CODEC, owner);
91+
});
92+
});
93+
}
94+
}
95+
96+
@Override
97+
public ResourceLocation getUid() {
98+
return UID;
99+
}
100+
};
101+
}

‎neoforge-main/src/main/java/dev/compactmods/machines/compat/jade/CMJadePlugin.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
//package dev.compactmods.machines.compat.jade;
2-
//
3-
//import dev.compactmods.machines.api.CompactMachinesApi;
4-
//import dev.compactmods.machines.machine.block.BoundCompactMachineBlock;
5-
//import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
6-
//import snownee.jade.api.IWailaClientRegistration;
7-
//import snownee.jade.api.IWailaCommonRegistration;
8-
//import snownee.jade.api.IWailaPlugin;
9-
//import snownee.jade.api.WailaPlugin;
10-
//
11-
//@WailaPlugin
12-
//public class CMJadePlugin implements IWailaPlugin {
13-
//
14-
// @Override
15-
// public void register(IWailaCommonRegistration registration) {
16-
// registration.registerBlockDataProvider(BoundMachineProviders.SERVER_DATA, BoundCompactMachineBlockEntity.class);
17-
// }
18-
//
19-
// @Override
20-
// public void registerClient(IWailaClientRegistration registration) {
21-
// registration.addConfig(CompactMachinesApi.modRL("show_owner"), false);
22-
//
23-
// registration.registerBlockComponent(BoundMachineProviders.COMPONENT_PROVIDER, BoundCompactMachineBlock.class);
24-
// }
25-
//
26-
//}
1+
package dev.compactmods.machines.compat.jade;
2+
3+
import dev.compactmods.machines.api.CompactMachines;
4+
import dev.compactmods.machines.machine.block.BoundCompactMachineBlock;
5+
import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
6+
import snownee.jade.api.IWailaClientRegistration;
7+
import snownee.jade.api.IWailaCommonRegistration;
8+
import snownee.jade.api.IWailaPlugin;
9+
import snownee.jade.api.WailaPlugin;
10+
11+
@WailaPlugin
12+
public class CMJadePlugin implements IWailaPlugin {
13+
14+
@Override
15+
public void register(IWailaCommonRegistration registration) {
16+
registration.registerBlockDataProvider(BoundMachineProviders.SERVER_DATA, BoundCompactMachineBlockEntity.class);
17+
}
18+
19+
@Override
20+
public void registerClient(IWailaClientRegistration registration) {
21+
registration.addConfig(CompactMachines.modRL("show_owner"), false);
22+
23+
registration.registerBlockComponent(BoundMachineProviders.COMPONENT_PROVIDER, BoundCompactMachineBlock.class);
24+
}
25+
26+
}

‎neoforge-main/src/main/java/dev/compactmods/machines/compat/jade/PlayerFaceElement.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package dev.compactmods.machines.compat.jade;
2+
3+
import com.mojang.authlib.GameProfile;
4+
import dev.compactmods.machines.client.render.CMPlayerFaceRenderer;
5+
import net.minecraft.client.gui.GuiGraphics;
6+
import net.minecraft.world.phys.Vec2;
7+
import snownee.jade.api.ui.Element;
8+
9+
public class PlayerFaceElement extends Element {
10+
11+
private final GameProfile profile;
12+
13+
public PlayerFaceElement(GameProfile profile) {
14+
this.profile = profile;
15+
this.size = new Vec2(12, 12);
16+
this.translation = Vec2.ZERO;
17+
this.message = null;
18+
}
19+
20+
@Override
21+
public Vec2 getSize() {
22+
return size;
23+
}
24+
25+
@Override
26+
public void render(GuiGraphics guiGraphics, float x, float y, float xMax, float yMax) {
27+
CMPlayerFaceRenderer.render(profile, guiGraphics, (int) x, (int) y, (int) size.x);
28+
}
29+
}

‎neoforge-main/src/main/java/dev/compactmods/machines/machine/block/UnboundCompactMachineBlock.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
9292
// Set up binding and enter
9393
level.getBlockEntity(pos, Machines.BlockEntities.MACHINE.get()).ifPresent(ent -> {
9494
ent.setConnectedRoom(newRoom.code());
95+
ent.setOwner(sp.getUUID());
9596
ent.setData(CMDataAttachments.MACHINE_COLOR, color);
9697

9798
try {

0 commit comments

Comments
 (0)