Skip to content

Commit

Permalink
1.20.6 update (#439)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tides authored Jun 15, 2024
1 parent 5223d7f commit 1b4518c
Show file tree
Hide file tree
Showing 126 changed files with 23,732 additions and 10,246 deletions.
6 changes: 3 additions & 3 deletions Obsidian.API/Registry/Codecs/Biomes/BiomeCodec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

public sealed record class BiomeCodec : ICodec
{
public string Name { get; set; }
public required string Name { get; set; }

public int Id { get; set; }
public required int Id { get; set; }

public BiomeElement Element { get; set; }
public required BiomeElement Element { get; set; }
}
30 changes: 28 additions & 2 deletions Obsidian.API/Registry/Codecs/Biomes/BiomeElement.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
namespace Obsidian.API.Registry.Codecs.Biomes;
using System.Text.Json.Serialization;

namespace Obsidian.API.Registry.Codecs.Biomes;

public sealed record class BiomeElement
{
public required BiomeEffect Effects { get; set; }

public required bool HasPrecipitation { get; set; }


public float Depth { get; set; }
public float Temperature { get; set; }
public float Scale { get; set; }
Expand All @@ -15,5 +16,30 @@ public sealed record class BiomeElement
public string? Category { get; set; }
public string? TemperatureModifier { get; set; }

public string[][] Features { get; set; } = [];
public Dictionary<string, string[]> Carvers { get; set; } = default!;
public Dictionary<string, SpawnerMob[]> Spawners { get; set; } = default!;
public Dictionary<string, SpawnCost> SpawnCosts { get; set; } = default!;

public bool PlayerSpawnFriendly { get; set; }
}

public sealed class SpawnCost
{
public required float Charge { get; init; }
public required float EnergyBudget { get; init; }
}

public sealed class SpawnerMob
{
public required string Type { get; init; }

[JsonPropertyName("maxCount")]
public required int MaxCount { get; init; }

[JsonPropertyName("minCount")]
public required int MinCount { get; init; }

[JsonPropertyName("weight")]
public required int Weight { get; init; }
}
2 changes: 1 addition & 1 deletion Obsidian.API/Registry/Codecs/Chat/ChatCodec.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Obsidian.API.Registry.Codecs.Chat;

public sealed record class ChatCodec
public sealed record class ChatCodec : ICodec
{
public required string Name { get; init; }

Expand Down
9 changes: 9 additions & 0 deletions Obsidian.API/Registry/Codecs/WolfVariant/WolfVariantCodec.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Obsidian.API.Registry.Codecs.WolfVariant;
public sealed record class WolfVariantCodec : ICodec
{
public required string Name { get; init; }

public required int Id { get; init; }

public required WolfVariantElement Element { get; init; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Obsidian.API.Registry.Codecs.WolfVariant;
public sealed class WolfVariantElement
{
public required string AngryTexture { get; init; }
public required string Biomes { get; init; }
public required string TameTexture { get; init; }
public required string WildTexture { get; init; }
}
22 changes: 22 additions & 0 deletions Obsidian.API/_Enums/EntityEffect.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace Obsidian.API;
[Flags]
public enum EntityEffect : sbyte
{
None = 0x00,

/// <summary>
/// Whether the potion is emitted by ambient source e.g. the beacon. The icon has a blue border in the HUD if its ambient.
/// </summary>
IsAmbient = 0x01,

/// <summary>
/// Whether to show the particles or not.
/// </summary>
ShowParticles = 0x02,

/// <summary>
/// Whether to show the icon on the client or not.
/// </summary>
ShowIcon = 0x04,
Blend = 0x08
}
4 changes: 4 additions & 0 deletions Obsidian.API/_Enums/EntityType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum EntityType : int
{
Allay,
AreaEffectCloud,
Armadillo,
ArmorStand,
Arrow,
Axolotl,
Expand All @@ -12,7 +13,9 @@ public enum EntityType : int
Blaze,
BlockDisplay,
Boat,
Bogged,
Breeze,
BreezeWindCharge,
Camel,
Cat,
CaveSpider,
Expand Down Expand Up @@ -60,6 +63,7 @@ public enum EntityType : int
Item,
ItemDisplay,
ItemFrame,
OminousItemSpawner,
Fireball,
LeashKnot,
LightningBolt,
Expand Down
210 changes: 109 additions & 101 deletions Obsidian.API/_Enums/ParticleType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,105 +2,113 @@

public enum ParticleType : int
{
AmbientEntityEffect = 0,
AngryVillager = 1,
Block = 2,
BlockMarker = 3,
Bubble = 4,
Cloud = 5,
Crit = 6,
DamageIndicator = 7,
DragonBreath = 8,
DrippingLava = 9,
FallingLava = 10,
LandingLava = 11,
DrippingWater = 12,
FallingWater = 13,
Dust = 14,
DustColorTransition = 15,
Effect = 16,
ElderGuardian = 17,
EnchantedHit = 18,
Enchant = 19,
EndRod = 20,
EntityEffect = 21,
ExplosionEmitter = 22,
Explosion = 23,
Gust = 24,
GustEmitter = 25,
SonicBoom = 26,
FallingDust = 27,
Firework = 28,
Fishing = 29,
Flame = 30,
CherryLeaves = 31,
SculkSoul = 32,
SculkCharge = 33,
SculkChargePop = 34,
SoulFireFlame = 35,
Soul = 36,
Flash = 37,
HappyVillager = 38,
Composter = 39,
Heart = 40,
InstantEffect = 41,
Item = 42,
Vibration = 43,
ItemSlime = 44,
ItemSnowball = 45,
LargeSmoke = 46,
Lava = 47,
Mycelium = 48,
Note = 49,
Poof = 50,
Portal = 51,
Rain = 52,
Smoke = 53,
WhiteSmoke = 54,
Sneeze = 55,
Spit = 56,
SquidInk = 57,
SweepAttack = 58,
TotemOfUndying = 59,
Underwater = 60,
Splash = 61,
Witch = 62,
BubblePop = 63,
CurrentDown = 64,
BubbleColumnUp = 65,
Nautilus = 66,
Dolphin = 67,
CampfireCosySmoke = 68,
CampfireSignalSmoke = 69,
DrippingHoney = 70,
FallingHoney = 71,
LandingHoney = 72,
FallingNectar = 73,
FallingSporeBlossom = 74,
Ash = 75,
CrimsonSpore = 76,
WarpedSpore = 77,
SporeBlossomAir = 78,
DrippingObsidianTear = 79,
FallingObsidianTear = 80,
LandingObsidianTear = 81,
ReversePortal = 82,
WhiteAsh = 83,
SmallFlame = 84,
Snowflake = 85,
DrippingDripstoneLava = 86,
FallingDripstoneLava = 87,
DrippingDripstoneWater = 88,
FallingDripstoneWater = 89,
GlowSquidInk = 90,
Glow = 91,
WaxOn = 92,
WaxOff = 93,
ElectricSpark = 94,
Scrape = 95,
Shriek = 96,
EggCrack = 97,
DustPlume = 98,
GustDust = 99,
TrialSpawnerDetection = 100,
AngryVillager = 0,
Block = 1,
BlockMarker = 2,
Bubble = 3,
Cloud = 4,
Crit = 5,
DamageIndicator = 6,
DragonBreath = 7,
DrippingLava = 8,
FallingLava = 9,
LandingLava = 10,
DrippingWater = 11,
FallingWater = 12,
Dust = 13,
DustColorTransition = 14,
Effect = 15,
ElderGuardian = 16,
EnchantedHit = 17,
Enchant = 18,
EndRod = 19,
EntityEffect = 20,
ExplosionEmitter = 21,
Explosion = 22,
Gust = 23,
SmallGust = 24,
GustEmitterLarge = 25,
GustEmitterSmall = 26,
SonicBoom = 27,
FallingDust = 28,
Firework = 29,
Fishing = 30,
Flame = 31,
Infested = 32,
CherryLeaves = 33,
SculkSoul = 34,
SculkCharge = 35,
SculkChargePop = 36,
SoulFireFlame = 37,
Soul = 38,
Flash = 39,
HappyVillager = 40,
Composter = 41,
Heart = 42,
InstantEffect = 43,
Item = 44,
Vibration = 45,
ItemSlime = 46,
ItemCobweb = 47,
ItemSnowball = 48,
LargeSmoke = 49,
Lava = 50,
Mycelium = 51,
Note = 52,
Poof = 53,
Portal = 54,
Rain = 55,
Smoke = 56,
WhiteSmoke = 57,
Sneeze = 58,
Spit = 59,
SquidInk = 60,
SweepAttack = 61,
TotemOfUndying = 62,
Underwater = 63,
Splash = 64,
Witch = 65,
BubblePop = 66,
CurrentDown = 67,
BubbleColumnUp = 68,
Nautilus = 69,
Dolphin = 70,
CampfireCosySmoke = 71,
CampfireSignalSmoke = 72,
DrippingHoney = 73,
FallingHoney = 74,
LandingHoney = 75,
FallingNectar = 76,
FallingSporeBlossom = 77,
Ash = 78,
CrimsonSpore = 79,
WarpedSpore = 80,
SporeBlossomAir = 81,
DrippingObsidianTear = 82,
FallingObsidianTear = 83,
LandingObsidianTear = 84,
ReversePortal = 85,
WhiteAsh = 86,
SmallFlame = 87,
Snowflake = 88,
DrippingDripstoneLava = 89,
FallingDripstoneLava = 90,
DrippingDripstoneWater = 91,
FallingDripstoneWater = 92,
GlowSquidInk = 93,
Glow = 94,
WaxOn = 95,
WaxOff = 96,
ElectricSpark = 97,
Scrape = 98,
Shriek = 99,
EggCrack = 100,
DustPlume = 101,
TrialSpawnerDetection = 102,
TrialSpawnerDetectionOminous = 103,
VaultConnection = 104,
DustPillar = 105,
OminousSpawning = 106,
RaidOmen = 107,
TrialOmen = 108,
}
6 changes: 5 additions & 1 deletion Obsidian.API/_Enums/ProtocolVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@ public enum ProtocolVersion

//1.20.3 same pvn
[Description("1.20.4")]
v1_20_4 = 765
v1_20_4 = 765,

//1.20.5 same pvn
[Description("1.20.6")]
v1_20_6 = 766
}
Loading

0 comments on commit 1b4518c

Please sign in to comment.