upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix generic errors in new Eclipse compiler

Browse Source
This commit is contained in:
LexManos committed 2026-10-12 16:56:38 -07:00
1 parent 885eba73ba
commit 2c0fe5b985
3 files changed
+15 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/minecraft/net/minecraft/world/level/block/CrafterBlock.java.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/CrafterBlock.java
+++ b/net/minecraft/world/level/block/CrafterBlock.java
@@ -185,12 +_,15 @@
@@ -192,12 +_,15 @@
ServerLevel p_336186_, BlockPos p_312358_, CrafterBlockEntity p_309887_, ItemStack p_310474_, BlockState p_310667_, RecipeHolder<?> p_329387_
) {
Direction direction = p_310667_.getValue(ORIENTATION).front();
@@ -16,7 +16,7 @@
if (!itemstack1.isEmpty()) {
break;
}
@@ -201,10 +_,14 @@
@@ -208,10 +_,14 @@
while (!itemstack.isEmpty()) {
int i = itemstack.getCount();
itemstack = HopperBlockEntity.addItem(p_309887_, container, itemstack, direction.getOpposite());
patches/minecraft/net/minecraft/world/level/chunk/PalettedContainer.java.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/net/minecraft/world/level/chunk/PalettedContainer.java
+++ b/net/minecraft/world/level/chunk/PalettedContainer.java
@@ -56,7 +_,7 @@
private static <T, C extends PalettedContainerRO<T>> Codec<C> codec(
IdMap<T> p_238428_, Codec<T> p_238429_, PalettedContainer.Strategy p_238430_, T p_238431_, PalettedContainerRO.Unpacker<T, C> p_238432_
) {
- return RecordCodecBuilder.<PalettedContainerRO.PackedData>create(
+ return RecordCodecBuilder.<PalettedContainerRO.PackedData<T>>create(
p_327417_ -> p_327417_.group(
p_238429_.mapResult(ExtraCodecs.orElsePartial(p_238431_))
.listOf()
src/main/java/net/minecraftforge/common/util/ConcatenatedListView.java
+2 -2
View File
@@ -114,13 +114,13 @@ public class ConcatenatedListView<T> implements List<T>
@Override
public Iterator<T> iterator()
{
return Iterables.unmodifiableIterable(Iterables.concat(lists)).iterator();
return Iterables.unmodifiableIterable(Iterables.<T>concat(lists)).iterator();
}
@Override
public Spliterator<T> spliterator()
{
return Iterables.unmodifiableIterable(Iterables.concat(lists)).spliterator();
return Iterables.unmodifiableIterable(Iterables.<T>concat(lists)).spliterator();
}
// Delegate to a concatenated collection