keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Make Type classes safe to use in concurrent loading (#6825)

This commit is contained in:
ichttt 2020-06-29 22:29:32 +02:00 committed by GitHub
parent b0e35f358e
commit 7858abe96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/minecraftforge/common/PlantType.java
View File

@ -19,17 +19,19 @@
package net.minecraftforge.common;
import net.minecraft.block.BlockState;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.IBlockReader;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
public final class PlantType
{
private static final Pattern INVALID_CHARACTERS = Pattern.compile("[^a-z_]"); //Only a-z and _ are allowed, meaning names must be lower case. And use _ to separate words.
private static final Map<String, PlantType> VALUES = new HashMap<>();
private static final Map<String, PlantType> VALUES = new ConcurrentHashMap<>();
public static final PlantType PLAINS = get("plains");
public static final PlantType DESERT = get("desert");
@ -41,20 +43,21 @@ public final class PlantType
/**
* Getting a custom {@link PlantType}, or an existing one if it has the same name as that one. Your plant should implement {@link IPlantable}
* and return this custom type in {@link IPlantable#getPlantType(IBlockAccess, BlockPos)}.
* and return this custom type in {@link IPlantable#getPlantType(IBlockReader, BlockPos)}.
*
* <p>If your new plant grows on blocks like any one of them above, never create a new {@link PlantType}.
* This enumeration is only functioning in
* {@link net.minecraft.block.Block#canSustainPlant(IBlockState, IWorldReader, BlockPos, EnumFacing, IPlantable)},
* This Type is only functioning in
* {@link net.minecraft.block.Block#canSustainPlant(BlockState, IBlockReader, BlockPos, Direction, IPlantable)},
* which you are supposed to override this function in your new block and create a new plant type to grow on that block.
*
* <p>You can create an instance of your plant type in your API and let your/others mods access it. It will be faster than calling this method.
* This method can be called during parallel loading
* @param name the name of the type of plant, you had better follow the style above
* @return the acquired {@link PlantType}, a new one if not found.
*/
public static PlantType get(String name)
{
return VALUES.computeIfAbsent(name, e -> {
return VALUES.computeIfAbsent(name, e ->
{
if (INVALID_CHARACTERS.matcher(e).find())
throw new IllegalArgumentException("PlantType.get() called with invalid name: " + name);
return new PlantType(e);

19
src/main/java/net/minecraftforge/common/ToolType.java
View File

@ -20,25 +20,30 @@
package net.minecraftforge.common;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import com.google.common.collect.Maps;
public final class ToolType
{
private static final Pattern VALID_NAME = Pattern.compile("[^a-z_]"); //Only a-z and _ are allowed, meaning names must be lower case. And use _ to separate words.
private static final Map<String, ToolType> values = Maps.newHashMap();
private static final Map<String, ToolType> VALUES = new ConcurrentHashMap<>();
public static final ToolType AXE = get("axe");
public static final ToolType PICKAXE = get("pickaxe");
public static final ToolType SHOVEL = get("shovel");
/**
* Gets the ToolType for the specified name, or creates a new one if none for that name does yet exist.
* This method can be called during parallel loading
*/
public static ToolType get(String name)
{
if (VALID_NAME.matcher(name).find())
throw new IllegalArgumentException("ToolType.get() called with invalid name: " + name);
return values.computeIfAbsent(name, k -> new ToolType(name));
return VALUES.computeIfAbsent(name, k ->
{
if (VALID_NAME.matcher(name).find())
throw new IllegalArgumentException("ToolType.get() called with invalid name: " + name);
return new ToolType(name);
});
}
private final String name;

2
src/main/java/net/minecraftforge/common/util/BlockSnapshot.java
View File

@ -27,12 +27,10 @@ import net.minecraft.block.Blocks;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.RegistryKey;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.fml.server.ServerLifecycleHooks;
import net.minecraftforge.registries.ForgeRegistries;
import javax.annotation.Nullable;