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

Upgrade to 1.18.2 #20

Merged
Rover656 merged 4 commits from update/1.18.2 into dev/1.18.x 2022-03-22 21:00:22 +00:00
Conversation 3 Commits 4 Files changed 39 +151 -130
Rover656 commented 2022-03-07 11:55:53 +00:00 (Migrated from github.com)
Copy link

Description

Found some free time so I brought us up onto 1.18.2. Looks all good but needs reviewing of course.
Leaving as draft until tterrag1098/Registrate#41 is merged.

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 Found some free time so I brought us up onto 1.18.2. Looks all good but needs reviewing of course. Leaving as draft until tterrag1098/Registrate#41 is merged. # 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) requested changes 2022-03-16 14:43:59 +00:00
enderio-base/src/main/java/com/enderio/base/common/capability/fluid/AcceptingFluidItemHandler.java
@ -1,6 +1,6 @@
package com.enderio.base.common.capability.fluid;
justliliandev (Migrated from github.com) commented 2022-03-16 14:38:06 +00:00
Copy link

remove unused import

```suggestion ``` remove unused import
enderio-base/src/main/java/com/enderio/base/common/init/EIORecipes.java
@ -35,2 +29,4 @@
public static void classload() {
RECIPE_SERIALIZER_REGISTRY.register(FMLJavaModLoadingContext.get().getModEventBus());
}
}
justliliandev (Migrated from github.com) commented 2022-03-16 14:39:20 +00:00
Copy link

maybe classloading using event instead of non finalizing the Types?

maybe classloading using event instead of non finalizing the Types?
enderio-base/src/main/java/com/enderio/base/datagen/recipe/standard/MaterialRecipes.java
@ -13,7 +13,7 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.resources.ResourceLocation;
justliliandev (Migrated from github.com) commented 2022-03-16 14:42:10 +00:00
Copy link

remove unused import

```suggestion ``` remove unused import
Rover656 (Migrated from github.com) reviewed 2022-03-19 21:50:58 +00:00
enderio-base/src/main/java/com/enderio/base/common/init/EIORecipes.java
@ -35,2 +29,4 @@
public static void classload() {
RECIPE_SERIALIZER_REGISTRY.register(FMLJavaModLoadingContext.get().getModEventBus());
}
}
Rover656 (Migrated from github.com) commented 2022-03-19 21:50:54 +00:00
Copy link

Could you elaborate?

Could you elaborate?
Rover656 commented 2022-03-22 21:00:18 +00:00 (Migrated from github.com)
Copy link

Merging now :D thanks agnor for the reviews.

Merging now :D thanks agnor for the reviews.
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
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#20
No description provided.
Delete branch "update/1.18.2"

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?