Update registry manager get() calls to getOrThrow()

PrismarineJS · Oct 27, 2024 · f39a02f · f39a02f
1 parent 2562198
commit f39a02f
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
@@ -105,7 +105,7 @@ public String getDataName() {
     public JsonArray generateDataJson() {
         JsonArray biomesArray = new JsonArray();
         DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager();
-        Registry<Biome> biomeRegistry = registryManager.get(RegistryKeys.BIOME);
+        Registry<Biome> biomeRegistry = registryManager.getOrThrow(RegistryKeys.BIOME);
 
         biomeRegistry.stream()
                 .map(biome -> generateBiomeInfo(biomeRegistry, biome))

diff --git a/...ain/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/...ain/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -25,7 +25,7 @@ public String getDataName() {
 
     @Override
     public JsonObject generateDataJson() {
-        Registry<Block> blockRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK);
+        Registry<Block> blockRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.BLOCK);
         BlockShapesCache blockShapesCache = new BlockShapesCache();
 
         blockRegistry.forEach(blockShapesCache::processBlock);

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -38,7 +38,7 @@ public class BlocksDataGenerator implements IDataGenerator {
     private static final Logger logger = LoggerFactory.getLogger(BlocksDataGenerator.class);
 
     private static List<Item> getItemsEffectiveForBlock(BlockState blockState) {
-        return DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM).stream()
+        return DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM).stream()
                 .filter(item -> item.getDefaultStack().isSuitableFor(blockState))
                 .collect(Collectors.toList());
     }

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java
@@ -39,7 +39,7 @@ public String getDataName() {
     @Override
     public JsonArray generateDataJson() {
         JsonArray resultsArray = new JsonArray();
-        Registry<StatusEffect> statusEffectRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.STATUS_EFFECT);
+        Registry<StatusEffect> statusEffectRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.STATUS_EFFECT);
         statusEffectRegistry.forEach(effect -> resultsArray.add(generateEffect(statusEffectRegistry, effect)));
         return resultsArray;
     }

