Skip to content

Conversation

@diemoell
Copy link
Contributor

Some EventBusSubscriber, ResourceLocation and ServerTickEvent related code has been updated to 1.21, but the network and the new Data Component still need to be changed

@zyxkad
Copy link
Collaborator

zyxkad commented Jan 1, 2025

@diemoell This have some commits duplicated with #676 .
Can you make all the change in #676? or do not include duplicate commits here.
If #676's change is mandatory, and you want to keep them separate, can you open this after #676 get merged?

Otherwise, the commit and merge messages will be a mess.

@diemoell diemoell mentioned this pull request Jan 1, 2025
@diemoell
Copy link
Contributor Author

diemoell commented Jan 1, 2025

@diemoell这有一些与#676重复的提交。你可以在#676 中进行所有更改吗?或者不要在这里包含重复的提交。 如果#676的更改是前面的,并且你想将它们分开,那么你能在#676合并后打开它吗?

否则,提交和合并消息就会很混乱。

Okay, I'll close #676 and commit all changes here


public void initiate() {
api.getNetworkNodeRegistry().add(new ResourceLocation(AdvancedPeripherals.MOD_ID, "rs_bridge"), (tag, world, pos) -> read(tag, new RefinedStorageNode(world, pos)));
api.getNetworkNodeRegistry().add(ResourceLocation.fromNamespaceAndPath(AdvancedPeripherals.MOD_ID, "rs_bridge"), (tag, world, pos) -> read(tag, new RefinedStorageNode(world, pos)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving to AdvancedPeripherals.getRL would be neat

@Override
public ResourceLocation getId() {
return new ResourceLocation(AdvancedPeripherals.MOD_ID, "rs_bridge");
return ResourceLocation.fromNamespaceAndPath(AdvancedPeripherals.MOD_ID, "rs_bridge");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving to AdvancedPeripherals.getRL would be neat

@Override
public ResourceLocation getTexture() {
return new ResourceLocation(AdvancedPeripherals.MOD_ID, "textures/gui/inventory_manager_gui.png");
return ResourceLocation.fromNamespaceAndPath(AdvancedPeripherals.MOD_ID, "textures/gui/inventory_manager_gui.png");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving to AdvancedPeripherals.getRL would be neat

public static void registerModels(ModelEvent.RegisterAdditional event) {
for (String model : TURTLE_MODELS) {
event.register(new ModelResourceLocation(new ResourceLocation(AdvancedPeripherals.MOD_ID, model), "inventory"));
event.register(new ModelResourceLocation(ResourceLocation.fromNamespaceAndPath(AdvancedPeripherals.MOD_ID, model), "inventory"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving to AdvancedPeripherals.getRL would be neat

@diemoell diemoell requested a review from SirEndii January 2, 2025 02:51
@SirEndii
Copy link
Member

SirEndii commented Jan 2, 2025

LGTM

@SirEndii SirEndii merged commit 0599fed into IntelligenceModding:dev/1.21.1 Jan 2, 2025
1 check failed
@SirEndii SirEndii mentioned this pull request Jan 15, 2025
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants