Minecraft 1.21.4

This commit is contained in:
LexManos committed 2024-12-05 10:22:55 -08:00
1 parent e643d0a11f
commit 041084d1da
219 files changed
+1841 -2621

No files matched your search

@@ -685,7 +685,7 @@ public final class ForgeHooks {
if (potion != null && potion.unwrapKey().isPresent())
return potion.unwrapKey().get().location().getNamespace();
} else if (item instanceof SpawnEggItem egg) {
var resourceLocation = ForgeRegistries.ENTITY_TYPES.getKey(egg.getType(itemStack));
var resourceLocation = EntityType.getKey(egg.getDefaultType());
if (resourceLocation != null)
return resourceLocation.getNamespace();
}
@@ -1,106 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.common;
import net.minecraft.core.Direction;
import net.minecraft.core.dispenser.DispenseItemBehavior;
import net.minecraft.util.ARGB;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.SpawnEggItem;
import net.minecraft.world.level.block.DispenserBlock;
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.RegisterColorHandlersEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
public class ForgeSpawnEggItem extends SpawnEggItem {
private static final List<ForgeSpawnEggItem> MOD_EGGS = new ArrayList<>();
private static final Map<EntityType<? extends Mob>, ForgeSpawnEggItem> TYPE_MAP = new IdentityHashMap<>();
private final Supplier<? extends EntityType<? extends Mob>> typeSupplier;
@SuppressWarnings("deprecation")
public ForgeSpawnEggItem(Supplier<? extends EntityType<? extends Mob>> type, int backgroundColor, int highlightColor, Properties props) {
super((EntityType<? extends Mob>)null, backgroundColor, highlightColor, props);
this.typeSupplier = type;
MOD_EGGS.add(this);
}
@Nullable
protected DispenseItemBehavior createDispenseBehavior() {
return DEFAULT_DISPENSE_BEHAVIOR;
}
@SuppressWarnings("deprecation")
@Nullable
public static SpawnEggItem fromEntityType(@Nullable EntityType<?> type) {
SpawnEggItem ret = TYPE_MAP.get(type);
return ret != null ? ret : SpawnEggItem.byId(type);
}
@Override
protected EntityType<?> getDefaultType() {
return this.typeSupplier.get();
}
private static final DispenseItemBehavior DEFAULT_DISPENSE_BEHAVIOR = (source, stack) -> {
Direction face = source.state().getValue(DispenserBlock.FACING);
EntityType<?> type = ((SpawnEggItem)stack.getItem()).getType(stack);
try {
type.spawn(source.level(), stack, null, source.pos().relative(face), EntitySpawnReason.DISPENSER, face != Direction.UP, false);
} catch (Exception exception) {
DispenseItemBehavior.LOGGER.error("Error while dispensing spawn egg from dispenser at {}", source.pos(), exception);
return ItemStack.EMPTY;
}
stack.shrink(1);
source.level().gameEvent(GameEvent.ENTITY_PLACE, source.pos(), GameEvent.Context.of(source.state()));
return stack;
};
@Mod.EventBusSubscriber(modid = "forge", bus = Mod.EventBusSubscriber.Bus.MOD)
private static class CommonHandler {
@SubscribeEvent
public static void onCommonSetup(FMLCommonSetupEvent event) {
MOD_EGGS.forEach(egg -> {
DispenseItemBehavior dispenseBehavior = egg.createDispenseBehavior();
if (dispenseBehavior != null)
DispenserBlock.registerBehavior(egg, dispenseBehavior);
TYPE_MAP.put(egg.typeSupplier.get(), egg);
});
}
}
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = "forge", bus = Mod.EventBusSubscriber.Bus.MOD)
private static class ColorRegisterHandler {
@SubscribeEvent(priority = EventPriority.HIGHEST)
public static void registerSpawnEggColors(RegisterColorHandlersEvent.Item event) {
for (ForgeSpawnEggItem egg : MOD_EGGS) {
event.register((stack, layer) -> {
int color = egg.getColor(layer);
if (ARGB.alpha(color) == 0)
color = ARGB.opaque(color);
return color;
}, egg);
}
}
}
}
@@ -10,6 +10,7 @@ import com.mojang.serialization.DynamicOps;
import com.mojang.serialization.MapCodec;
import net.minecraft.core.Holder;
import net.minecraft.resources.DelegatingOps;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraftforge.registries.ForgeRegistries;
@@ -36,6 +37,10 @@ public interface ICondition {
@ApiStatus.Internal
public static ResourceLocation KEY = ResourceLocation.fromNamespaceAndPath("forge", "condition_context");
default <T, O extends DelegatingOps<T>> O wrap(O ops) {
return ops.withContext(KEY, this);
}
IContext EMPTY = new IContext() {
@Override
public <T> Collection<Holder<T>> getTag(TagKey<T> key) {
@@ -5,6 +5,7 @@
package net.minecraftforge.common.crafting.ingredients;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
@@ -32,6 +33,15 @@ public abstract class AbstractIngredient extends Ingredient {
@Override
public abstract IIngredientSerializer<? extends Ingredient> serializer();
@Override
public boolean isEmpty() {
return this.items().count() == 0;
}
@Override
public boolean acceptsItem(Holder<Item> item) {
return this.items().anyMatch(i -> i.equals(item));
}
/* Hide vanilla ingredient static constructors to reduce errors with constructing custom ingredients */
@@ -9,6 +9,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
@@ -44,14 +46,14 @@ public class CompoundIngredient extends AbstractIngredient {
@Override
@NotNull
public List<Holder<Item>> items() {
public Stream<Holder<Item>> items() {
if (this.items == null) {
var tmp = new ArrayList<Holder<Item>>();
for (var child : children)
tmp.addAll(child.items());
child.items().forEach(tmp::add);
this.items = Collections.unmodifiableList(tmp);
}
return this.items;
return this.items.stream();
}
@Override
@@ -18,6 +18,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
/** Ingredient that matches everything from the first ingredient that is not included in the second ingredient */
public class DifferenceIngredient extends AbstractIngredient {
@@ -49,24 +50,18 @@ public class DifferenceIngredient extends AbstractIngredient {
@SuppressWarnings("deprecation")
@Override
public List<Holder<Item>> items() {
public Stream<Holder<Item>> items() {
if (this.items == null) {
var tmp = new ArrayList<Holder<Item>>();
for (var base : this.base.items()) {
boolean match = false;
for (var item : this.subtracted.items()) {
if (base.is(item)) {
match = true;
break;
}
}
this.base.items().forEach(base -> {
boolean match = this.subtracted.items().anyMatch(base::is);
if (!match)
tmp.add(base);
}
});
this.items = Collections.unmodifiableList(tmp);
}
return items;
return items.stream();
}
@Override
@@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
/** Ingredient that matches if all child ingredients match */
public class IntersectionIngredient extends AbstractIngredient {
@@ -61,20 +62,14 @@ public class IntersectionIngredient extends AbstractIngredient {
@SuppressWarnings("deprecation")
@Override
public List<Holder<Item>> items() {
public Stream<Holder<Item>> items() {
if (this.items == null) {
var tmp = new ArrayList<Holder<Item>>();
for (var base : children.get(0).items()) {
children.get(0).items().forEach(base -> {
boolean allMatch = true;
for (int i = 1; i < children.size(); i++) {
boolean match = false;
for (var item : children.get(i).items()) {
if (base.is(item)) {
match = true;
break;
}
}
boolean match = children.get(i).items().anyMatch(base::is);
if (!match) {
allMatch = false;
break;
@@ -82,10 +77,10 @@ public class IntersectionIngredient extends AbstractIngredient {
}
if (allMatch)
tmp.add(base);
}
});
this.items = Collections.unmodifiableList(tmp);
}
return items;
return items.stream();
}
@Override
@@ -36,7 +36,6 @@ import net.minecraft.tags.BlockTags;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.client.ForgeHooksClient;
@@ -271,17 +270,6 @@ public interface IForgeBlock {
return self().getExplosionResistance();
}
/**
*
* Called when A user uses the creative pick block button on this block
*
* @param target The full target the player is looking at
* @return A ItemStack to add to the player's inventory, empty itemstack if nothing should be added.
*/
default ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) {
return self().getCloneItemStack(level, pos, state);
}
/**
* Allows a block to override the standard EntityLivingBase.updateFallState
* particles, this is a server side method that spawns particles with
@@ -5,7 +5,6 @@
package net.minecraftforge.common.extensions;
import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
@@ -22,10 +22,8 @@ import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.SignalGetter;
import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.pathfinder.PathType;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.common.IPlantable;
@@ -200,17 +198,6 @@ public interface IForgeBlockState {
return self().getBlock().getExplosionResistance(self(), level, pos, explosion);
}
/**
*
* Called when A user uses the creative pick block button on this block
*
* @param target The full target the player is looking at
* @return A ItemStack to add to the player's inventory, empty itemstack if nothing should be added.
*/
default ItemStack getCloneItemStack(HitResult target, LevelReader level, BlockPos pos, Player player) {
return self().getBlock().getCloneItemStack(self(), target, level, pos, player);
}
/**
* Allows a block to override the standard EntityLivingBase.updateFallState
* particles, this is a server side method that spawns particles with
@@ -17,14 +17,11 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.phys.HitResult;
import net.minecraftforge.common.ForgeSpawnEggItem;
import net.minecraftforge.common.SoundAction;
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
import net.minecraftforge.entity.PartEntity;
@@ -72,21 +69,6 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundTag> {
return true;
}
/**
* Called when a user uses the creative pick block button on this entity.
*
* @param target The full target the player is looking at
* @return A ItemStack to add to the player's inventory, empty ItemStack if nothing should be added.
*/
default ItemStack getPickedResult(HitResult target) {
var result = self().getPickResult();
if (result == null) {
var egg = ForgeSpawnEggItem.fromEntityType(self().getType());
result = egg == null ? ItemStack.EMPTY : new ItemStack(egg);
}
return result;
}
/**
* If a rider of this entity can interact with this entity. Should return true on the
* ridden entity if so.
@@ -25,6 +25,7 @@ import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.ExtraCodecs;
import net.minecraft.util.GsonHelper;
import net.minecraft.core.HolderLookup;
import net.minecraft.resources.FileToIdConverter;
import net.minecraft.resources.ResourceLocation;
public class LootModifierManager extends SimpleJsonResourceReloadListener<JsonElement> {
@@ -36,7 +37,7 @@ public class LootModifierManager extends SimpleJsonResourceReloadListener<JsonEl
private Map<ResourceLocation, IGlobalLootModifier> modifiers = ImmutableMap.of();
public LootModifierManager(HolderLookup.Provider registries) {
super(registries, ExtraCodecs.JSON, FOLDER);
super(registries.createSerializationContext(JsonOps.INSTANCE), ExtraCodecs.JSON, FileToIdConverter.json(FOLDER));
this.registries = registries;
}
@@ -10,6 +10,7 @@ import java.util.Optional;
import net.minecraft.core.Holder;
import net.minecraft.sounds.Music;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.random.SimpleWeightedRandomList;
import net.minecraft.world.level.biome.AmbientAdditionsSettings;
import net.minecraft.world.level.biome.AmbientMoodSettings;
import net.minecraft.world.level.biome.AmbientParticleSettings;
@@ -19,10 +20,8 @@ import net.minecraft.world.level.biome.BiomeSpecialEffects;
* Extension of the vanilla builder but also provides read access and a copy-from-existing-data helper.
* Also, the base builder crashes if certain values aren't specified on build, so this enforces the setting of those.
*/
public class BiomeSpecialEffectsBuilder extends BiomeSpecialEffects.Builder
{
public static BiomeSpecialEffectsBuilder copyOf(BiomeSpecialEffects baseEffects)
{
public class BiomeSpecialEffectsBuilder extends BiomeSpecialEffects.Builder {
public static BiomeSpecialEffectsBuilder copyOf(BiomeSpecialEffects baseEffects) {
BiomeSpecialEffectsBuilder builder = BiomeSpecialEffectsBuilder.create(baseEffects.getFogColor(), baseEffects.getWaterColor(), baseEffects.getWaterFogColor(), baseEffects.getSkyColor());
builder.grassColorModifier = baseEffects.getGrassColorModifier();
baseEffects.getFoliageColorOverride().ifPresent(builder::foliageColorOverride);
@@ -35,13 +34,11 @@ public class BiomeSpecialEffectsBuilder extends BiomeSpecialEffects.Builder
return builder;
}
public static BiomeSpecialEffectsBuilder create(int fogColor, int waterColor, int waterFogColor, int skyColor)
{
public static BiomeSpecialEffectsBuilder create(int fogColor, int waterColor, int waterFogColor, int skyColor) {
return new BiomeSpecialEffectsBuilder(fogColor, waterColor, waterFogColor, skyColor);
}
protected BiomeSpecialEffectsBuilder(int fogColor, int waterColor, int waterFogColor, int skyColor)
{
protected BiomeSpecialEffectsBuilder(int fogColor, int waterColor, int waterFogColor, int skyColor) {
super();
this.fogColor(fogColor);
this.waterColor(waterColor);
@@ -49,63 +46,51 @@ public class BiomeSpecialEffectsBuilder extends BiomeSpecialEffects.Builder
this.skyColor(skyColor);
}
public int getFogColor()
{
public int getFogColor() {
return this.fogColor.getAsInt();
}
public int waterColor()
{
public int waterColor() {
return this.waterColor.getAsInt();
}
public int getWaterFogColor()
{
public int getWaterFogColor() {
return this.waterFogColor.getAsInt();
}
public int getSkyColor()
{
public int getSkyColor() {
return this.skyColor.getAsInt();
}
public BiomeSpecialEffects.GrassColorModifier getGrassColorModifier()
{
public BiomeSpecialEffects.GrassColorModifier getGrassColorModifier() {
return this.grassColorModifier;
}
public Optional<Integer> getFoliageColorOverride()
{
public Optional<Integer> getFoliageColorOverride() {
return this.foliageColorOverride;
}
public Optional<Integer> getGrassColorOverride()
{
public Optional<Integer> getGrassColorOverride() {
return this.grassColorOverride;
}
public Optional<AmbientParticleSettings> getAmbientParticle()
{
public Optional<AmbientParticleSettings> getAmbientParticle() {
return this.ambientParticle;
}
public Optional<Holder<SoundEvent>> getAmbientLoopSound()
{
public Optional<Holder<SoundEvent>> getAmbientLoopSound() {
return this.ambientLoopSoundEvent;
}
public Optional<AmbientMoodSettings> getAmbientMoodSound()
{
public Optional<AmbientMoodSettings> getAmbientMoodSound() {
return this.ambientMoodSettings;
}
public Optional<AmbientAdditionsSettings> getAmbientAdditionsSound()
{
public Optional<AmbientAdditionsSettings> getAmbientAdditionsSound() {
return this.ambientAdditionsSettings;
}
public Optional<Music> getBackgroundMusic()
{
public Optional<SimpleWeightedRandomList<Music>> getBackgroundMusic() {
return this.backgroundMusic;
}
}