mirror of
https://github.com/architectury/architectury-api.git
synced 2026-03-28 03:56:59 -05:00
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
Signed-off-by: shedaniel <daniel@shedaniel.me> # Conflicts: # fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java
This commit is contained in:
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.client.gui;
|
||||||
|
|
||||||
|
import dev.architectury.injectables.annotations.ExpectPlatform;
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||||
|
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
||||||
|
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registry for {@link ClientTooltipComponent} factories
|
||||||
|
*/
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
public final class ClientTooltipComponentRegistry {
|
||||||
|
private ClientTooltipComponentRegistry() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Allows users to register custom {@link ClientTooltipComponent}
|
||||||
|
* factories for their {@link TooltipComponent} types.
|
||||||
|
*
|
||||||
|
* @param clazz class of {@link T}
|
||||||
|
* @param factory factory to create instances of {@link ClientTooltipComponent} from {@link T}
|
||||||
|
* @param <T> the type of {@link TooltipComponent} factory
|
||||||
|
*/
|
||||||
|
@ExpectPlatform
|
||||||
|
public static <T extends TooltipComponent> void register(Class<T> clazz, Function<? super T, ? extends ClientTooltipComponent> factory) {
|
||||||
|
throw new AssertionError();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.level.entity;
|
||||||
|
|
||||||
|
import dev.architectury.injectables.annotations.ExpectPlatform;
|
||||||
|
import net.minecraft.world.entity.EntityType;
|
||||||
|
import net.minecraft.world.entity.Mob;
|
||||||
|
import net.minecraft.world.entity.SpawnPlacements;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public final class SpawnPlacementsRegistry {
|
||||||
|
/**
|
||||||
|
* Registers the spawn placement of an entity.
|
||||||
|
*
|
||||||
|
* @param type the type of entity
|
||||||
|
* @param spawnPlacement the type of spawn placement
|
||||||
|
* @param heightmapType the type of heightmap
|
||||||
|
* @param spawnPredicate the spawn predicate
|
||||||
|
* @see net.minecraft.world.entity.SpawnPlacements
|
||||||
|
*/
|
||||||
|
@ExpectPlatform
|
||||||
|
public static <T extends Mob> void register(Supplier<? extends EntityType<T>> type, SpawnPlacements.Type spawnPlacement, Heightmap.Types heightmapType, SpawnPlacements.SpawnPredicate<T> spawnPredicate) {
|
||||||
|
throw new AssertionError();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.registries.options;
|
||||||
|
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
|
||||||
|
public record DefaultIdRegistrarOption(ResourceLocation defaultId) implements RegistrarOption {
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.client.gui.fabric;
|
||||||
|
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.fabricmc.fabric.api.client.rendering.v1.TooltipComponentCallback;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||||
|
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
@ApiStatus.Internal
|
||||||
|
public class ClientTooltipComponentRegistryImpl {
|
||||||
|
public static <T extends TooltipComponent> void register(Class<T> clazz, Function<? super T, ? extends ClientTooltipComponent> factory) {
|
||||||
|
TooltipComponentCallback.EVENT.register((tooltipComponent) -> {
|
||||||
|
if (clazz.isInstance(tooltipComponent)) {
|
||||||
|
return factory.apply(clazz.cast(tooltipComponent));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.level.entity.fabric;
|
||||||
|
|
||||||
|
import net.minecraft.world.entity.EntityType;
|
||||||
|
import net.minecraft.world.entity.Mob;
|
||||||
|
import net.minecraft.world.entity.SpawnPlacements;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public class SpawnPlacementsRegistryImpl {
|
||||||
|
public static <T extends Mob> void register(Supplier<? extends EntityType<T>> type, SpawnPlacements.Type spawnPlacement, Heightmap.Types heightmapType, SpawnPlacements.SpawnPredicate<T> spawnPredicate) {
|
||||||
|
SpawnPlacements.register(type.get(), spawnPlacement, heightmapType, spawnPredicate);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,6 +27,7 @@ import dev.architectury.registry.registries.Registrar;
|
|||||||
import dev.architectury.registry.registries.RegistrarBuilder;
|
import dev.architectury.registry.registries.RegistrarBuilder;
|
||||||
import dev.architectury.registry.registries.RegistrarManager;
|
import dev.architectury.registry.registries.RegistrarManager;
|
||||||
import dev.architectury.registry.registries.RegistrySupplier;
|
import dev.architectury.registry.registries.RegistrySupplier;
|
||||||
|
import dev.architectury.registry.registries.options.DefaultIdRegistrarOption;
|
||||||
import dev.architectury.registry.registries.options.RegistrarOption;
|
import dev.architectury.registry.registries.options.RegistrarOption;
|
||||||
import dev.architectury.registry.registries.options.StandardRegistrarOption;
|
import dev.architectury.registry.registries.options.StandardRegistrarOption;
|
||||||
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
|
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
|
||||||
@@ -90,7 +91,7 @@ public class RegistrarManagerImpl {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> RegistrarBuilder<T> builder(Class<T> type, ResourceLocation registryId) {
|
public <T> RegistrarBuilder<T> builder(Class<T> type, ResourceLocation registryId) {
|
||||||
return new RegistrarBuilderWrapper<>(modId, FabricRegistryBuilder.createSimple(type, registryId));
|
return new RegistrarBuilderWrapper<>(modId, type, registryId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,24 +120,35 @@ public class RegistrarManagerImpl {
|
|||||||
|
|
||||||
public static class RegistrarBuilderWrapper<T> implements RegistrarBuilder<T> {
|
public static class RegistrarBuilderWrapper<T> implements RegistrarBuilder<T> {
|
||||||
private final String modId;
|
private final String modId;
|
||||||
private FabricRegistryBuilder<T, MappedRegistry<T>> builder;
|
private final Class<T> type;
|
||||||
|
private final ResourceLocation registryId;
|
||||||
|
private final List<Consumer<FabricRegistryBuilder<T, ? extends MappedRegistry<T>>>> apply = new ArrayList<>();
|
||||||
|
@Nullable
|
||||||
|
private ResourceLocation defaultId;
|
||||||
|
|
||||||
public RegistrarBuilderWrapper(String modId, FabricRegistryBuilder<T, MappedRegistry<T>> builder) {
|
public RegistrarBuilderWrapper(String modId, Class<T> type, ResourceLocation registryId) {
|
||||||
this.modId = modId;
|
this.modId = modId;
|
||||||
this.builder = builder;
|
this.type = type;
|
||||||
|
this.registryId = registryId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Registrar<T> build() {
|
public Registrar<T> build() {
|
||||||
|
final var builder = defaultId == null
|
||||||
|
? FabricRegistryBuilder.createSimple(type, registryId)
|
||||||
|
: FabricRegistryBuilder.createDefaulted(type, registryId, defaultId);
|
||||||
|
apply.forEach(consumer -> consumer.accept(builder));
|
||||||
return RegistrarManager.get(modId).get(builder.buildAndRegister());
|
return RegistrarManager.get(modId).get(builder.buildAndRegister());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RegistrarBuilder<T> option(RegistrarOption option) {
|
public RegistrarBuilder<T> option(RegistrarOption option) {
|
||||||
if (option == StandardRegistrarOption.SAVE_TO_DISC) {
|
if (option == StandardRegistrarOption.SAVE_TO_DISC) {
|
||||||
this.builder.attribute(RegistryAttribute.PERSISTED);
|
this.apply.add(builder -> builder.attribute(RegistryAttribute.PERSISTED));
|
||||||
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
|
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
|
||||||
this.builder.attribute(RegistryAttribute.SYNCED);
|
this.apply.add(builder -> builder.attribute(RegistryAttribute.SYNCED));
|
||||||
|
} else if (option instanceof DefaultIdRegistrarOption opt) {
|
||||||
|
this.defaultId = opt.defaultId();
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,24 +43,24 @@ import net.minecraftforge.fluids.FluidType;
|
|||||||
import net.minecraftforge.fluids.ForgeFlowingFluid;
|
import net.minecraftforge.fluids.ForgeFlowingFluid;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.IdentityHashMap;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
public abstract class ArchitecturyFlowingFluid extends ForgeFlowingFluid {
|
public abstract class ArchitecturyFlowingFluid extends ForgeFlowingFluid {
|
||||||
|
private static final Map<ArchitecturyFluidAttributes, FluidType> FLUID_TYPE_MAP = new IdentityHashMap<>();
|
||||||
private final ArchitecturyFluidAttributes attributes;
|
private final ArchitecturyFluidAttributes attributes;
|
||||||
private final Supplier<FluidType> forgeType;
|
|
||||||
|
|
||||||
ArchitecturyFlowingFluid(ArchitecturyFluidAttributes attributes) {
|
ArchitecturyFlowingFluid(ArchitecturyFluidAttributes attributes) {
|
||||||
super(toForgeProperties(attributes));
|
super(toForgeProperties(attributes));
|
||||||
this.attributes = attributes;
|
this.attributes = attributes;
|
||||||
this.forgeType = Suppliers.memoize(() -> {
|
|
||||||
return new ArchitecturyFluidAttributesForge(FluidType.Properties.create(), this, attributes);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Properties toForgeProperties(ArchitecturyFluidAttributes attributes) {
|
private static Properties toForgeProperties(ArchitecturyFluidAttributes attributes) {
|
||||||
Properties forge = new Properties(Suppliers.memoize(() -> {
|
Properties forge = new Properties(Suppliers.memoize(() -> {
|
||||||
return new ArchitecturyFluidAttributesForge(FluidType.Properties.create(), attributes.getSourceFluid(), attributes);
|
return FLUID_TYPE_MAP.computeIfAbsent(attributes, attr -> {
|
||||||
|
return new ArchitecturyFluidAttributesForge(FluidType.Properties.create(), attr.getSourceFluid(), attr);
|
||||||
|
});
|
||||||
}), attributes::getSourceFluid, attributes::getFlowingFluid);
|
}), attributes::getSourceFluid, attributes::getFlowingFluid);
|
||||||
forge.slopeFindDistance(attributes.getSlopeFindDistance());
|
forge.slopeFindDistance(attributes.getSlopeFindDistance());
|
||||||
forge.levelDecreasePerBlock(attributes.getDropOff());
|
forge.levelDecreasePerBlock(attributes.getDropOff());
|
||||||
@@ -71,11 +71,6 @@ public abstract class ArchitecturyFlowingFluid extends ForgeFlowingFluid {
|
|||||||
return forge;
|
return forge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public FluidType getFluidType() {
|
|
||||||
return forgeType.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Fluid getFlowing() {
|
public Fluid getFlowing() {
|
||||||
return attributes.getFlowingFluid();
|
return attributes.getFlowingFluid();
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.client.gui.forge;
|
||||||
|
|
||||||
|
import dev.architectury.platform.forge.EventBuses;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||||
|
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.EventPriority;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@ApiStatus.Internal
|
||||||
|
public class ClientTooltipComponentRegistryImpl {
|
||||||
|
@Nullable
|
||||||
|
private static List<Entry<?>> entries = new ArrayList<>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
EventBuses.onRegistered("architectury", bus -> {
|
||||||
|
bus.<RegisterClientTooltipComponentFactoriesEvent>addListener(EventPriority.HIGH, event -> {
|
||||||
|
if (entries != null) {
|
||||||
|
for (Entry<?> entry : entries) {
|
||||||
|
Entry<TooltipComponent> casted = (Entry<TooltipComponent>) entry;
|
||||||
|
event.register(casted.clazz(), casted.factory());
|
||||||
|
}
|
||||||
|
|
||||||
|
entries = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T extends TooltipComponent> void register(Class<T> clazz, Function<? super T, ? extends ClientTooltipComponent> factory) {
|
||||||
|
if (entries == null) {
|
||||||
|
throw new IllegalStateException("Cannot register ClientTooltipComponent factory when factories are already aggregated!");
|
||||||
|
}
|
||||||
|
entries.add(new Entry<>(clazz, factory));
|
||||||
|
}
|
||||||
|
|
||||||
|
public record Entry<T extends TooltipComponent>(
|
||||||
|
Class<T> clazz, Function<? super T, ? extends ClientTooltipComponent> factory
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.registry.level.entity.forge;
|
||||||
|
|
||||||
|
import dev.architectury.platform.forge.EventBuses;
|
||||||
|
import net.minecraft.world.entity.EntityType;
|
||||||
|
import net.minecraft.world.entity.Mob;
|
||||||
|
import net.minecraft.world.entity.SpawnPlacements;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public class SpawnPlacementsRegistryImpl {
|
||||||
|
private static List<Entry<?>> entries = new ArrayList<>();
|
||||||
|
|
||||||
|
private record Entry<T extends Mob>(Supplier<? extends EntityType<T>> type, SpawnPlacements.Type spawnPlacement,
|
||||||
|
Heightmap.Types heightmapType,
|
||||||
|
SpawnPlacements.SpawnPredicate<T> spawnPredicate) {
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
EventBuses.onRegistered("architectury", bus -> {
|
||||||
|
bus.<SpawnPlacementRegisterEvent>addListener(event -> {
|
||||||
|
for (Entry<?> entry : entries) {
|
||||||
|
Entry<Mob> casted = (Entry<Mob>) entry;
|
||||||
|
event.register(casted.type().get(), casted.spawnPlacement(), casted.heightmapType(), casted.spawnPredicate(), SpawnPlacementRegisterEvent.Operation.OR);
|
||||||
|
}
|
||||||
|
entries = null;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T extends Mob> void register(Supplier<? extends EntityType<T>> type, SpawnPlacements.Type spawnPlacement, Heightmap.Types heightmapType, SpawnPlacements.SpawnPredicate<T> spawnPredicate) {
|
||||||
|
if (entries != null) {
|
||||||
|
entries.add(new Entry<>(type, spawnPlacement, heightmapType, spawnPredicate));
|
||||||
|
} else {
|
||||||
|
throw new IllegalStateException("SpawnPlacementsRegistry.register must not be called after the registry has been collected!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,6 +28,7 @@ import dev.architectury.registry.registries.Registrar;
|
|||||||
import dev.architectury.registry.registries.RegistrarBuilder;
|
import dev.architectury.registry.registries.RegistrarBuilder;
|
||||||
import dev.architectury.registry.registries.RegistrarManager;
|
import dev.architectury.registry.registries.RegistrarManager;
|
||||||
import dev.architectury.registry.registries.RegistrySupplier;
|
import dev.architectury.registry.registries.RegistrySupplier;
|
||||||
|
import dev.architectury.registry.registries.options.DefaultIdRegistrarOption;
|
||||||
import dev.architectury.registry.registries.options.RegistrarOption;
|
import dev.architectury.registry.registries.options.RegistrarOption;
|
||||||
import dev.architectury.registry.registries.options.StandardRegistrarOption;
|
import dev.architectury.registry.registries.options.StandardRegistrarOption;
|
||||||
import net.minecraft.core.Registry;
|
import net.minecraft.core.Registry;
|
||||||
@@ -305,6 +306,8 @@ public class RegistrarManagerImpl {
|
|||||||
this.saveToDisk = true;
|
this.saveToDisk = true;
|
||||||
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
|
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
|
||||||
this.syncToClients = true;
|
this.syncToClients = true;
|
||||||
|
} else if (option instanceof DefaultIdRegistrarOption opt) {
|
||||||
|
this.builder.setDefaultKey(opt.defaultId());
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
package dev.architectury.test;
|
package dev.architectury.test;
|
||||||
|
|
||||||
import dev.architectury.event.events.client.ClientLifecycleEvent;
|
import dev.architectury.event.events.client.ClientLifecycleEvent;
|
||||||
|
import dev.architectury.registry.client.gui.ClientTooltipComponentRegistry;
|
||||||
import dev.architectury.registry.client.level.entity.EntityRendererRegistry;
|
import dev.architectury.registry.client.level.entity.EntityRendererRegistry;
|
||||||
import dev.architectury.test.debug.ConsoleMessageSink;
|
import dev.architectury.test.debug.ConsoleMessageSink;
|
||||||
import dev.architectury.test.debug.MessageSink;
|
import dev.architectury.test.debug.MessageSink;
|
||||||
@@ -33,6 +34,7 @@ import dev.architectury.test.networking.TestModNet;
|
|||||||
import dev.architectury.test.particle.TestParticles;
|
import dev.architectury.test.particle.TestParticles;
|
||||||
import dev.architectury.test.registry.TestRegistries;
|
import dev.architectury.test.registry.TestRegistries;
|
||||||
import dev.architectury.test.registry.client.TestKeybinds;
|
import dev.architectury.test.registry.client.TestKeybinds;
|
||||||
|
import dev.architectury.test.registry.objects.ItemWithTooltip;
|
||||||
import dev.architectury.test.tags.TestTags;
|
import dev.architectury.test.tags.TestTags;
|
||||||
import dev.architectury.test.trade.TestTrades;
|
import dev.architectury.test.trade.TestTrades;
|
||||||
import dev.architectury.test.worldgen.TestWorldGeneration;
|
import dev.architectury.test.worldgen.TestWorldGeneration;
|
||||||
@@ -72,6 +74,7 @@ public class TestMod {
|
|||||||
TestModNet.initializeClient();
|
TestModNet.initializeClient();
|
||||||
EntityRendererRegistry.register(TestRegistries.TEST_ENTITY, CowRenderer::new);
|
EntityRendererRegistry.register(TestRegistries.TEST_ENTITY, CowRenderer::new);
|
||||||
EntityRendererRegistry.register(TestRegistries.TEST_ENTITY_2, CowRenderer::new);
|
EntityRendererRegistry.register(TestRegistries.TEST_ENTITY_2, CowRenderer::new);
|
||||||
|
ClientTooltipComponentRegistry.register(ItemWithTooltip.MyTooltipComponent.class, ItemWithTooltip.MyClientTooltipComponent::new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import dev.architectury.test.TestMod;
|
|||||||
import dev.architectury.test.entity.TestEntity;
|
import dev.architectury.test.entity.TestEntity;
|
||||||
import dev.architectury.test.recipes.TestRecipeSerializer;
|
import dev.architectury.test.recipes.TestRecipeSerializer;
|
||||||
import dev.architectury.test.registry.objects.EquippableTickingItem;
|
import dev.architectury.test.registry.objects.EquippableTickingItem;
|
||||||
|
import dev.architectury.test.registry.objects.ItemWithTooltip;
|
||||||
import dev.architectury.test.tab.TestCreativeTabs;
|
import dev.architectury.test.tab.TestCreativeTabs;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
@@ -132,6 +133,9 @@ public class TestRegistries {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
public static final RegistrySupplier<ItemWithTooltip> TEST_TOOLTIP = ITEMS.register("test_tooltip",
|
||||||
|
() -> new ItemWithTooltip(new Item.Properties().arch$tab(TestCreativeTabs.TEST_TAB)));
|
||||||
|
|
||||||
public static final RegistrySupplier<Block> TEST_BLOCK = BLOCKS.register("test_block", () ->
|
public static final RegistrySupplier<Block> TEST_BLOCK = BLOCKS.register("test_block", () ->
|
||||||
new Block(BlockBehaviour.Properties.copy(Blocks.STONE)));
|
new Block(BlockBehaviour.Properties.copy(Blocks.STONE)));
|
||||||
public static final RegistrySupplier<Block> COLLISION_BLOCK = BLOCKS.register("collision_block", () ->
|
public static final RegistrySupplier<Block> COLLISION_BLOCK = BLOCKS.register("collision_block", () ->
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of architectury.
|
||||||
|
* Copyright (C) 2020, 2021, 2022 architectury
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package dev.architectury.test.registry.objects;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.minecraft.client.gui.Font;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||||
|
import net.minecraft.client.renderer.entity.ItemRenderer;
|
||||||
|
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public class ItemWithTooltip extends Item {
|
||||||
|
public ItemWithTooltip(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull Optional<TooltipComponent> getTooltipImage(ItemStack itemStack) {
|
||||||
|
return Optional.of(new MyTooltipComponent(itemStack.getCount()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public record MyTooltipComponent(int count) implements TooltipComponent {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
public record MyClientTooltipComponent(MyTooltipComponent component) implements ClientTooltipComponent {
|
||||||
|
@Override
|
||||||
|
public int getHeight() {
|
||||||
|
return 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getWidth(Font font) {
|
||||||
|
return 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderImage(Font font, int x, int y, PoseStack poseStack, ItemRenderer itemRenderer) {
|
||||||
|
poseStack.pushPose();
|
||||||
|
poseStack.translate(0, 0, 400);
|
||||||
|
font.draw(poseStack, "Count: " + component.count, x + getWidth(font) / 2, y + (getHeight() - font.lineHeight) / 2, 0xFF00FF00);
|
||||||
|
poseStack.popPose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user