Finish 1.19 Port #66

Merged
Rover656 merged 35 commits from 1.19-port-finish into dev/1.19.x 2022-07-27 12:54:20 +00:00
Rover656 commented 2022-07-10 20:08:44 +00:00 (Migrated from github.com)

Description

Finishes left over 1.19 things and deals with more forge breaking changes.

Fixes #67

Todo

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 Finishes left over 1.19 things and deals with more forge breaking changes. Fixes #67 # Todo <!-- Remove this section if you're submitting an already-complete PR --> - [x] Agnor's decor fixes - [x] Fix merge - [ ] Finish tidying decor - [ ] Stop using our homebrewn composite model impl - [ ] https://github.com/MinecraftForge/MinecraftForge/pull/8860 - [ ] https://github.com/MinecraftForge/MinecraftForge/pull/8794 # 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-07-20 18:34:52 +00:00
@ -0,0 +1,392 @@
package com.enderio.decoration.client.model.painted;
justliliandev (Migrated from github.com) commented 2022-07-20 18:16:54 +00:00

yep, haven't thought about that, will think about a solution for it

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
*/
justliliandev (Migrated from github.com) commented 2022-07-20 18:19:40 +00:00

Update packing/unpacking comments
Add that as a todo for me, not for you

Update packing/unpacking comments Add that as a todo for me, not for you
@ -0,0 +36,4 @@
}
}
return 0xFFFFFF;
}
justliliandev (Migrated from github.com) commented 2022-07-20 18:22:11 +00:00

move color fix todo here

move color fix todo here
justliliandev (Migrated from github.com) commented 2022-07-20 18:23:44 +00:00

remove Blocks import

remove Blocks import
@ -6,0 +18,4 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
justliliandev (Migrated from github.com) commented 2022-07-20 18:28:49 +00:00

idk, i think this is properly as this is used in 6 classes and I don't want that piece of code everywhere

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;
justliliandev (Migrated from github.com) commented 2022-07-20 18:31:09 +00:00

init as null and have a check in toJson for the referenceBlock to crash if null

init as null and have a check in toJson for the referenceBlock to crash if null
justliliandev (Migrated from github.com) commented 2022-07-20 18:00:52 +00:00

Fix Lootable back to the original lootable, so that both slabs drop

Fix Lootable back to the original lootable, so that both slabs drop
Rover656 (Migrated from github.com) reviewed 2022-07-20 19:31:57 +00:00
@ -6,0 +18,4 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
Rover656 (Migrated from github.com) commented 2022-07-20 19:31:57 +00:00

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

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
Rover656 commented 2022-07-26 01:08:25 +00:00 (Migrated from github.com)

Considering this ready for review, the remaining todos are blocked by forge, and I'm not patient enough to hold this PR any longer.

Considering this ready for review, the remaining todos are blocked by forge, and I'm not patient enough to hold this PR any longer.
justliliandev (Migrated from github.com) reviewed 2022-07-27 11:37:12 +00:00
@ -4,12 +4,12 @@ org.gradle.daemon=false
justliliandev (Migrated from github.com) commented 2022-07-27 08:36:20 +00:00

update to recommended build 41.1.0

update to recommended build 41.1.0
@ -3,13 +3,18 @@ package com.enderio.core;
import net.minecraft.resources.ResourceLocation;
justliliandev (Migrated from github.com) commented 2022-07-27 08:37:32 +00:00

remove notnull

remove notnull
@ -0,0 +5,4 @@
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
/**
justliliandev (Migrated from github.com) commented 2022-07-27 09:40:23 +00:00

can this use Either<ItemStack, FluidStack> and be a record?

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.
justliliandev (Migrated from github.com) commented 2022-07-27 09:55:55 +00:00

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)

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")))));
justliliandev (Migrated from github.com) commented 2022-07-27 10:03:26 +00:00

I really liked the old name more, as this only works with the slab block property so maybe withPaintedSlab or something would fit better

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;
justliliandev (Migrated from github.com) commented 2022-07-27 11:31:29 +00:00

move nullable to the line above

move nullable to the line above
justliliandev (Migrated from github.com) commented 2022-07-27 11:36:44 +00:00

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)

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)
justliliandev (Migrated from github.com) commented 2022-07-27 10:46:59 +00:00

why is front rendered after overlay?
if it's useless idc, but shouldn't the overlay be last?

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 {
justliliandev (Migrated from github.com) commented 2022-07-27 10:31:40 +00:00

I really don't think this comments adds to the readability

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();
justliliandev (Migrated from github.com) commented 2022-07-27 10:31:45 +00:00

I really don't think this comments adds to the readability

I really don't think this comments adds to the readability
@ -90,7 +90,7 @@ public class MachineBlock extends BaseEntityBlock {
} else {
justliliandev (Migrated from github.com) commented 2022-07-27 10:29:11 +00:00
                NetworkHooks.openScreen(serverPlayer, menuprovider, buf -> buf.writeBlockPos(pPos));
```suggestion NetworkHooks.openScreen(serverPlayer, menuprovider, buf -> buf.writeBlockPos(pPos)); ```
@ -107,6 +113,27 @@ public class AlloySmeltingRecipe implements IAlloySmeltingRecipe {
return MachineRecipes.ALLOY_SMELTING.type().get();
justliliandev (Migrated from github.com) commented 2022-07-27 10:24:04 +00:00

class definition on one line and move the comment above the public static class Container extends RecipeWrapper

class definition on one line and move the comment above the `public static class Container extends RecipeWrapper`
Rover656 (Migrated from github.com) reviewed 2022-07-27 12:17:37 +00:00
@ -0,0 +18,4 @@
public class PaintedBlockColor implements BlockColor, ItemColor {
// TODO: Buggy on the sides of blocks.
Rover656 (Migrated from github.com) commented 2022-07-27 12:17:37 +00:00

This is indeed about grass

This is indeed about grass
Rover656 (Migrated from github.com) reviewed 2022-07-27 12:17:58 +00:00
@ -107,6 +113,27 @@ public class AlloySmeltingRecipe implements IAlloySmeltingRecipe {
return MachineRecipes.ALLOY_SMELTING.type().get();
Rover656 (Migrated from github.com) commented 2022-07-27 12:17:58 +00:00

oops!

oops!
Rover656 (Migrated from github.com) reviewed 2022-07-27 12:19:15 +00:00
Rover656 (Migrated from github.com) commented 2022-07-27 12:19:15 +00:00

it doesn't really matter as they have different Z levels

it doesn't really matter as they have different Z levels
justliliandev (Migrated from github.com) reviewed 2022-07-27 12:26:03 +00:00
@ -0,0 +18,4 @@
public class PaintedBlockColor implements BlockColor, ItemColor {
// TODO: Buggy on the sides of blocks.
justliliandev (Migrated from github.com) commented 2022-07-27 12:26:03 +00:00

Okay, will have a thought about that

Okay, will have a thought about that
justliliandev (Migrated from github.com) approved these changes 2022-07-27 12:36:00 +00:00
Sign in to join this conversation.
No reviewers
No project
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#66
No description provided.