Skip to content

Commit 260fbf0

Browse files
committed
Merge branch '1.21' into 1.20
# Conflicts: # xplat/src/main/java/cc/abbie/emi_ores/compat/emi/stack/BiomeEmiStack.java
2 parents 2e19a4d + 25a9d6c commit 260fbf0

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ enabled_platforms=fabric,forge
99

1010
# Mod Properties
1111
archives_base_name=emi_ores
12-
mod_version=1.1
12+
mod_version=1.2
1313
maven_group=cc.abbie
1414

1515
# Fabric Properties

xplat/src/main/java/cc/abbie/emi_ores/compat/emi/stack/BiomeEmiStack.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.minecraft.core.registries.Registries;
1717
import net.minecraft.nbt.CompoundTag;
1818
import net.minecraft.network.chat.Component;
19+
import net.minecraft.resources.ResourceKey;
1920
import net.minecraft.resources.ResourceLocation;
2021
import net.minecraft.world.inventory.InventoryMenu;
2122
import net.minecraft.world.level.biome.Biome;
@@ -126,7 +127,7 @@ public String getType() {
126127
@Override
127128
public EmiStack create(ResourceLocation id, CompoundTag nbt, long amount) {
128129
Registry<Biome> biomeRegistry = Minecraft.getInstance().level.registryAccess().registryOrThrow(Registries.BIOME);
129-
return BiomeEmiStack.of(biomeRegistry.get(id), nbt, amount);
130+
return BiomeEmiStack.of(biomeRegistry.getOrThrow(ResourceKey.create(Registries.BIOME, id)), nbt, amount);
130131
}
131132
}
132133
}

0 commit comments

Comments
 (0)