Finish 1.19 Port #66
No reviewers
Labels
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
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: Team-EnderIO/EnderIO#66
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "1.19-port-finish"
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?
Description
Finishes left over 1.19 things and deals with more forge breaking changes.
Fixes #67
Todo
Checklist:
@ -0,0 +1,392 @@package com.enderio.decoration.client.model.painted;yep, haven't thought about that, will think about a solution for it
@ -0,0 +318,4 @@* @param sprite sprite that should be used* @param shouldTint is that quad on the texture tinted* @return a new Quad with the same coordinates but a different texture*/Update packing/unpacking comments
Add that as a todo for me, not for you
@ -0,0 +36,4 @@}}return 0xFFFFFF;}move color fix todo here
remove Blocks import
@ -6,0 +18,4 @@import java.util.List;import java.util.Objects;import java.util.Optional;idk, i think this is properly as this is used in 6 classes and I don't want that piece of code everywhere
@ -0,0 +1,50 @@package com.enderio.decoration.data.model.block;init as null and have a check in toJson for the referenceBlock to crash if null
Fix Lootable back to the original lootable, so that both slabs drop
@ -6,0 +18,4 @@import java.util.List;import java.util.Objects;import java.util.Optional;if we are to keep something like this, it would be better in a generic core class, but I really don't think it's good practice imo
Considering this ready for review, the remaining todos are blocked by forge, and I'm not patient enough to hold this PR any longer.
@ -4,12 +4,12 @@ org.gradle.daemon=falseupdate to recommended build 41.1.0
@ -3,13 +3,18 @@ package com.enderio.core;import net.minecraft.resources.ResourceLocation;remove notnull
@ -0,0 +5,4 @@import net.minecraft.world.item.ItemStack;import net.minecraftforge.fluids.FluidStack;/**can this use Either<ItemStack, FluidStack> and be a record?
@ -0,0 +18,4 @@public class PaintedBlockColor implements BlockColor, ItemColor {// TODO: Buggy on the sides of blocks.you probably refer to grass, but that's not a problem of the BlockColor, but of the PaintedModel, because I search for a single texture, while grass uses 2 (one for the dirt part and one for the dynamic colored grass (I'll maybe revistit that in the future)) (no need to act here rn, but would be cool, if you could confirm, that this todo was about grass)
@ -0,0 +19,4 @@loot.add(block, LootTable.lootTable().withPool(new LootPool.Builder().add(LootItem.lootTableItem(block).apply(CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY).copy("paint", "BlockEntityTag.paint")))));I really liked the old name more, as this only works with the slab block property so maybe withPaintedSlab or something would fit better
@ -0,0 +1,50 @@package com.enderio.decoration.data.model.block;move nullable to the line above
add message to requireNonNull, so there is a difference in the log between both calls (or remove the nonNull check before the toString on the RL, so that it's a defaulted with the normal NullPointerException)
why is front rendered after overlay?
if it's useless idc, but shouldn't the overlay be last?
@ -33,30 +32,27 @@ public class FluidTankBEWLR extends BlockEntityWithoutLevelRenderer {I really don't think this comments adds to the readability
@ -65,13 +61,12 @@ public class FluidTankBEWLR extends BlockEntityWithoutLevelRenderer {}PoseStack.Pose pose = poseStack.last();I really don't think this comments adds to the readability
@ -90,7 +90,7 @@ public class MachineBlock extends BaseEntityBlock {} else {@ -107,6 +113,27 @@ public class AlloySmeltingRecipe implements IAlloySmeltingRecipe {return MachineRecipes.ALLOY_SMELTING.type().get();class definition on one line and move the comment above the
public static class Container extends RecipeWrapper@ -0,0 +18,4 @@public class PaintedBlockColor implements BlockColor, ItemColor {// TODO: Buggy on the sides of blocks.This is indeed about grass
@ -107,6 +113,27 @@ public class AlloySmeltingRecipe implements IAlloySmeltingRecipe {return MachineRecipes.ALLOY_SMELTING.type().get();oops!
it doesn't really matter as they have different Z levels
@ -0,0 +18,4 @@public class PaintedBlockColor implements BlockColor, ItemColor {// TODO: Buggy on the sides of blocks.Okay, will have a thought about that