From 8aedc00f963413ac0a02335bc9f914d45a82b4de Mon Sep 17 00:00:00 2001 From: Rabbitminers Date: Sun, 30 Apr 2023 20:02:06 +0100 Subject: [PATCH] Removed Bogey Style Handling From Registrate --- .../foundation/data/BogeyStyleBuilder.java | 89 ------------------- .../foundation/data/CreateRegistrate.java | 8 -- 2 files changed, 97 deletions(-) delete mode 100644 src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java diff --git a/src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java b/src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java deleted file mode 100644 index bcc485cf9..000000000 --- a/src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.simibubi.create.foundation.data; - -import com.simibubi.create.AllParticleTypes; -import com.simibubi.create.AllRegistries; -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.content.logistics.trains.BogeyRenderer; -import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock; -import com.simibubi.create.content.logistics.trains.BogeySizes; -import com.simibubi.create.content.logistics.trains.entity.BogeyStyle; - -import com.tterrag.registrate.AbstractRegistrate; - -import com.tterrag.registrate.builders.AbstractBuilder; - -import com.tterrag.registrate.builders.BuilderCallback; - -import com.tterrag.registrate.util.entry.BlockEntry; - -import com.tterrag.registrate.util.nullness.NonNullSupplier; - -import net.minecraft.core.particles.ParticleType; - -import net.minecraft.nbt.CompoundTag; - -import net.minecraft.resources.ResourceLocation; - -import org.jetbrains.annotations.NotNull; - -import javax.annotation.ParametersAreNonnullByDefault; - -import java.util.function.Supplier; - -@ParametersAreNonnullByDefault -public class BogeyStyleBuilder extends AbstractBuilder> { - private final T style; - private NonNullSupplier renderer; - private Supplier soundType; - private Supplier data; - private Supplier> particles; - - public static BogeyStyleBuilder create(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, T style) { - return new BogeyStyleBuilder<>(owner, parent, name, callback, style); - } - - protected BogeyStyleBuilder(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, T style) { - super(owner, parent, name, callback, AllRegistries.Keys.BOGEYS); - this.style = style; - this.soundType = AllSoundEvents.TRAIN2::getId; - this.particles = AllParticleTypes.AIR_FLOW::get; - this.data = CompoundTag::new; - } - - public BogeyStyleBuilder defaultData(CompoundTag data) { - this.data = () -> data; - return this; - } - - public BogeyStyleBuilder particles(ParticleType particleType) { - this.particles = () -> particleType; - return this; - } - - public BogeyStyleBuilder soundType(ResourceLocation soundEntry) { - this.soundType = () -> soundEntry; - return this; - } - - public BogeyStyleBuilder block(BogeySizes.BogeySize size, BlockEntry block) { - return this.block(size, block.getId()); - } - - public BogeyStyleBuilder block(BogeySizes.BogeySize size, ResourceLocation location) { - this.style.addBlockForSize(size, location); - return this; - } - - public BogeyStyleBuilder renderer(BogeyRenderer renderer) { - this.renderer = () -> renderer; - return this; - } - - @Override - protected @NotNull T createEntry() { - style.defaultData = data.get(); - style.renderer = renderer.get(); - style.soundType = soundType.get(); - return style; - } -} diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index de34fd210..7a51ce75a 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -135,14 +135,6 @@ public class CreateRegistrate extends AbstractRegistrate { (callback) -> CreateTileEntityBuilder.create(this, parent, name, callback, factory)); } - public BogeyStyleBuilder bogeyStyle(String name, T style) { - return this.bogeyStyle(self(), name, style); - } - - public BogeyStyleBuilder bogeyStyle(P parent, String name, T style) { - return this.entry(name, (callback) -> BogeyStyleBuilder.create(this, parent, name, callback, style)); - } - @Override public CreateEntityBuilder entity(String name, EntityType.EntityFactory factory, MobCategory classification) {