Change CustomFluid And FluidRegistrable

MModding · Aug 28, 2023 · 346725a · 346725a
1 parent 84b8cc9
commit 346725a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/fluids/CustomFluid.java b/src/main/java/com/mmodding/mmodding_lib/library/fluids/CustomFluid.java
@@ -60,11 +60,6 @@ public boolean isSource(FluidState state) {
 		return this.isSource();
 	}
 
-	@Override
-	public Item getBucketItem() {
-		return this.bucket;
-	}
-
 	@Override
 	protected void flow(WorldAccess world, BlockPos pos, BlockState blockState, Direction direction, FluidState fluidState) {
 		if (direction == Direction.DOWN) {
@@ -91,6 +86,11 @@ public FluidBlock getBlock() {
         return this.block;
     }
 
+	@Nullable
+	public BucketItem getBucket() {
+		return this.bucket;
+	}
+
     @Override
     public boolean isNotRegistered() {
         return !this.registered.get();

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/fluids/FluidRegistrable.java b/src/main/java/com/mmodding/mmodding_lib/library/fluids/FluidRegistrable.java
@@ -14,11 +14,11 @@ public interface FluidRegistrable extends Registrable {
 
     default void register(Identifier identifier) {
         if (this instanceof FlowableFluid fluid && this.isNotRegistered()) {
-            // RegistrationUtils.registerFluid(identifier, fluid);
+            RegistrationUtils.registerFluid(identifier, fluid);
             if (this instanceof CustomFluid custom && custom.isSource()) {
                 RegistrationUtils.registerBlockWithoutItem(identifier, custom.getBlock());
-				if (custom.getBucketItem() != null) {
-					RegistrationUtils.registerItem(identifier, custom.getBucketItem());
+				if (custom.getBucket() != null) {
+					RegistrationUtils.registerItem(identifier, custom.getBucket());
 				}
             }
             if (this instanceof FluidExtensions extensions) {