diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 0352ff22..f5989b32 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-11T15:31:25.0347469 Oreganized Block Tags +// 1.20.1 2024-09-12T10:08:48.1791634 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -25,6 +25,7 @@ f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/blocks/slabs.json +8dcd7041424abab98a418b19eadece10284b87f0 data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/blocks/stairs.json 0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/blocks/trapdoors.json a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 8e35d2f4..3a2aa100 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -140,6 +140,7 @@ "item.oreganized.smithing_template.electrum_upgrade.applies_to": "Diamond Equipment", "item.oreganized.smithing_template.electrum_upgrade.ingredients": "Electrum Ingot", "subtitles.block.gargoyle.growl": "Gargoyle growls", + "subtitles.entity.bolt_hit": "Bolt hits", "subtitles.entity.shrapnel_bomb.primed": "Shrapnel Bomb fizzes", "tooltip.oreganized.wip.description": "Usages for this item will be available in a future release", "tooltip.oreganized.wip.title": "Work In Progress", diff --git a/src/generated/resources/data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json b/src/generated/resources/data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json new file mode 100644 index 00000000..e0955c38 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json @@ -0,0 +1,6 @@ +{ + "values": [ + "oreganized:grooved_ice", + "oreganized:grooved_packed_ice" + ] +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index e8f8c2f9..8ea486f0 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -220,6 +220,10 @@ protected void addTags(HolderLookup.Provider provider) { .add(OBlocks.GROOVED_PACKED_ICE.get()) .add(OBlocks.GROOVED_BLUE_ICE.get()); + tag(BlockTags.SNOW_LAYER_CANNOT_SURVIVE_ON) + .add(OBlocks.GROOVED_ICE.get()) + .add(OBlocks.GROOVED_PACKED_ICE.get()); + tag(SILKTOUCH_WITH_SCRIBE) .addTags(MINEABLE_WITH_SCRIBE) .addTags(BlockTags.MINEABLE_WITH_PICKAXE); diff --git a/src/main/java/galena/oreganized/data/OLang.java b/src/main/java/galena/oreganized/data/OLang.java index e29bafdb..1951834f 100644 --- a/src/main/java/galena/oreganized/data/OLang.java +++ b/src/main/java/galena/oreganized/data/OLang.java @@ -65,7 +65,7 @@ protected void addTranslations() { add("effect.oreganized.stunning.description", "Paralyzes the victim periodically with random intervals"); addSubtitle("entity", "shrapnel_bomb.primed", "Shrapnel Bomb fizzes"); - + addSubtitle("entity", "bolt_hit", "Bolt hits"); addSubtitle("block", "gargoyle.growl", "Gargoyle growls"); add("tooltip.oreganized.wip.title", "Work In Progress"); diff --git a/src/main/java/galena/oreganized/mixin/client/GuiMixin.java b/src/main/java/galena/oreganized/mixin/client/GuiMixin.java index ae13b0e3..a88e3eb8 100644 --- a/src/main/java/galena/oreganized/mixin/client/GuiMixin.java +++ b/src/main/java/galena/oreganized/mixin/client/GuiMixin.java @@ -22,15 +22,15 @@ public class GuiMixin { to = @At("TAIL") ) ) - private void renderStunnedHeart(Gui instance, GuiGraphics graphics, Gui.HeartType type, int x, int y, int v, boolean flag1, boolean flag2, @Local Player player) { + private void renderStunnedHeart(Gui instance, GuiGraphics graphics, Gui.HeartType type, int x, int y, int v, boolean blinking, boolean half, @Local Player player) { var accessor = (GuiAccessor) instance; if (player.hasEffect(OEffects.STUNNING.get())) { var renderedType = type == Gui.HeartType.POISIONED ? type : Gui.HeartType.NORMAL; - var u = renderedType.getX(flag1, flag2); + var u = renderedType.getX(half, blinking); OGui.renderStunnedHeart(graphics, u - 52, x, y, v / 5); } else { - accessor.callRenderHeart(graphics, type, x, y, v, flag1, flag2); + accessor.callRenderHeart(graphics, type, x, y, v, blinking, half); } } diff --git a/src/main/resources/assets/oreganized/lang/de_de.json b/src/main/resources/assets/oreganized/lang/de_de.json index 8f8dec98..d627b05e 100644 --- a/src/main/resources/assets/oreganized/lang/de_de.json +++ b/src/main/resources/assets/oreganized/lang/de_de.json @@ -24,7 +24,7 @@ "block.oreganized.deepslate_lead_ore": "Tiefenschiefer-Bleierz", "block.oreganized.deepslate_silver_ore": "Tiefenschiefer-Silbererz", "block.oreganized.electrum_block": "Elektrumblock", - "block.oreganized.exposer": "Exposer", + "block.oreganized.gargoyle": "Wasserspeier", "block.oreganized.glance": "Bleiglanz", "block.oreganized.glance_brick_slab": "Bleiglanzziegelstufe", "block.oreganized.glance_brick_stairs": "Bleiglanzziegeltreppe", @@ -37,11 +37,18 @@ "block.oreganized.gray_crystal_glass_pane": "Graue Kristallglasscheibe", "block.oreganized.green_crystal_glass": "Grünes Kristallglas", "block.oreganized.green_crystal_glass_pane": "Grüne Kristallglasscheibe", + "block.oreganized.grooved_blue_ice": "Gerilltes Blaueis", + "block.oreganized.grooved_ice": "Gerilltes Eis", + "block.oreganized.grooved_packed_ice": "Gerilltes Packeis", + "block.oreganized.lead_bars": "Bleigitter", "block.oreganized.lead_block": "Bleiblock", + "block.oreganized.lead_bolt_crate": "Bleibolzenkiste", "block.oreganized.lead_bricks": "Bleiziegel", "block.oreganized.lead_bulb": "Bleileuchte", + "block.oreganized.lead_door": "Bleitür", "block.oreganized.lead_ore": "Bleierz", "block.oreganized.lead_pillar": "Bleisäule", + "block.oreganized.lead_trapdoor": "Bleifalltür", "block.oreganized.light_blue_crystal_glass": "Hellblaues Kristallglas", "block.oreganized.light_blue_crystal_glass_pane": "Hellblaue Kristallglasscheibe", "block.oreganized.light_gray_crystal_glass": "Hellgraues Kristallglas", @@ -92,6 +99,7 @@ "block.oreganized.yellow_crystal_glass_pane": "Gelbe Kristallglasscheibe", "effect.oreganized.stunning": "Benommenheit", "effect.oreganized.stunning.description": "Paralysiert Getroffene für eine Zeit in zufälligen Abständen", + "entity.oreganized.lead_bolt": "Bleibolzen", "entity.oreganized.shrapnel_bomb": "Schrapnellbombe", "entity.oreganized.shrapnel_bomb_minecart": "Schrapnellbombenlore", "fluid.oreganized.molten_lead": "Geschmolzenes Blei", @@ -103,26 +111,18 @@ "item.oreganized.electrum_axe": "Elektrumaxt", "item.oreganized.electrum_boots": "Elektrumstiefel", "item.oreganized.electrum_chestplate": "Elektrumharnisch", - "item.oreganized.electrum_glaive": "Elektrumgläfe", - "item.oreganized.electrum_hammer": "Elektrumhammer", "item.oreganized.electrum_helmet": "Elektrumhelm", "item.oreganized.electrum_hoe": "Elektrumhacke", "item.oreganized.electrum_ingot": "Elektrumbarren", - "item.oreganized.electrum_katana": "Elektrumkatana", "item.oreganized.electrum_knife": "Elektrummesser", "item.oreganized.electrum_leggings": "Elektrumbeinschutz", - "item.oreganized.electrum_mace": "Elektrumstreitkolben", "item.oreganized.electrum_machete": "Elektrummachete", - "item.oreganized.electrum_mountain_axe": "Elektrumpickel", "item.oreganized.electrum_nugget": "Elektrumklumpen", "item.oreganized.electrum_pickaxe": "Elektrumspitzhacke", - "item.oreganized.electrum_piece": "Elektrumstückchen", - "item.oreganized.electrum_plating": "Elektrumpanzerung", "item.oreganized.electrum_shield": "Elektrumschild", "item.oreganized.electrum_shovel": "Elektrumschaufel", "item.oreganized.electrum_sword": "Elektrumschwert", - "item.oreganized.lead_dust": "Bleistaub", - "item.oreganized.lead_hatchet": "Bleibeil", + "item.oreganized.lead_bolt": "Bleibolzen", "item.oreganized.lead_ingot": "Bleibarren", "item.oreganized.lead_nugget": "Bleiklumpen", "item.oreganized.molten_lead_bucket": "Eimer voll geschmolzenem Blei", @@ -131,14 +131,16 @@ "item.oreganized.netherite_nugget": "Netheritklumpen", "item.oreganized.raw_lead": "Rohblei", "item.oreganized.raw_silver": "Rohsilber", + "item.oreganized.scribe": "Schreiber", "item.oreganized.shrapnel_bomb_minecart": "Schrapnellbombenlore", - "item.oreganized.silver_dust": "Silberstaub", "item.oreganized.silver_ingot": "Silberbarren", "item.oreganized.silver_mirror": "Silberspiegel", "item.oreganized.silver_nugget": "Silberklumpen", "item.oreganized.smithing_template.electrum_upgrade.additions_slot_description": "Elektrumbarren hinzufügen", "item.oreganized.smithing_template.electrum_upgrade.applies_to": "Diamantausrüstung", "item.oreganized.smithing_template.electrum_upgrade.ingredients": "Elektrumbarren", + "subtitles.block.gargoyle.growl": "Wasserspeier grollt", + "subtitles.entity.bolt_hit": "Bleibolzen trifft", "subtitles.entity.shrapnel_bomb.primed": "Schrapnellbombe zischt", "tooltip.oreganized.wip.description": "Nutzen für dieses Item wird in zukünftigen Versionen hinzugefügt", "tooltip.oreganized.wip.title": "In Arbeit", @@ -146,7 +148,14 @@ "trim_material.oreganized.lead": "Blei", "trim_material.oreganized.silver": "Silber", "upgrade.oreganized.electrum_upgrade": "Elektrumaufwertung", - "block.oreganized.lead_bars": "Bleigitter", - "block.oreganized.lead_door": "Bleitür", - "block.oreganized.lead_trapdoor": "Bleifalltür" + "item.oreganized.electrum_glaive": "Elektrumgläfe", + "item.oreganized.electrum_hammer": "Elektrumhammer", + "item.oreganized.electrum_katana": "Elektrumkatana", + "item.oreganized.electrum_mace": "Elektrumstreitkolben", + "item.oreganized.electrum_mountain_axe": "Elektrumpickel", + "item.oreganized.electrum_piece": "Elektrumstückchen", + "item.oreganized.electrum_plating": "Elektrumpanzerung", + "item.oreganized.lead_dust": "Bleistaub", + "item.oreganized.lead_hatchet": "Bleibeil", + "item.oreganized.silver_dust": "Silberstaub" } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/structure/woodland_mansion/entrance.nbt b/src/main/resources/data/minecraft/structures/woodland_mansion/entrance.nbt similarity index 100% rename from src/main/resources/data/minecraft/structure/woodland_mansion/entrance.nbt rename to src/main/resources/data/minecraft/structures/woodland_mansion/entrance.nbt