Refactor SpawnSquidBook to support rendering of active combination of

composite items #1326
athrane · Apr 12, 2022 · 3826527 · 3826527
1 parent 19a62fb
commit 3826527
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/src/main/java/bassebombecraft/item/book/SpawnSquidBook.java b/src/main/java/bassebombecraft/item/book/SpawnSquidBook.java
@@ -1,17 +1,15 @@
 package bassebombecraft.item.book;
 
 import static bassebombecraft.config.ModConfiguration.spawnSquidBook;
-import static bassebombecraft.operator.DefaultPorts.getFnGetEntities1;
-import static bassebombecraft.operator.DefaultPorts.getInstance;
+import static bassebombecraft.item.RegisteredItems.FORMATION1;
+import static bassebombecraft.item.RegisteredItems.MODIFIER20;
+import static bassebombecraft.item.RegisteredItems.PROJECTILE3;
 
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
-import bassebombecraft.operator.Operator2;
-import bassebombecraft.operator.Sequence2;
-import bassebombecraft.operator.entity.raytraceresult.SpawnSquid2;
-import bassebombecraft.operator.projectile.ShootSkullProjectile2;
-import bassebombecraft.operator.projectile.formation.SingleProjectileFormation2;
-import bassebombecraft.operator.projectile.modifier.TagProjectileWithProjectileModifier;
+import net.minecraft.item.Item;
+import net.minecraftforge.fml.RegistryObject;
 
 /**
  * Book of spawn squid implementation.
@@ -21,16 +19,11 @@ public class SpawnSquidBook extends GenericCompositeItemsBook {
 	public static final String ITEM_NAME = SpawnSquidBook.class.getSimpleName();
 
 	/**
-	 * Create operators.
+	 * Composite items.
 	 */
-	static Supplier<Operator2> splOp = () -> {
-		Operator2 formationOp = new SingleProjectileFormation2();
-		Operator2 projectileOp = new ShootSkullProjectile2();
-		Operator2 modifierOp = new TagProjectileWithProjectileModifier(getFnGetEntities1(), p -> SpawnSquid2.NAME);
-		return new Sequence2(formationOp, projectileOp, modifierOp);
-	};
+	static Supplier<Stream<RegistryObject<Item>>> splComposites = () -> Stream.of(FORMATION1, PROJECTILE3, MODIFIER20);
 
 	public SpawnSquidBook() {
-		super(spawnSquidBook, getInstance(), splOp.get());
+		super(spawnSquidBook, splComposites);
 	}
 }