From 544b9699d96d30c7f5d6714174a1076e7b16dbd6 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Fri, 5 Aug 2022 17:21:47 -0700 Subject: [PATCH] More worldgen tweaks - Pass RegistryAccess to builtin worldgen object creation methods - Do not cache builtin worldgen objects - Remove unused fluid layer code --- .../java/com/simibubi/create/AllFluids.java | 22 ++--------- src/main/java/com/simibubi/create/Create.java | 2 + .../com/simibubi/create/CreateClient.java | 1 - .../worldgen/AllOreFeatureConfigEntries.java | 4 +- .../worldgen/BuiltinRegistration.java | 5 ++- .../worldgen/OreFeatureConfigEntry.java | 38 +++++-------------- 6 files changed, 21 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllFluids.java b/src/main/java/com/simibubi/create/AllFluids.java index 50e6ed263..275d61e06 100644 --- a/src/main/java/com/simibubi/create/AllFluids.java +++ b/src/main/java/com/simibubi/create/AllFluids.java @@ -10,15 +10,11 @@ import com.simibubi.create.content.palettes.AllPaletteStoneTypes; import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.FluidEntry; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.ForgeFlowingFluid; @@ -28,17 +24,17 @@ public class AllFluids { public static final FluidEntry POTION = REGISTRATE.virtualFluid("potion", PotionFluidAttributes::new, PotionFluid::new) - .lang(f -> "fluid.create.potion", "Potion") + .lang("Potion") .register(); public static final FluidEntry TEA = REGISTRATE.virtualFluid("tea") - .lang(f -> "fluid.create.tea", "Builder's Tea") + .lang("Builder's Tea") .tag(AllTags.forgeFluidTag("tea")) .register(); public static final FluidEntry HONEY = REGISTRATE.standardFluid("honey", NoColorFluidAttributes::new) - .lang(f -> "fluid.create.honey", "Honey") + .lang("Honey") .attributes(b -> b.viscosity(2000) .density(1400)) .properties(p -> p.levelDecreasePerBlock(2) @@ -54,7 +50,7 @@ public class AllFluids { public static final FluidEntry CHOCOLATE = REGISTRATE.standardFluid("chocolate", NoColorFluidAttributes::new) - .lang(f -> "fluid.create.chocolate", "Chocolate") + .lang("Chocolate") .tag(AllTags.forgeFluidTag("chocolate")) .attributes(b -> b.viscosity(1500) .density(1400)) @@ -68,16 +64,6 @@ public class AllFluids { public static void register() {} - @OnlyIn(Dist.CLIENT) - public static void assignRenderLayers() {} - - @OnlyIn(Dist.CLIENT) - private static void makeTranslucent(FluidEntry entry) { - ForgeFlowingFluid fluid = entry.get(); - ItemBlockRenderTypes.setRenderLayer(fluid, RenderType.translucent()); - ItemBlockRenderTypes.setRenderLayer(fluid.getSource(), RenderType.translucent()); - } - @Nullable public static BlockState getLavaInteraction(FluidState fluidState) { Fluid fluid = fluidState.getType(); diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index bdfd20d23..3d985d579 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -38,6 +38,7 @@ import com.simibubi.create.foundation.data.recipe.StandardRecipeGen; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.CreateRegistry; import com.simibubi.create.foundation.worldgen.AllFeatures; +import com.simibubi.create.foundation.worldgen.AllOreFeatureConfigEntries; import com.simibubi.create.foundation.worldgen.AllPlacementModifiers; import com.simibubi.create.foundation.worldgen.BuiltinRegistration; import com.tterrag.registrate.util.nullness.NonNullSupplier; @@ -112,6 +113,7 @@ public class Create { AllParticleTypes.register(modEventBus); AllStructureProcessorTypes.register(modEventBus); AllEntityDataSerializers.register(modEventBus); + AllOreFeatureConfigEntries.init(); AllFeatures.register(modEventBus); AllPlacementModifiers.register(modEventBus); BuiltinRegistration.register(modEventBus); diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 3860b9395..d20076543 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -84,7 +84,6 @@ public class CreateClient { BUFFER_CACHE.registerCompartment(WorldSectionElement.DOC_WORLD_SECTION, 20); AllKeys.register(); - // AllFluids.assignRenderLayers(); AllBlockPartials.init(); AllStitchedTextures.init(); diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java index e0e778ed3..ffdb25906 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java @@ -107,7 +107,7 @@ public class AllOreFeatureConfigEntries { for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { DatagenExtension datagenExt = entry.getValue().datagenExt(); if (datagenExt != null) { - configuredFeatures.put(entry.getKey(), datagenExt.getConfiguredFeature()); + configuredFeatures.put(entry.getKey(), datagenExt.createConfiguredFeature(registryAccess)); } } @@ -122,7 +122,7 @@ public class AllOreFeatureConfigEntries { for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { DatagenExtension datagenExt = entry.getValue().datagenExt(); if (datagenExt != null) { - placedFeatures.put(entry.getKey(), datagenExt.getPlacedFeature()); + placedFeatures.put(entry.getKey(), datagenExt.createPlacedFeature(registryAccess)); } } diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java b/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java index df332d2a0..5ad6a320f 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java @@ -6,6 +6,7 @@ import com.simibubi.create.Create; import com.simibubi.create.foundation.worldgen.OreFeatureConfigEntry.DatagenExtension; import net.minecraft.core.Registry; +import net.minecraft.data.BuiltinRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.placement.PlacedFeature; @@ -22,8 +23,8 @@ public class BuiltinRegistration { if (id.getNamespace().equals(Create.ID)) { DatagenExtension datagenExt = entry.getValue().datagenExt(); if (datagenExt != null) { - CONFIGURED_FEATURE_REGISTER.register(id.getPath(), () -> datagenExt.getConfiguredFeature()); - PLACED_FEATURE_REGISTER.register(id.getPath(), () -> datagenExt.getPlacedFeature()); + CONFIGURED_FEATURE_REGISTER.register(id.getPath(), () -> datagenExt.createConfiguredFeature(BuiltinRegistries.ACCESS)); + PLACED_FEATURE_REGISTER.register(id.getPath(), () -> datagenExt.createPlacedFeature(BuiltinRegistries.ACCESS)); } } } diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java b/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java index 0ef2b7582..0da0efab1 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java @@ -17,6 +17,7 @@ import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.minecraft.core.Holder; import net.minecraft.core.Registry; +import net.minecraft.core.RegistryAccess; import net.minecraft.data.worldgen.features.OreFeatures; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -140,19 +141,12 @@ public class OreFeatureConfigEntry extends ConfigBase { } public abstract class DatagenExtension { - protected ConfiguredFeature configuredFeature; - protected PlacedFeature placedFeature; + public abstract ConfiguredFeature createConfiguredFeature(RegistryAccess registryAccess); - public abstract ConfiguredFeature getConfiguredFeature(); - - public PlacedFeature getPlacedFeature() { - if (placedFeature != null) { - return placedFeature; - } - - placedFeature = new PlacedFeature(Holder.direct(getConfiguredFeature()), List.of(new ConfigDrivenPlacement(OreFeatureConfigEntry.this))); - - return placedFeature; + public PlacedFeature createPlacedFeature(RegistryAccess registryAccess) { + Registry> featureRegistry = registryAccess.registryOrThrow(Registry.CONFIGURED_FEATURE_REGISTRY); + Holder> featureHolder = featureRegistry.getOrCreateHolder(ResourceKey.create(Registry.CONFIGURED_FEATURE_REGISTRY, id)); + return new PlacedFeature(featureHolder, List.of(new ConfigDrivenPlacement(OreFeatureConfigEntry.this))); } public OreFeatureConfigEntry parent() { @@ -183,11 +177,7 @@ public class OreFeatureConfigEntry extends ConfigBase { } @Override - public ConfiguredFeature getConfiguredFeature() { - if (configuredFeature != null) { - return configuredFeature; - } - + public ConfiguredFeature createConfiguredFeature(RegistryAccess registryAccess) { List targetStates = new ArrayList<>(); if (block != null) targetStates.add(OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, block.get() @@ -200,9 +190,7 @@ public class OreFeatureConfigEntry extends ConfigBase { .defaultBlockState())); ConfigDrivenOreFeatureConfiguration config = new ConfigDrivenOreFeatureConfiguration(OreFeatureConfigEntry.this, 0, targetStates); - configuredFeature = new ConfiguredFeature<>(AllFeatures.STANDARD_ORE.get(), config); - - return configuredFeature; + return new ConfiguredFeature<>(AllFeatures.STANDARD_ORE.get(), config); } } @@ -215,19 +203,13 @@ public class OreFeatureConfigEntry extends ConfigBase { } @Override - public ConfiguredFeature getConfiguredFeature() { - if (configuredFeature != null) { - return configuredFeature; - } - + public ConfiguredFeature createConfiguredFeature(RegistryAccess registryAccess) { List layerPatterns = this.layerPatterns.stream() .map(NonNullSupplier::get) .toList(); ConfigDrivenLayeredOreFeatureConfiguration config = new ConfigDrivenLayeredOreFeatureConfiguration(OreFeatureConfigEntry.this, 0, layerPatterns); - configuredFeature = new ConfiguredFeature<>(AllFeatures.LAYERED_ORE.get(), config); - - return configuredFeature; + return new ConfiguredFeature<>(AllFeatures.LAYERED_ORE.get(), config); } } }