Fix compile issues

Author: lynxplay

versions/26.3-snapshot-8/patches/net/minecraft/server/commands/PlaceCommand.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/commands/PlaceCommand.java
 +++ b/net/minecraft/server/commands/PlaceCommand.java
-@@ -71,14 +_,14 @@
+@@ -72,14 +_,14 @@
                  .then(
                      Commands.literal("feature")
                          .then(

versions/26.3-snapshot-8/patches/net/minecraft/util/Util.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/Util.java
 +++ b/net/minecraft/util/Util.java
-@@ -629,7 +_,7 @@
+@@ -634,7 +_,7 @@
      public static <K extends Enum<K>, V> Map<K, V> makeEnumMap(final Class<K> keyType, final Function<K, V> function) {
          EnumMap<K, V> map = new EnumMap<>(keyType);
 

versions/26.3-snapshot-8/patches/net/minecraft/util/datafix/DataFixers.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1184,7 +_,7 @@
+@@ -1185,7 +_,7 @@
          );
          Schema v3086 = fixerUpper.addSchema(3086, SAME_NAMESPACED);
          fixerUpper.addFixer(
@@ -9,7 +9,7 @@
                  m.defaultReturnValue("minecraft:tabby");
                  m.put(0, "minecraft:tabby");
                  m.put(1, "minecraft:black");
-@@ -1220,7 +_,7 @@
+@@ -1221,7 +_,7 @@
          Schema v3087 = fixerUpper.addSchema(3087, SAME_NAMESPACED);
          fixerUpper.addFixer(
              new EntityVariantFix(

versions/26.3-snapshot-8/patches/net/minecraft/world/entity/SteppedInterpolationHandler.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/SteppedInterpolationHandler.java
 +++ b/net/minecraft/world/entity/SteppedInterpolationHandler.java
-@@ -133,25 +_,7 @@
+@@ -122,25 +_,7 @@
                  case PositionPath.Linear(Vec3 pos):
                      this.addStep(pos, yRot, xRot, interpolationSteps);
                      break;
@@ -27,7 +27,7 @@
                      if (yRot == this.yRot() && xRot == this.xRot()) {
                          for (PositionStep step : steps) {
                              this.addStep(step.position(), yRot, xRot, step.tickOffset());
-@@ -169,7 +_,6 @@
+@@ -158,7 +_,6 @@
                          this.addStep(step.position(), Mth.rotLerp(a, this.yRot(), yRot), Mth.lerp(a, this.xRot(), xRot), step.tickOffset());
                      }
                      break;

versions/26.3-snapshot-8/patches/net/minecraft/world/level/biome/Climate.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/level/biome/Climate.java
 +++ b/net/minecraft/world/level/biome/Climate.java
-@@ -260,7 +_,7 @@
+@@ -273,7 +_,7 @@
              }
 
              List<Climate.RTree.Leaf<T>> leaves = values.stream()
 -                .map(p -> new Climate.RTree.Leaf(p.getFirst(), p.getSecond()))
 +                .map(p -> new Climate.RTree.Leaf<>(p.getFirst(), p.getSecond()))
                  .collect(Collectors.toCollection(ArrayList::new));
-             return new Climate.RTree<>(build(dimensions, leaves));
+             return new Climate.RTree<>(build(dimensions, leaves, childrenPerNode));
          }

versions/26.3-snapshot-8/patches/net/minecraft/world/level/levelgen/NoiseChunk.java.patch

@@ -10,13 +10,13 @@
  import net.minecraft.core.QuartPos;
  import net.minecraft.core.SectionPos;
  import net.minecraft.resources.Identifier;
-@@ -361,141 +_,21 @@
+@@ -363,141 +_,21 @@
      }
 
      private DensityFunction wrapNew(final DensityFunction function) {
 -        // $VF: Couldn't be decompiled
 -        // Please report this to the Vineflower issue tracker, at https://github.com/Vineflower/vineflower/issues with a copy of the class file (if you have the rights to distribute it!)
--        // java.lang.IllegalStateException: Invalid switch case set: [[var1_1 instanceof MarkerFunction(type, wrapped)], [var1_1 instanceof DensityFunctions.HolderHolder(holder)], [const(2)], [const(3)], [const(4)], [null]] for selector of type Lnet/minecraft/world/level/levelgen/DensityFunction;
+-        // java.lang.IllegalStateException: Invalid switch case set: [[var1_1 instanceof MarkerFunction(type, wrapped)], [var1_1 instanceof DensityFunctions.HolderHolder(holder)], [const(2)], [const(3)], [const(4)], [null]] for selector of type Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;
 -        //   at org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchHeadExprent.checkExprTypeBounds(SwitchHeadExprent.java:63)
 -        //   at org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor.checkTypeExpr(VarTypeProcessor.java:156)
 -        //   at org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor.checkTypeExprent(VarTypeProcessor.java:137)
@@ -38,7 +38,7 @@
 -        // 008: istore 3
 -        // 009: aload 2
 -        // 00a: iload 3
--        // 00b: invokedynamic typeSwitch (Lnet/minecraft/world/level/levelgen/DensityFunction;I)I bsm=java/lang/runtime/SwitchBootstraps.typeSwitch (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite; args=[ net/minecraft/world/level/levelgen/densityfunction/op/MarkerFunction, net/minecraft/world/level/levelgen/DensityFunctions$HolderHolder, null.invoke Ljava/lang/Enum$EnumDesc;, null.invoke Ljava/lang/Enum$EnumDesc;, null.invoke Ljava/lang/Enum$EnumDesc; ]
+-        // 00b: invokedynamic typeSwitch (Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;I)I bsm=java/lang/runtime/SwitchBootstraps.typeSwitch (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite; args=[ net/minecraft/world/level/levelgen/densityfunction/op/MarkerFunction, net/minecraft/world/level/levelgen/densityfunction/DensityFunctions$HolderHolder, null.invoke Ljava/lang/Enum$EnumDesc;, null.invoke Ljava/lang/Enum$EnumDesc;, null.invoke Ljava/lang/Enum$EnumDesc; ]
 -        // 010: tableswitch 287 0 4 36 215 245 259 273
 -        // 034: aload 2
 -        // 035: checkcast net/minecraft/world/level/levelgen/densityfunction/op/MarkerFunction
@@ -49,7 +49,7 @@
 -        // 041: aload 7
 -        // 043: astore 5
 -        // 045: aload 4
--        // 047: invokevirtual net/minecraft/world/level/levelgen/densityfunction/op/MarkerFunction.wrapped ()Lnet/minecraft/world/level/levelgen/DensityFunction;
+-        // 047: invokevirtual net/minecraft/world/level/levelgen/densityfunction/op/MarkerFunction.wrapped ()Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;
 -        // 04a: astore 7
 -        // 04c: aload 7
 -        // 04e: astore 6
@@ -68,31 +68,31 @@
 -        // 08d: dup
 -        // 08e: aload 0
 -        // 08f: aload 6
--        // 091: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$NoiseInterpolator.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/DensityFunction;)V
+-        // 091: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$NoiseInterpolator.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;)V
 -        // 094: goto 130
 -        // 097: new net/minecraft/world/level/levelgen/NoiseChunk$FlatCache
 -        // 09a: dup
 -        // 09b: aload 0
 -        // 09c: aload 6
 -        // 09e: bipush 1
--        // 09f: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$FlatCache.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/DensityFunction;Z)V
+-        // 09f: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$FlatCache.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;Z)V
 -        // 0a2: goto 130
 -        // 0a5: new net/minecraft/world/level/levelgen/NoiseChunk$Cache2D
 -        // 0a8: dup
 -        // 0a9: aload 6
--        // 0ab: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$Cache2D.<init> (Lnet/minecraft/world/level/levelgen/DensityFunction;)V
+-        // 0ab: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$Cache2D.<init> (Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;)V
 -        // 0ae: goto 130
 -        // 0b1: new net/minecraft/world/level/levelgen/NoiseChunk$CacheOnce
 -        // 0b4: dup
 -        // 0b5: aload 0
 -        // 0b6: aload 6
--        // 0b8: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$CacheOnce.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/DensityFunction;)V
+-        // 0b8: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$CacheOnce.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;)V
 -        // 0bb: goto 130
 -        // 0be: new net/minecraft/world/level/levelgen/NoiseChunk$CacheAllInCell
 -        // 0c1: dup
 -        // 0c2: aload 0
 -        // 0c3: aload 6
--        // 0c5: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$CacheAllInCell.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/DensityFunction;)V
+-        // 0c5: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$CacheAllInCell.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;)V
 -        // 0c8: goto 130
 -        // 0cb: aload 0
 -        // 0cc: getfield net/minecraft/world/level/levelgen/NoiseChunk.blender Lnet/minecraft/world/level/levelgen/blending/Blender;
@@ -102,39 +102,39 @@
 -        // 0d8: dup
 -        // 0d9: aload 0
 -        // 0da: aload 6
--        // 0dc: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$BlendDensity.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/DensityFunction;)V
+-        // 0dc: invokespecial net/minecraft/world/level/levelgen/NoiseChunk$BlendDensity.<init> (Lnet/minecraft/world/level/levelgen/NoiseChunk;Lnet/minecraft/world/level/levelgen/densityfunction/DensityFunction;)V
 -        // 0df: goto 130
 -        // 0e2: aload 6
 -        // 0e4: goto 130
 -        // 0e7: aload 2
--        // 0e8: checkcast net/minecraft/world/level/levelgen/DensityFunctions$HolderHolder
+-        // 0e8: checkcast net/minecraft/world/level/levelgen/densityfunction/DensityFunctions$HolderHolder
 -        // 0eb: astore 7
 -        // 0ed: aload 7
--        // 0ef: invokevirtual net/minecraft/world/level/levelgen/DensityFunctions$HolderHolder.function ()Lnet/minecraft/core/Holder;
+-        // 0ef: invokevirtual net/minecraft/world/level/levelgen/densityfunction/DensityFunctions$HolderHolder.function ()Lnet/minecraft/core/Holder;
 -        // 0f2: astore 9
 -        // 0f4: aload 9
 -        // 0f6: astore 8
 -        // 0f8: aload 8
 -        // 0fa: invokeinterface net/minecraft/core/Holder.value ()Ljava/lang/Object; 1
--        // 0ff: checkcast net/minecraft/world/level/levelgen/DensityFunction
+-        // 0ff: checkcast net/minecraft/world/level/levelgen/densityfunction/DensityFunction
 -        // 102: goto 130
 -        // 105: aload 0
 -        // 106: getfield net/minecraft/world/level/levelgen/NoiseChunk.blendAlpha Lnet/minecraft/world/level/levelgen/NoiseChunk$FlatCache;
 -        // 109: aload 1
 -        // 10a: invokestatic java/util/Objects.requireNonNullElse (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
--        // 10d: checkcast net/minecraft/world/level/levelgen/DensityFunction
+-        // 10d: checkcast net/minecraft/world/level/levelgen/densityfunction/DensityFunction
 -        // 110: goto 130
 -        // 113: aload 0
 -        // 114: getfield net/minecraft/world/level/levelgen/NoiseChunk.blendOffset Lnet/minecraft/world/level/levelgen/NoiseChunk$FlatCache;
 -        // 117: aload 1
 -        // 118: invokestatic java/util/Objects.requireNonNullElse (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
--        // 11b: checkcast net/minecraft/world/level/levelgen/DensityFunction
+-        // 11b: checkcast net/minecraft/world/level/levelgen/densityfunction/DensityFunction
 -        // 11e: goto 130
 -        // 121: aload 0
 -        // 122: getfield net/minecraft/world/level/levelgen/NoiseChunk.beardifier Lnet/minecraft/world/level/levelgen/Beardifier;
 -        // 125: aload 1
 -        // 126: invokestatic java/util/Objects.requireNonNullElse (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
--        // 129: checkcast net/minecraft/world/level/levelgen/DensityFunction
+-        // 129: checkcast net/minecraft/world/level/levelgen/densityfunction/DensityFunction
 -        // 12c: goto 130
 -        // 12f: aload 1
 -        // 130: areturn