diff --git a/....3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/....3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -25,7 +25,7 @@ public static String getEnchantmentTargetName(RegistryEntryList<Item> target) {
     private static boolean isEnchantmentInTag(Enchantment enchantment, String tag) {
         return DGU.getWorld()
                 .getRegistryManager()
-                .get(RegistryKeys.ENCHANTMENT)
+                .getOrThrow(RegistryKeys.ENCHANTMENT)
                 .streamTagsAndEntries()
                 .filter(tagKeyNamedPair -> tagKeyNamedPair.getFirst().id().equals(Identifier.of(tag)))
                 .flatMap(tagKeyNamedPair -> tagKeyNamedPair.getSecond().stream())
@@ -100,7 +100,7 @@ public String getDataName() {
     @Override
     public JsonArray generateDataJson() {
         JsonArray resultsArray = new JsonArray();
-        Registry<Enchantment> enchantmentRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ENCHANTMENT);
+        Registry<Enchantment> enchantmentRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT);
         enchantmentRegistry.stream()
                 .forEach(enchantment -> resultsArray.add(generateEnchantment(enchantmentRegistry, enchantment)));
         return resultsArray;

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -112,7 +112,7 @@ public String getDataName() {
     @Override
     public JsonArray generateDataJson() {
         JsonArray resultArray = new JsonArray();
-        Registry<EntityType<?>> entityTypeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ENTITY_TYPE);
+        Registry<EntityType<?>> entityTypeRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ENTITY_TYPE);
         entityTypeRegistry.forEach(entity -> resultArray.add(generateEntity(entityTypeRegistry, entity)));
         return resultArray;
     }

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java
@@ -43,7 +43,7 @@ public String getDataName() {
 
     public JsonArray generateDataJson() {
         JsonArray resultsArray = new JsonArray();
-        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM);
+        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM);
         itemRegistry.stream()
                 .filter(i -> i.getComponents().contains(DataComponentTypes.FOOD))
                 .forEach(food -> resultsArray.add(generateFoodDescriptor(itemRegistry, food)));

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java
@@ -39,7 +39,7 @@ public static JsonObject generateItem(Registry<Item> itemRegistry, Item item) {
         itemDesc.addProperty("stackSize", item.getMaxCount());
 
         JsonArray enchantCategoriesArray = new JsonArray();
-        DGU.getWorld().getRegistryManager().get(RegistryKeys.ENCHANTMENT).stream()
+        DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT).stream()
                 .map(Enchantment::getApplicableItems)
                 .filter(applicableItems -> applicableItems.contains(itemRegistry.getEntry(item)))
                 .map(EnchantmentsDataGenerator::getEnchantmentTargetName)
@@ -76,7 +76,7 @@ public String getDataName() {
     @Override
     public JsonArray generateDataJson() {
         JsonArray resultArray = new JsonArray();
-        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM);
+        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM);
         itemRegistry.stream().forEach(item -> resultArray.add(generateItem(itemRegistry, item)));
         return resultArray;
     }

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java
@@ -81,7 +81,7 @@ public static List<MaterialInfo> getGlobalMaterialInfo() {
 
         HashSet<String> uniqueMaterialNames = new HashSet<>();
 
-        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM);
+        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM);
         itemRegistry.forEach(item -> {
             if (item instanceof MiningToolItem toolItem) {
                 item.getComponents().get(DataComponentTypes.TOOL).rules()
@@ -111,7 +111,7 @@ public String getDataName() {
 
     @Override
     public JsonElement generateDataJson() {
-        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM);
+        Registry<Item> itemRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM);
 
         Map<String, Map<Item, Float>> materialMiningSpeeds = new LinkedHashMap<>();
         materialMiningSpeeds.put("default", ImmutableMap.of());

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java
@@ -26,7 +26,7 @@ public String getDataName() {
     @Override
     public JsonArray generateDataJson() {
         JsonArray resultsArray = new JsonArray();
-        Registry<ParticleType<?>> particleTypeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.PARTICLE_TYPE);
+        Registry<ParticleType<?>> particleTypeRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.PARTICLE_TYPE);
         particleTypeRegistry.forEach(particleType -> resultsArray.add(generateParticleType(particleTypeRegistry, particleType)));
         return resultsArray;
     }

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java
@@ -18,7 +18,7 @@
 public class RecipeDataGenerator implements IDataGenerator {
 
     private static int getRawIdFor(Item item) {
-        return DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM).getRawId(item);
+        return DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.ITEM).getRawId(item);
     }
 
     @Override

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -131,8 +131,8 @@ public String getDataName() {
     @Override
     public JsonObject generateDataJson() {
         DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager();
-        Registry<Biome> biomeRegistry = registryManager.get(RegistryKeys.BIOME);
-        Registry<Block> blockRegistry = registryManager.get(RegistryKeys.BLOCK);
+        Registry<Biome> biomeRegistry = registryManager.getOrThrow(RegistryKeys.BIOME);
+        Registry<Block> blockRegistry = registryManager.getOrThrow(RegistryKeys.BLOCK);
 
         BiomeTintColors biomeTintColors = generateBiomeTintColors(biomeRegistry);
         Map<Integer, Integer> redstoneColors = generateRedstoneTintColors();

diff --git a/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java b/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java
@@ -54,7 +54,7 @@ public LightingProvider getLightingProvider() {
 
     @Override
     public int getColor(BlockPos pos, ColorResolver colorResolver) {
-        Registry<Biome> biomeRegistry = DGU.getWorld().getRegistryManager().getOptional(RegistryKeys.BIOME).get();
+        Registry<Biome> biomeRegistry = DGU.getWorld().getRegistryManager().getOrThrow(RegistryKeys.BIOME);
         Biome plainsBiome = biomeRegistry.get(BiomeKeys.PLAINS);
 
         return colorResolver.getColor(plainsBiome, pos.getX(), pos.getY());