From 51f855cb37afcd9b05c9f9b7d37132ff6b5b14c8 Mon Sep 17 00:00:00 2001 From: ktpatient <167013520+ktpatient@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:10:57 +0100 Subject: [PATCH] Revert changes --- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 ++-- .../resources/assets/nautec/lang/en_us.json | 6 +++--- .../loot_table/blocks/aquatic_catalyst.json | 21 +++++++++++++++++++ .../menus/AugmentationViewerScreen.java | 2 +- .../nautec/datagen/EnUsProvider.java | 6 +++--- 5 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 src/generated/resources/data/nautec/loot_table/blocks/aquatic_catalyst.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index fcb29344..dcd3e135 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.21.1 2024-10-03T12:03:18.616115 Languages: en_us -1905cf1d00e4573f53041e788eeb0191cb612716 assets/nautec/lang/en_us.json +// 1.21.1 2024-10-03T12:10:15.5878811 Languages: en_us +9f7f8f34477ebb434059509acb7eaeb6dd166fab assets/nautec/lang/en_us.json diff --git a/src/generated/resources/assets/nautec/lang/en_us.json b/src/generated/resources/assets/nautec/lang/en_us.json index f40dceb3..27dbed3e 100644 --- a/src/generated/resources/assets/nautec/lang/en_us.json +++ b/src/generated/resources/assets/nautec/lang/en_us.json @@ -1,7 +1,4 @@ { - "augment.nautec.dolphin_fin": "Dolphin Fin", - "augment.nautec.drowned_lung": "Drowned Lung", - "augment.nautec.guardian_eye": "Guardian Eye", "augment_slot.nautec.body": "Body", "augment_slot.nautec.eyes": "Eyes", "augment_slot.nautec.head": "Head", @@ -11,6 +8,9 @@ "augment_slot.nautec.lung": "Lungs", "augment_slot.nautec.right_arm": "Right Arm", "augment_slot.nautec.right_leg": "Right Leg", + "augment_type.nautec.dolphin_fin": "Dolphin Fin", + "augment_type.nautec.drowned_lung": "Drowned Lung", + "augment_type.nautec.guardian_eye": "Guardian Eye", "block.nautec.aquarine_steel_block": "Aquarine Steel Block", "block.nautec.aquatic_catalyst": "Aquatic Catalyst", "block.nautec.augmentation_station": "Augmentation Station", diff --git a/src/generated/resources/data/nautec/loot_table/blocks/aquatic_catalyst.json b/src/generated/resources/data/nautec/loot_table/blocks/aquatic_catalyst.json new file mode 100644 index 00000000..871f0553 --- /dev/null +++ b/src/generated/resources/data/nautec/loot_table/blocks/aquatic_catalyst.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "nautec:aquatic_catalyst" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "nautec:blocks/aquatic_catalyst" +} \ No newline at end of file diff --git a/src/main/java/com/portingdeadmods/nautec/content/menus/AugmentationViewerScreen.java b/src/main/java/com/portingdeadmods/nautec/content/menus/AugmentationViewerScreen.java index 4f50e0a4..0713fd31 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/menus/AugmentationViewerScreen.java +++ b/src/main/java/com/portingdeadmods/nautec/content/menus/AugmentationViewerScreen.java @@ -89,7 +89,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia public void displayAugment(GuiGraphics graphics, AugmentSlot slot, Augment aug, int x, int y) { graphics.drawString(this.font, Component.translatable("augment_slot.nautec." + slot.getName()).append(Component.literal(":")), x, y, 0); - graphics.drawString(this.font, aug == null ? Component.literal(" No Augment in slot") : Component.literal(" ").append(Component.translatable("augment." + aug.getAugmentType().toString())), x, y + 10, 0); + graphics.drawString(this.font, aug == null ? Component.literal(" No Augment in slot") : Component.literal(" ").append(Component.translatable("augment_type." + aug.getAugmentType().toString())), x, y + 10, 0); } @Override diff --git a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java index 0851a5d1..be6d731b 100644 --- a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java +++ b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java @@ -121,9 +121,9 @@ protected void addTranslations() { add("augment_slot.nautec.right_arm", "Right Arm"); add("augment_slot.nautec.heart", "Heart"); - add("augment.nautec.drowned_lung", "Drowned Lung"); - add("augment.nautec.guardian_eye", "Guardian Eye"); - add("augment.nautec.dolphin_fin", "Dolphin Fin"); + add("augment_type.nautec.drowned_lung", "Drowned Lung"); + add("augment_type.nautec.guardian_eye", "Guardian Eye"); + add("augment_type.nautec.dolphin_fin", "Dolphin Fin"); } private void addFluidType(Supplier fluidType, String val) {