Team-EnderIO/EnderIO

Fork

You've already forked EnderIO

Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

[TRACKING] 1.20.1 #129

Merged

Rover656 merged 18 commits from update/1.20.1 into dev/1.20.1

2023-06-25 13:39:28 +00:00

Conversation 5 Commits 18 Files changed 1763 +3891 -2253

Rover656 commented

2023-06-24 00:19:31 +00:00

(Migrated from github.com)

Copy link

Description

This is a tracking PR for 1.20.1 porting. Will not merge for a while.

Closes #128

Todo

#128 (maybe)
Fix rotating gears not rotating
Check misc. todos, especially regarding the transition to GuiGraphics
Some code review, try and tidy some stuff before we hit the new version.
Deal with lack of defaultModel and defaultLang from Registrate. This is either a bug or an API change, waiting to hear which.

Blockers

This PR is big, and will 100% break other branches. To make sure people's work isn't lost, all PRs before a certain point will be merged. As of now, there is no deadline for this as we're not committing to a 1.20.1 switch date, but listing the one's I am aware of here.

#127
#126
#121

Any stale PRs are being omitted from this list simply to not hold up the queue. Any PRs that predate this should ideally continue to target 1.19.4 (some may need updating) however if you have planned changes, ask in Discord first as you may want to start working in 1.20.1.

Checklist:

My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you)
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation

# Description This is a tracking PR for 1.20.1 porting. Will not merge for a while. Closes #128 # Todo  - [x] #128 (maybe) - [x] Fix rotating gears not rotating - [x] Check misc. todos, especially regarding the transition to GuiGraphics - [x] Some code review, try and tidy some stuff before we hit the new version. - [x] Deal with lack of defaultModel and defaultLang from Registrate. This is either a bug or an API change, waiting to hear which. # Blockers This PR is big, and will 100% break other branches. To make sure people's work isn't lost, all PRs before a certain point will be merged. As of now, there is no deadline for this as we're not committing to a 1.20.1 switch date, but listing the one's I am aware of here. - [x] #127 - [ ] #126 - [x] #121 Any stale PRs are being omitted from this list simply to not hold up the queue. Any PRs that predate this should ideally continue to target 1.19.4 (some may need updating) however if you have planned changes, ask in Discord first as you may want to start working in 1.20.1. # Checklist: - [x] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you) - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation

justliliandev (Migrated from github.com) reviewed

2023-06-25 12:24:29 +00:00

justliliandev (Migrated from github.com) left a comment

Copy link

looks good to me

src/conduits/java/com/enderio/conduits/common/integrations/ae2/AE2InWorldConduitNodeHost.java

justliliandev (Migrated from github.com) commented

2023-06-25 11:58:29 +00:00

Copy link

onSecurityBreach is missing @override and because of the securitysystem being gone that method should be removed entirely

src/core/java/com/enderio/core/client/gui/widgets/EnumIconWidget.java

					
				@ -120,3 +120,2 @@

				    @Nullable

				    private T tooltipDisplayCache;

				    @Nullable private T tooltipDisplayCache;

justliliandev (Migrated from github.com) commented

2023-06-25 12:07:17 +00:00

Copy link

has this one parameter really be on it's own line because it's too long? maybe disable formatting before this line and enable after this one or extract the tooltipformatting

src/main/java/com/enderio/base/common/block/IndustrialInsulationBlock.java

					
				@ -17,3 +14,4 @@

				// TODO: 1.20.1, why does this do custom work?

				public class IndustrialInsulationBlock extends SpongeBlock {

				    private static final int MAX_REPLACES = 64;

				    private static final int MAX_RANGE = 6;

justliliandev (Migrated from github.com) commented

2023-06-25 12:21:22 +00:00

Copy link

what do you mean by this?

Rover656 (Migrated from github.com) reviewed

2023-06-25 13:24:17 +00:00

src/main/java/com/enderio/base/common/block/IndustrialInsulationBlock.java

					
				@ -17,3 +14,4 @@

				// TODO: 1.20.1, why does this do custom work?

				public class IndustrialInsulationBlock extends SpongeBlock {

				    private static final int MAX_REPLACES = 64;

				    private static final int MAX_RANGE = 6;

Rover656 (Migrated from github.com) commented

2023-06-25 13:24:16 +00:00

Copy link

I was wondering why this has logic in addition to the base sponge block

Rover656 commented

2023-06-25 13:26:30 +00:00

(Migrated from github.com)

Copy link

Once that final comment is resolved, going to merge this in and get rolling with 1.20 bits and bobs. Recipes will be merged and ported shortly after review.

justliliandev (Migrated from github.com) reviewed

2023-06-25 13:36:44 +00:00

src/main/java/com/enderio/base/common/block/IndustrialInsulationBlock.java

					
				@ -17,3 +14,4 @@

				// TODO: 1.20.1, why does this do custom work?

				public class IndustrialInsulationBlock extends SpongeBlock {

				    private static final int MAX_REPLACES = 64;

				    private static final int MAX_RANGE = 6;

justliliandev (Migrated from github.com) commented

2023-06-25 13:36:44 +00:00

Copy link

it voids all fluids, not just water

Rover656 (Migrated from github.com) reviewed

2023-06-25 13:37:09 +00:00

src/main/java/com/enderio/base/common/block/IndustrialInsulationBlock.java

					
				@ -17,3 +14,4 @@

				// TODO: 1.20.1, why does this do custom work?

				public class IndustrialInsulationBlock extends SpongeBlock {

				    private static final int MAX_REPLACES = 64;

				    private static final int MAX_RANGE = 6;

Rover656 (Migrated from github.com) commented

2023-06-25 13:37:09 +00:00

Copy link

ahh so it does! Thats all good then ill drop the comment and merge :)

Reviewers

No reviewers

Labels

Clear labels

Area-Assets

Area-Backend

Backend work not usually visible to players.

Area-Conduits

Everything involving conduits

1.12.2 missing features

Area-Rendering

Rendering code, might be shaders specific or general.

High priority, crash/breaking.

P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

P-2-Low

Low priority. Not hurting anyone, just annoying.

Status-Awaiting Response

Waiting for OP to respond

Status-Behind-Flag

This change is available but is placed behind a feature flag.

Status-Blocked

Blocked by a specific issue or protocol.

Status-Cannot Reproduce

Status-Duplicate

This issue or pull request already exists

Status-Help Wanted

We need some help to try and track this thing down..

Status-Incomplete Report

Status-Invalid

This doesn't seem right

Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

Status-Needs Updating

Needs updating to a newer Minecraft version.

Status-Stale

This may not be updated by the OP any further.

Status-To Implement

Status-Triage

A Triage Member should take a look at this

Status-Wontfix

This will not be worked on

Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

Improvements or additions to documentation

Type-Enhancement

New feature or enhancement to existing feature.

Type-Question

Further information is requested

Type-RFC

Request for comments.

No labels

Status-Awaiting Response

Status-Behind-Flag

Status-Blocked

Status-Cannot Reproduce

Status-Duplicate

Status-Help Wanted

Status-Incomplete Report

Status-Invalid

Status-Needs LTS Backport

Status-Needs Updating

Milestone

Clear milestone

No items

No milestone

First Alpha Release (v6.0)

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#129

Reference in a new issue

Repository

Team-EnderIO/EnderIO

Title

Body

No description provided.

Delete branch "update/1.20.1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?

Rows
Columns