Deprecate net.minecraftforge.common.util.Constants and inner classes to encourage usage of vanilla constants (#8140)

This commit is contained in:
Robert Kämpf authored and GitHub committed 2021-11-23 16:47:43 -08:00
1 parent 4a2572d545
commit ebe375dac0
7 files changed
+118 -99

No files matched your search

@@ -21,6 +21,7 @@ package net.minecraftforge.fluids;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.nbt.Tag;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.item.ItemStack;
@@ -29,7 +30,6 @@ import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.Component;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.IRegistryDelegate;
@@ -114,7 +114,7 @@ public class FluidStack
{
return EMPTY;
}
if (!nbt.contains("FluidName", Constants.NBT.TAG_STRING))
if (!nbt.contains("FluidName", Tag.TAG_STRING))
{
return EMPTY;
}
@@ -127,7 +127,7 @@ public class FluidStack
}
FluidStack stack = new FluidStack(fluid, nbt.getInt("Amount"));
if (nbt.contains("Tag", Constants.NBT.TAG_COMPOUND))
if (nbt.contains("Tag", Tag.TAG_COMPOUND))
{
stack.tag = nbt.getCompound("Tag");
}
@@ -234,7 +234,7 @@ public class FluidStack
{
getOrCreateTag();
CompoundTag child = tag.getCompound(childName);
if (!tag.contains(childName, Constants.NBT.TAG_COMPOUND))
if (!tag.contains(childName, Tag.TAG_COMPOUND))
{
tag.put(childName, child);
}
@@ -19,11 +19,11 @@
package net.minecraftforge.fluids.capability.wrappers;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.LiquidBlockContainer;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
@@ -60,7 +60,7 @@ public class BlockWrapper extends VoidFluidHandler
if (action.execute())
{
FluidUtil.destroyBlockOnFluidPlacement(world, blockPos);
world.setBlock(blockPos, state, Constants.BlockFlags.DEFAULT_AND_RERENDER);
world.setBlock(blockPos, state, Block.UPDATE_ALL_IMMEDIATE);
}
return FluidAttributes.BUCKET_VOLUME;
}