Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downport: 1.20.1 #270

Merged
merged 19 commits into from
Jun 1, 2024
Merged

Conversation

MianReplicate
Copy link
Contributor

@MianReplicate MianReplicate commented May 14, 2024

This PR aims to port the current master branch 1.20.2 version of TR to 1.20.1 in full working state for both Neo (hopefully) and Fabric.

Can I just say that I am suffering? This port forced me to look into what a codec was to fix one (and I am 99% sure it's not fixed!)

@MianReplicate MianReplicate marked this pull request as draft May 14, 2024 06:29
@Jeryn99 Jeryn99 changed the base branch from 1.20.1-test to minecraft/1.20.1 May 15, 2024 10:34
@Olivier1152005
Copy link

Is there an easy way to download the decompiled version of the mod that is on GitHub without having to manually go to each file, download it, and then manually rebuild every file and path? Is there anything in particular you are having trouble with? I like this mod and want to help get it ported to 1.20.1.

@CommandrMoose
Copy link
Collaborator

Is there an easy way to download the decompiled version of the mod that is on GitHub without having to manually go to each file, download it, and then manually rebuild every file and path? Is there anything in particular you are having trouble with? I like this mod and want to help get it ported to 1.20.1.

I recommend looking into how git works. This PR is close to coming to a close.
https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository

@Jeryn99
Copy link
Collaborator

Jeryn99 commented May 24, 2024

Is there an easy way to download the decompiled version of the mod that is on GitHub without having to manually go to each file, download it, and then manually rebuild every file and path? Is there anything in particular you are having trouble with? I like this mod and want to help get it ported to 1.20.1.

Hello. What you are viewing is code that is cutting edge. What I mean by that is that it is so newly published that if you were to cut the review and dev process out and ran off with these files, you would end up destroying your Minecraft saves. This is a pull request for developers for tracking the port downwards and if you do not know what you are doing, you should not interact as you are hindering the process. Think of it as walking into a car factory and asking to take the car in its current state (Engine, no brakes yet though) because you love it, just wouldn't go down well

@50ap5ud5
Copy link
Member

PR source branch needs to be switched to a recently created branch called minecraft/1.20.1_port before being moved out of a draft state.

It is a copy of the porting work but rebased on top of the latest 20.2 changes. This means this PR would up to date with the latest 1.20.2 changes. Those reviewing the PR would only be seeing changes that were made during the port.

@Jeryn99
Copy link
Collaborator

Jeryn99 commented May 25, 2024

This does sound like we need to make a whole new PR?

@50ap5ud5
Copy link
Member

This does sound like we need to make a whole new PR?

Actually, I think you are right here.

I had made a new branch in case I significantly changed the commit history. It looks it wasn't the case, so if we want to continue using this PR, we just need to override the LoxiGoose:minecraft/1.20.1 branch with that of the LoxiGoose:minecraft/1.20.1_port branch.

@50ap5ud5 50ap5ud5 force-pushed the minecraft/1.20.1 branch from 5c59d27 to 394ba82 Compare May 25, 2024 23:43
@50ap5ud5
Copy link
Member

Ok, I've updated LoxiGoose:minecraft/1.20.1 to be rebased on top of WhoCraft:minecraft/1.20 changes so that we don't need to make a new PR.

@Jeryn99
Copy link
Collaborator

Jeryn99 commented May 25, 2024

we're really damn cooking

@Jeryn99 Jeryn99 marked this pull request as ready for review May 25, 2024 23:49
Copy link
Collaborator

@CommandrMoose CommandrMoose left a comment

Choose a reason for hiding this comment

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

Comments either need to be removed or please tell my why they should stay.

There's a few changes on 1.20.2's branch that should be cherry picked in, but then I'd say it is GTG

public void renderBackground(GuiGraphics guiGraphics, int i, int j, float f) {
// super.renderBackground(guiGraphics, i, j, f);
}
// @Override
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove comments

guiGraphics.blitSprite(UpgradesScreen.getFrame(upgradeEntry.getUpgradeType(), upgradeEntry.isUnlocked(upgradeHandler)), i + this.x + 3, j + this.y, 26, 26);
//blit(ResourceLocation atlasLocation, int x, int y, float uOffset, float vOffset, int width, int height, int textureWidth, int textureHeight)

// guiGraphics.blit(UpgradesScreen.getBox(upgradeEntry.isUnlocked(upgradeHandler)), i + this.x + 3, j + this.y, 0,0, 200, 26,200, 26);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove comments

// super.renderBackground(guiGraphics, i, j, f);
}
// @Override
// public void renderBackground(GuiGraphics guiGraphics, int i, int j, float f) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Going to write it for the final time here. There's lots around the place

Copy link
Member

@50ap5ud5 50ap5ud5 left a comment

Choose a reason for hiding this comment

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

This is amazing work. The refactors made in the registry classes need changes as they currently prevent the ability for add-on mods to add new entries to TARDIS Refined. It also appears to remove previous functionality, some of which can be addressed with some better documentation.

I have incorporated some of your changes into the upstream 20.2 branch so that it is closer to this implementation, but generally it would be easier for maintenance if we kept similar implementation across versions where possible.

@Jeryn99
Copy link
Collaborator

Jeryn99 commented May 27, 2024

This is amazing work. The refactors made in the registry classes need changes as they currently prevent the ability for add-on mods to add new entries to TARDIS Refined. It also appears to remove previous functionality, some of which can be addressed with some better documentation.

When getting 1.20.1 running, we ripped out all the registry stuff in favour of CustomRegistry from Regeneration/Weeping Angels as a temporary measure as the intention was to get the mod running and see what we would need to fix at runtime. CustomRegistry was always a temporary measure and I should have documented it as so. The intention post fixes was to have your registry refactor ported down

@Jeryn99
Copy link
Collaborator

Jeryn99 commented May 27, 2024

Comments either need to be removed or please tell my why they should stay.

There's a few changes on 1.20.2's branch that should be cherry picked in, but then I'd say it is GTG

All commented code has now been removed from the mod where not needed

image

@Jeryn99 Jeryn99 force-pushed the minecraft/1.20.1 branch from 3665f4b to 12b461d Compare May 30, 2024 09:56
@50ap5ud5 50ap5ud5 force-pushed the minecraft/1.20.1 branch 2 times, most recently from 3346594 to e07a551 Compare May 31, 2024 14:57
Jeryn99 and others added 8 commits June 1, 2024 14:45
-Regression: Disabled the getRegistry in order to maintain a common modding interface due to Forge registries being isolated from vanilla, and not exposing the vanilla registry
-Regression: Disabled the ability to use a vanilla Holder for registration due to Forge registries being isolated from vanilla, and not exposing the vanilla registry
-Moved default values for Patterns and data-driven registries to a method so that they can be called at a specific game loading stage due to specific modloader behaviours.
@50ap5ud5 50ap5ud5 force-pushed the minecraft/1.20.1 branch from e07a551 to 4e780f6 Compare June 1, 2024 04:45
@Jeryn99 Jeryn99 merged commit ef9050b into WhoCraft:minecraft/1.20.1 Jun 1, 2024
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.

5 participants