some patches extras

wdog5 · wdog5 · commit 92cd56630bf2 · 2026-06-30T15:37:16.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,5 @@ build
 
 **/out/
 /projects/cb-base/
-/projects/neotenet-base/src/
+/projects/neotenet-base/src/
+/projects/neotenet-base/other-src/
diff --git a/build.gradle b/build.gradle
@@ -154,15 +154,20 @@ tasks.register('applyCBPatches') {
     }
 }
 
+tasks.register("prepareNeoForgeOtherSrc", Copy) {
+    group = 'neotenet'
+    from('src/main/java')
+    from('projects/neotenet/src/main/java')
+    into('projects/neotenet-base/other-src/main/java')
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
 tasks.register('prepareNeoForgeBase', Copy) {
     group = 'neotenet'
+    dependsOn 'prepareNeoForgeOtherSrc'
 
     from('projects/neoforge/src/main/java')
     into('projects/neotenet-base/src/main/java')
-    from('projects/neotenet/src/main/java')
-    into('projects/neotenet-base/src/main/java')
-    from('src/main/java')
-    into('projects/neotenet-base/src/main/java')
 
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
diff --git a/patches/net/minecraft/commands/CommandSourceStack.java.patch b/patches/net/minecraft/commands/CommandSourceStack.java.patch
@@ -1,5 +1,24 @@
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
+@@ -17,6 +_,8 @@
+ import java.util.function.BinaryOperator;
+ import java.util.function.Supplier;
+ import java.util.stream.Stream;
++
++import com.mojang.brigadier.tree.CommandNode;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.advancements.AdvancementHolder;
+ import net.minecraft.commands.arguments.EntityAnchorArgument;
+@@ -35,7 +_,9 @@
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.server.level.ServerPlayer;
++import net.minecraft.server.permissions.Permission;
+ import net.minecraft.server.permissions.PermissionSet;
++import net.minecraft.server.permissions.Permissions;
+ import net.minecraft.sounds.SoundEvent;
+ import net.minecraft.util.Mth;
+ import net.minecraft.util.TaskChainer;
 @@ -49,8 +_,9 @@
  import org.jspecify.annotations.Nullable;
  
@@ -11,3 +30,49 @@
      public static final SimpleCommandExceptionType ERROR_NOT_PLAYER = new SimpleCommandExceptionType(Component.translatable("permissions.requires.player"));
      public static final SimpleCommandExceptionType ERROR_NOT_ENTITY = new SimpleCommandExceptionType(Component.translatable("permissions.requires.entity"));
      public final CommandSource source;
+@@ -67,6 +_,7 @@
+     private final Vec2 rotation;
+     private final CommandSigningContext signingContext;
+     private final TaskChainer chatMessageChainer;
++    public volatile CommandNode currentCommand;
+ 
+     public CommandSourceStack(
+         CommandSource source,
+@@ -128,6 +_,37 @@
+         this.signingContext = signingContext;
+         this.chatMessageChainer = chatMessageChainer;
+     }
++
++    public class DelegatePermissionSet implements PermissionSet {
++
++        private final PermissionSet handle;
++
++        public DelegatePermissionSet(PermissionSet handle) {
++            this.handle = handle;
++        }
++
++        @Override
++        public boolean hasPermission(Permission permission) {
++            boolean hasPermission = handle.hasPermission(permission);
++
++            CommandNode currentCommand = CommandSourceStack.this.currentCommand;
++            if (currentCommand != null) {
++                return hasPermission(hasPermission, org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(currentCommand));
++            }
++
++            if (permission.equals(Permissions.COMMANDS_ENTITY_SELECTORS)) {
++                return hasPermission(hasPermission, "minecraft.command.selector");
++            }
++
++            return hasPermission;
++        }
++
++        public boolean hasPermission(boolean hasPermission, String bukkitPermission) {
++            // World is null when loading functions
++            return ((getLevel() == null || !getLevel().getCraftServer().ignoreVanillaPermissions) && hasPermission) || getBukkitSender().hasPermission(bukkitPermission);
++        }
++    }
++    // CraftBukkit end
+ 
+     public CommandSourceStack withSource(CommandSource source) {
+         return this.source == source
diff --git a/patches/net/minecraft/network/Connection.java.patch b/patches/net/minecraft/network/Connection.java.patch
@@ -11,12 +11,13 @@
      private volatile @Nullable PacketListener disconnectListener;
      private volatile @Nullable PacketListener packetListener;
      private @Nullable DisconnectionDetails disconnectionDetails;
-@@ -81,6 +_,8 @@
+@@ -81,6 +_,9 @@
      private volatile @Nullable DisconnectionDetails delayedDisconnect;
      private @Nullable BandwidthDebugMonitor bandwidthDebugMonitor;
      private @Nullable UUID intendedProfileId;
 +    @Nullable
 +    private ProtocolInfo<?> inboundProtocol;
++    public String hostname = ""; // CraftBukkit - add field
  
      public Connection(PacketFlow receiving) {
          this.receiving = receiving;
diff --git a/patches/net/minecraft/network/chat/TextColor.java.patch b/patches/net/minecraft/network/chat/TextColor.java.patch
@@ -11,12 +11,33 @@
      private static final String CUSTOM_COLOR_PREFIX = "#";
      public static final Codec<TextColor> CODEC = Codec.STRING.comapFlatMap(TextColor::parseColor, TextColor::serialize);
      private static final Map<String, TextColor> NAMED_COLORS = new HashMap<>();
-@@ -31,7 +_,7 @@
+@@ -31,16 +_,28 @@
      public static final TextColor YELLOW = named("yellow", 16777045);
      public static final TextColor WHITE = named("white", 16777215);
      private final int value;
 -    public final @Nullable String name;
 +    private final @Nullable String name;
++    // CraftBukkit start
++    @Nullable
++    public final ChatFormatting format;
++
++    private TextColor(int value, String name, ChatFormatting format) {
++        this.format = format;
++        // CraftBukkit end
++        this.value = value & 16777215;
++        this.name = name;
++    }
  
      private TextColor(int value, String name) {
          this.value = value & 16777215;
+         this.name = name;
++        this.format = null;
+     }
+ 
+     private TextColor(int value) {
+         this.value = value & 16777215;
+         this.name = null;
++        this.format = null;
+     }
+ 
+     private static TextColor named(String name, int rgb) {
diff --git a/patches/net/minecraft/server/level/ServerLevel.java.patch b/patches/net/minecraft/server/level/ServerLevel.java.patch
@@ -25,7 +25,7 @@
      private final GameEventDispatcher gameEventDispatcher;
      public boolean noSave;
      private final SleepStatus sleepStatus;
-@@ -216,11 +_,17 @@
+@@ -216,11 +_,19 @@
      private boolean handlingTick;
      private final List<CustomSpawner> customSpawners;
      private @Nullable EnderDragonFight dragonFight;
@@ -41,6 +41,8 @@
 +    public java.util.OptionalLong getSeedOverride() {
 +        return this.seedOverride;
 +    }
++    public LevelStorageSource.LevelStorageAccess storageSource;
++    public UUID uuid;
  
      public ServerLevel(
          MinecraftServer server,
@@ -250,7 +252,7 @@
          this.neighborUpdater.updateNeighborsAtExceptFromFacing(pos, blockObject, skipDirection, orientation);
      }
  
-@@ -1206,7 +_,7 @@
+@@ -1206,14 +_,16 @@
          Explosion.BlockInteraction blockInteraction = switch (interactionType) {
              case NONE -> Explosion.BlockInteraction.KEEP;
              case BLOCK -> this.getDestroyType(GameRules.BLOCK_EXPLOSION_DROP_DECAY);
@@ -259,7 +261,8 @@
                  ? this.getDestroyType(GameRules.MOB_EXPLOSION_DROP_DECAY)
                  : Explosion.BlockInteraction.KEEP;
              case TNT -> this.getDestroyType(GameRules.TNT_EXPLOSION_DROP_DECAY);
-@@ -1214,6 +_,7 @@
+             case TRIGGER -> Explosion.BlockInteraction.TRIGGER_BLOCK;
++            case STANDARD -> Explosion.BlockInteraction.DESTROY;
          };
          Vec3 center = new Vec3(x, y, z);
          ServerExplosion explosion = new ServerExplosion(this, source, damageSource, damageCalculator, center, r, fire, blockInteraction);
diff --git a/patches/net/minecraft/world/CompoundContainer.java.patch b/patches/net/minecraft/world/CompoundContainer.java.patch
@@ -1,13 +1,19 @@
 --- a/net/minecraft/world/CompoundContainer.java
 +++ b/net/minecraft/world/CompoundContainer.java
-@@ -5,8 +_,8 @@
+@@ -3,10 +_,14 @@
+ import net.minecraft.world.entity.ContainerUser;
+ import net.minecraft.world.entity.player.Player;
  import net.minecraft.world.item.ItemStack;
++import org.bukkit.entity.HumanEntity;
++
++import java.util.List;
  
  public class CompoundContainer implements Container {
 -    public final Container container1;
 -    public final Container container2;
 +    private final Container container1;
 +    private final Container container2;
++    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
  
      public CompoundContainer(Container container1, Container container2) {
          this.container1 = container1;
diff --git a/patches/net/minecraft/world/SimpleContainer.java.patch b/patches/net/minecraft/world/SimpleContainer.java.patch
@@ -1,14 +1,35 @@
 --- a/net/minecraft/world/SimpleContainer.java
 +++ b/net/minecraft/world/SimpleContainer.java
-@@ -13,7 +_,7 @@
+@@ -10,12 +_,28 @@
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.level.storage.ValueInput;
+ import net.minecraft.world.level.storage.ValueOutput;
++import org.bukkit.entity.HumanEntity;
  
  public class SimpleContainer implements Container, StackedContentsCompatible {
      private final int size;
 -    public final NonNullList<ItemStack> items;
 +    private final NonNullList<ItemStack> items;
++    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
++    protected org.bukkit.inventory.InventoryHolder bukkitOwner;
++
++    public SimpleContainer(SimpleContainer original) {
++        this(original.size);
++        for (int slot = 0; slot < original.size; slot++) {
++            this.items.set(slot, original.items.get(slot).copy());
++        }
++    }
  
      public SimpleContainer(int size) {
++        this(size, null);
++    }
++
++    public SimpleContainer(int size, org.bukkit.inventory.InventoryHolder owner) {
++        this.bukkitOwner = owner;
++        // CraftBukkit end
          this.size = size;
+         this.items = NonNullList.withSize(size, ItemStack.EMPTY);
+     }
 @@ -109,8 +_,14 @@
  
      @Override
diff --git a/patches/net/minecraft/world/entity/Entity.java.patch b/patches/net/minecraft/world/entity/Entity.java.patch
@@ -1,13 +1,25 @@
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -158,6 +_,7 @@
+@@ -156,8 +_,10 @@
+ import org.slf4j.Logger;
+ 
  import net.neoforged.neoforge.common.extensions.IEntityExtension;
++import org.teneted.neotenet.injection.world.entity.EntityInjection;
  
  public abstract class Entity
 +    extends net.neoforged.neoforge.attachment.AttachmentHolder
      implements Nameable,
      EntityAccess,
      ScoreHolder,
+@@ -166,7 +_,7 @@
+     ItemOwner,
+     SlotProvider,
+     DebugValueSource,
+-    TypedInstance<EntityType<?>>, IEntityExtension {
++    TypedInstance<EntityType<?>>, IEntityExtension, EntityInjection {
+     private static final Logger LOGGER = LogUtils.getLogger();
+     public static final String TAG_ID = "id";
+     public static final String TAG_UUID = "UUID";
 @@ -207,11 +_,13 @@
      private static final int MAX_BLOCK_ITERATIONS_ALONG_TRAVEL_PER_TICK = 16;
      private static final double MAX_MOVEMENT_RESETTING_TRACE_DISTANCE = 8.0;
@@ -64,6 +76,28 @@
      private Vec3 lastKnownSpeed = Vec3.ZERO;
      private @Nullable Vec3 lastKnownPosition;
      private @Nullable BlockState inBlockState = null;
+@@ -302,6 +_,21 @@
+     private final LongSet visitedBlocks = new LongOpenHashSet();
+     private final InsideBlockEffectApplier.StepBasedCollector insideEffectCollector = new InsideBlockEffectApplier.StepBasedCollector();
+     private CustomData customData = CustomData.EMPTY;
++    // CraftBukkit start
++    public boolean forceDrops;
++    public boolean persist = true;
++    public boolean visibleByDefault = true;
++    public boolean valid;
++    public boolean inWorld = false;
++    public boolean generation;
++    public int maxAirTicks = getDefaultMaxAirSupply(); // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
++    public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
++    public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
++    public boolean persistentInvisibility = false;
++    public BlockPos lastLavaContact;
++    // Marks an entity, that it was removed by a plugin via Entity#remove
++    // Main use case currently is for SPIGOT-7487, preventing dropping of leash when leash is removed
++    public boolean pluginRemoved = false;
+ 
+     public Entity(EntityType<?> type, Level level) {
+         this.type = type;
 @@ -323,7 +_,10 @@
          this.defineSynchedData(entityDataBuilder);
          this.entityData = entityDataBuilder.build();
diff --git a/patches/net/minecraft/world/entity/LivingEntity.java.patch b/patches/net/minecraft/world/entity/LivingEntity.java.patch
@@ -1,5 +1,18 @@
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -12,9 +_,12 @@
+ import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+ import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
+ import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
++
++import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.ConcurrentModificationException;
+ import java.util.EnumMap;
++import java.util.HashSet;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
 @@ -177,14 +_,14 @@
      private static final double MAX_LINE_OF_SIGHT_TEST_RANGE = 128.0;
      protected static final int LIVING_ENTITY_FLAG_IS_USING = 1;
@@ -78,7 +91,7 @@
      protected int fallFlyTicks;
      private long lastKineticHitFeedbackTime = -2147483648L;
      private BlockPos lastPos;
-@@ -277,13 +_,20 @@
+@@ -277,13 +_,28 @@
      private float swimAmount;
      private float swimAmountO;
      protected Brain<?> brain;
@@ -98,6 +111,14 @@
 +     * the stack before the method's return.
 +     **/
 +    protected java.util.@Nullable Stack<net.neoforged.neoforge.common.damagesource.DamageContainer> damageContainers = new java.util.Stack<>();
++    // CraftBukkit start
++    public int expToDrop;
++    public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
++    public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
++    public boolean collides = true;
++    public Set<UUID> collidableExemptions = new HashSet<>();
++    public boolean bukkitPickUpLoot;
++    public int invulnerableDuration = 20;
  
      protected LivingEntity(EntityType<? extends LivingEntity> type, Level level) {
          super(type, level);
diff --git a/patches/net/minecraft/world/entity/Mob.java.patch b/patches/net/minecraft/world/entity/Mob.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -131,19 +_,24 @@
+@@ -131,19 +_,25 @@
      protected JumpControl jumpControl;
      private final BodyRotationControl bodyRotationControl;
      protected PathNavigation navigation;
@@ -27,6 +27,7 @@
 +    private boolean spawnCancelled = false;
 +    /** Neo: Prevent immediate spawning from conversions to capture conversion results for events */
 +    protected boolean preventConversionSpawns = false;
++    public boolean aware = true; // CraftBukkit
  
      protected Mob(EntityType<? extends Mob> type, Level level) {
          super(type, level);
diff --git a/patches/net/minecraft/world/level/Level.java.patch b/patches/net/minecraft/world/level/Level.java.patch
diff --git a/patches/net/minecraft/world/level/block/ChestBlock.java.patch b/patches/net/minecraft/world/level/block/ChestBlock.java.patch
diff --git a/projects/neotenet-base/build.gradle b/projects/neotenet-base/build.gradle
diff --git a/projects/neotenet/neoforge-patches.jar b/projects/neotenet/neoforge-patches.jar
diff --git a/projects/neotenet/src/main/java/org/teneted/neotenet/injection/world/level/block/ChestBlockInjection.java b/projects/neotenet/src/main/java/org/teneted/neotenet/injection/world/level/block/ChestBlockInjection.java
