Cleaned up some further stuff.

MinecraftForge · Sep 25, 2023 · 699cb46 · 699cb46
1 parent 19a0c37
commit 699cb46
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java b/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java
@@ -12,6 +12,7 @@
 import net.minecraftforge.common.extensions.IForgeBlockEntity;
 import net.minecraftforge.common.extensions.IForgeEntity;
 import net.minecraftforge.common.extensions.IForgeItemStack;
+import net.minecraftforge.common.extensions.IForgeLevel;
 import net.minecraftforge.common.extensions.IForgeLevelChunk;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
 import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper;
@@ -29,7 +30,7 @@ public class CapabilitySystem {
 
     private static HashSet<Consumer<AttachCapabilitiesEvent<?>>> find(HashSet<Consumer<AttachCapabilitiesEvent<?>>> lists, Class<?> cls) {
         lists.addAll(FIND.getOrDefault(cls, EMPTY_LIST));
-        MilkBucketItem
+
         for (Class<?> anInterface : cls.getInterfaces())
             find(lists, anInterface);
 

diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java b/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java
@@ -29,10 +29,12 @@
 import net.minecraft.world.phys.HitResult;
 import net.minecraftforge.common.ForgeMod;
 import net.minecraftforge.common.ForgeSpawnEggItem;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.SoundAction;
 import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.entity.PartEntity;
 import net.minecraftforge.fluids.FluidType;
+import net.minecraftforge.event.entity.EntityEvent;
 import org.jetbrains.annotations.Nullable;
 
 public interface IForgeEntity extends ICapabilitySerializable<CompoundTag>

diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeLevel.java b/src/main/java/net/minecraftforge/common/extensions/IForgeLevel.java
@@ -7,16 +7,12 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import net.minecraft.world.level.Level;
+
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.entity.PartEntity;
 
 public interface IForgeLevel extends ICapabilityProvider
 {
-    default Level self() {
-        return (Level) this;
-    }
-
     /**
      * The maximum radius to scan for entities when trying to check bounding boxes. Vanilla's default is
      * 2.0D But mods that add larger entities may increase this.

diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeLevelChunk.java b/src/main/java/net/minecraftforge/common/extensions/IForgeLevelChunk.java
@@ -5,6 +5,9 @@
 
 package net.minecraftforge.common.extensions;
 
-public interface IForgeLevelChunk
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+
+public interface IForgeLevelChunk extends ICapabilityProvider
 {
-}
+
+}
diff --git a/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java b/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java
@@ -25,7 +25,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-
 /**
  * Wrapper for vanilla and forge buckets.
  * Swaps between empty bucket and filled bucket of the correct type.
@@ -175,4 +174,4 @@ public <T> LazyOptional<T> getCapability(@NotNull Capability<T> capability, @Nul
     {
         return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(capability, holder);
     }
-}
+}