From 4bc1337d9d47166b6baf3964f74df0610f52c042 Mon Sep 17 00:00:00 2001 From: Tai Chi Minh Ralph Eastwood Date: Sun, 8 Oct 2023 11:21:01 +0200 Subject: [PATCH] Remove unnecessary SafeRegistrate SafeRegistrate just provided a wrapping function around creating entities: this just creates more code to maintain... this commit removes it so that we use Create.Registrate directly. --- gradle.properties | 4 +- .../createdragonlib/init/SafeRegistrate.java | 50 ------------------- .../dragons/createdragonlib/tag/TagGen.java | 18 +++---- 3 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/plus/dragons/createdragonlib/init/SafeRegistrate.java diff --git a/gradle.properties b/gradle.properties index fd1a621..83554fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G maven_group = plus.dragons.createdragonlib -mod_version = 1.3.9 +mod_version = 1.4.0 # https://fabricmc.net/develop minecraft_version = 1.20.1 @@ -17,4 +17,4 @@ parchment_version = 2023.09.03 # https://modrinth.com/mod/create-fabric create_version = 0.5.1-d-build.1161+mc1.20.1 -artifact_minecraft_version = 1.20.1 \ No newline at end of file +artifact_minecraft_version = 1.20.1 diff --git a/src/main/java/plus/dragons/createdragonlib/init/SafeRegistrate.java b/src/main/java/plus/dragons/createdragonlib/init/SafeRegistrate.java deleted file mode 100644 index 24ea345..0000000 --- a/src/main/java/plus/dragons/createdragonlib/init/SafeRegistrate.java +++ /dev/null @@ -1,50 +0,0 @@ -package plus.dragons.createdragonlib.init; - -import com.simibubi.create.foundation.data.CreateEntityBuilder; -import com.simibubi.create.foundation.data.CreateRegistrate; -import com.simibubi.create.foundation.utility.Lang; -import com.tterrag.registrate.util.nullness.NonNullConsumer; -import com.tterrag.registrate.util.nullness.NonNullFunction; -import com.tterrag.registrate.util.nullness.NonNullSupplier; -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; - -public class SafeRegistrate extends CreateRegistrate { - - public SafeRegistrate(String modid) { - super(modid); - } - -// @Override -// public SafeRegistrate registerEventListeners(IEventBus bus) { -// super.registerEventListeners(bus); -// return this; -// } - - public CreateEntityBuilder entity( - String name, - EntityType.EntityFactory factory, - NonNullSupplier>> renderer, - MobCategory group, - int range, int updateFrequency, - boolean sendVelocity, boolean immuneToFire, - NonNullConsumer> propertyBuilder) { - String id = Lang.asId(name); - var builder = this.entity(id, factory, group); - builder.properties(b -> { - if (immuneToFire) - b.fireImmune(); - b.trackRangeChunks(range) - .trackedUpdateRate(updateFrequency) - .forceTrackedVelocityUpdates(sendVelocity); - propertyBuilder.accept(b); - }) - .renderer(renderer); - return builder; - } - -} diff --git a/src/main/java/plus/dragons/createdragonlib/tag/TagGen.java b/src/main/java/plus/dragons/createdragonlib/tag/TagGen.java index bfdd525..38b8a69 100644 --- a/src/main/java/plus/dragons/createdragonlib/tag/TagGen.java +++ b/src/main/java/plus/dragons/createdragonlib/tag/TagGen.java @@ -22,6 +22,7 @@ of this software and associated documentation files (the "Software"), to deal import com.simibubi.create.AllTags; import com.simibubi.create.foundation.data.recipe.Mods; +import com.simibubi.create.Create; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.ProviderType; @@ -34,7 +35,6 @@ of this software and associated documentation files (the "Software"), to deal import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Fluid; -import plus.dragons.createdragonlib.init.SafeRegistrate; import java.util.ArrayList; import java.util.List; @@ -45,13 +45,11 @@ of this software and associated documentation files (the "Software"), to deal public class TagGen { private static final List READY_TO_GEN = new ArrayList<>(); - private SafeRegistrate registrate; private final List>> blockTagGen; private final List>> fluidTagGen; private final List>> itemTagGen; - private TagGen(SafeRegistrate registrate, List>> blockTagGen, List>> fluidTagGen, List>> itemTagGen) { - this.registrate = registrate; + private TagGen(List>> blockTagGen, List>> fluidTagGen, List>> itemTagGen) { this.blockTagGen = blockTagGen; this.fluidTagGen = fluidTagGen; this.itemTagGen = itemTagGen; @@ -60,13 +58,13 @@ private TagGen(SafeRegistrate registrate, List>> blockTagGen = new ArrayList<>(); private final List>> fluidTagGen = new ArrayList<>(); private final List>> itemTagGen = new ArrayList<>(); - public Builder(SafeRegistrate registrate) { - this.registrate = registrate; + public Builder() { } public Builder addItemTagFactory(NonNullConsumer> consumer) { @@ -102,7 +98,7 @@ public Builder addFluidTagFactory(NonNullConsumer> } public TagGen build() { - return new TagGen(registrate, blockTagGen, fluidTagGen, itemTagGen); + return new TagGen(blockTagGen, fluidTagGen, itemTagGen); } }