Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

[WIP Tracker] Update to 1.19 #57

Merged
Rover656 merged 32 commits from update/1.19 into dev/1.19.x 2022-06-30 20:09:40 +00:00
Conversation 8 Commits 32 Files changed 7604 +78419 -80103
Rover656 commented 2022-06-17 14:52:13 +00:00 (Migrated from github.com)
Copy link

Description

Slowly working on porting to 1.19. Will not build let alone run yet.
Waiting for us to be able to run on latest forge with registrate before merge.

Fixes #59

Todo

  • Buildable
  • Runnable
  • Fix issues
  • Tidy the new code
  • Review old practice, make sure we're following standards.
  • Wait for PR's to be merged
  • Fix merge
  • Upgrade to latest forge
  • Wait for registrate
  • Wait for registrate to update past fluid rework
  • New codesplitting technique

Issues:

  • Energy and progress tooltips don't display numbers
  • Fix door datagen MinecraftForge/MinecraftForge#8687
  • Check datagen is fixed in EIODecor once we bump past forge 41.0.41

Note: this PR got big, so some of the 1.19 porting stuff will continue in future PRs now. Just waiting for the Registrate PR then we'll merge.

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 Slowly working on porting to 1.19. Will not build let alone run yet. Waiting for us to be able to run on latest forge with registrate before merge. Fixes #59 # Todo - [x] Buildable - [x] Runnable - [ ] Fix issues - [ ] Tidy the new code - [ ] Review old practice, make sure we're following standards. - [x] Wait for PR's to be merged - [x] Fix merge - [x] Upgrade to latest forge - [x] Wait for registrate - [ ] Wait for registrate to update past fluid rework - [x] New codesplitting technique # Issues: - [x] Energy and progress tooltips don't display numbers - [ ] Fix door datagen [MinecraftForge/MinecraftForge#8687](https://github.com/MinecraftForge/MinecraftForge/pull/8687) - [x] Check datagen is fixed in EIODecor once we bump past forge 41.0.41 **Note:** this PR got big, so some of the 1.19 porting stuff will continue in future PRs now. Just waiting for the Registrate PR then we'll merge. # 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 <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
justliliandev (Migrated from github.com) reviewed 2022-06-17 16:32:19 +00:00
build.gradle
@ -398,1 +104,3 @@
})
enderio {
source sourceSets.api
source sourceSets.core
justliliandev (Migrated from github.com) commented 2022-06-17 15:56:43 +00:00
Copy link

Those seem to be available

Those seem to be available
enderio-base/src/main/java/com/enderio/base/EnderIO.java
justliliandev (Migrated from github.com) commented 2022-06-17 15:58:31 +00:00
Copy link

is star import wanted?

is star import wanted?
enderio-base/src/main/java/com/enderio/base/common/item/LocationPrintoutItem.java
justliliandev (Migrated from github.com) commented 2022-06-17 16:26:15 +00:00
Copy link

Component.empty()

Component.empty()
enderio-base/src/main/java/com/enderio/base/common/loot/CapacitorLootModifier.java
justliliandev (Migrated from github.com) commented 2022-06-17 16:28:43 +00:00
Copy link

everything is notnull by default

everything is notnull by default
Rover656 (Migrated from github.com) reviewed 2022-06-17 16:33:17 +00:00
build.gradle
@ -398,1 +104,3 @@
})
enderio {
source sourceSets.api
source sourceSets.core
Rover656 (Migrated from github.com) commented 2022-06-17 16:33:17 +00:00
Copy link

They are now, but weren't when I started the port branch :)

They are now, but weren't when I started the port branch :)
Rover656 (Migrated from github.com) reviewed 2022-06-17 16:33:59 +00:00
enderio-base/src/main/java/com/enderio/base/EnderIO.java
Rover656 (Migrated from github.com) commented 2022-06-17 16:33:59 +00:00
Copy link

I don't think it hurts anything really, unless we really want to avoid wildcards. but to be fair all init classes are used for init.

I don't think it hurts anything really, unless we really want to avoid wildcards. but to be fair all init classes are used for init.
justliliandev (Migrated from github.com) reviewed 2022-06-17 16:42:13 +00:00
enderio-base/src/main/java/com/enderio/base/EnderIO.java
justliliandev (Migrated from github.com) commented 2022-06-17 16:42:13 +00:00
Copy link

alright

alright
justliliandev (Migrated from github.com) reviewed 2022-06-30 11:53:08 +00:00
build.gradle
@ -411,0 +230,4 @@
"Specification-Vendor" : "SleepyTrousers",
"Specification-Version" : "1",
"Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion,
justliliandev (Migrated from github.com) commented 2022-06-30 10:35:58 +00:00
Copy link

since we don't provide any modules this should all be enderio-<mc-version>, right?

since we don't provide any modules this should all be enderio-\<mc-version\>, right?
Rover656 (Migrated from github.com) reviewed 2022-06-30 16:12:48 +00:00
build.gradle
@ -411,0 +230,4 @@
"Specification-Vendor" : "SleepyTrousers",
"Specification-Version" : "1",
"Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion,
Rover656 (Migrated from github.com) commented 2022-06-30 16:12:47 +00:00
Copy link

correct, i missed this when copying this block :P

correct, i missed this when copying this block :P
Rover656 commented 2022-06-30 19:08:12 +00:00 (Migrated from github.com)
Copy link

Gonna go for merging this soon, waiting for the build to hopefully pass first

Gonna go for merging this soon, waiting for the build to hopefully pass first
justliliandev (Migrated from github.com) approved these changes 2022-06-30 19:41:29 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
justliliandev
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

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.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

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.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
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
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
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#57
No description provided.
Delete branch "update/1.19"

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?