From e799510a3979377bf2fddaa38a31ad3218500b6c Mon Sep 17 00:00:00 2001 From: lustig7 Date: Mon, 30 Dec 2024 11:57:13 +0100 Subject: [PATCH] refactor code: fixed typos --- gradle.properties | 10 +++++----- .../capacitoradditions/CapacitorAdditions.java | 10 ++-------- .../assets/capacitatoradditions/lang/en_us.json | 6 ------ .../models/item/allthemodium_capacitor.json | 6 ------ .../models/item/unobtainium_capacitor.json | 6 ------ .../assets/capacitoradditions/lang/en_us.json | 6 ++++++ .../models/item/allthemodium_capacitor.json | 6 ++++++ .../models/item/unobtainium_capacitor.json | 6 ++++++ .../models/item/vibranium_capacitor.json | 2 +- .../textures/item/allthemodium_capacitor.png | Bin .../textures/item/unobtainium_capacitor.png | Bin .../textures/item/vibranium_capacitor.png | Bin .../recipe/allthemodium_capacitor.json | 2 +- .../recipe/unobtainium_capacitor.json | 4 ++-- .../recipe/vibranium_capacitor.json | 4 ++-- 15 files changed, 31 insertions(+), 37 deletions(-) delete mode 100644 src/main/resources/assets/capacitatoradditions/lang/en_us.json delete mode 100644 src/main/resources/assets/capacitatoradditions/models/item/allthemodium_capacitor.json delete mode 100644 src/main/resources/assets/capacitatoradditions/models/item/unobtainium_capacitor.json create mode 100644 src/main/resources/assets/capacitoradditions/lang/en_us.json create mode 100644 src/main/resources/assets/capacitoradditions/models/item/allthemodium_capacitor.json create mode 100644 src/main/resources/assets/capacitoradditions/models/item/unobtainium_capacitor.json rename src/main/resources/assets/{capacitatoradditions => capacitoradditions}/models/item/vibranium_capacitor.json (50%) rename src/main/resources/assets/{capacitatoradditions => capacitoradditions}/textures/item/allthemodium_capacitor.png (100%) rename src/main/resources/assets/{capacitatoradditions => capacitoradditions}/textures/item/unobtainium_capacitor.png (100%) rename src/main/resources/assets/{capacitatoradditions => capacitoradditions}/textures/item/vibranium_capacitor.png (100%) rename src/main/resources/data/{capacitatoradditions => capacitoradditions}/recipe/allthemodium_capacitor.json (85%) rename src/main/resources/data/{capacitatoradditions => capacitoradditions}/recipe/unobtainium_capacitor.json (72%) rename src/main/resources/data/{capacitatoradditions => capacitoradditions}/recipe/vibranium_capacitor.json (71%) diff --git a/gradle.properties b/gradle.properties index ed78f8a..c46b589 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,21 +28,21 @@ loader_version_range=[4,) # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. -mod_id=capacitatoradditions +mod_id=capacitoradditions # The human-readable display name for the mod. -mod_name=Enderio Capacitator Additions +mod_name=Enderio Capacitor Additions # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.0.1 +mod_version=1.0.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=net.enderio.capacitatoradditions +mod_group_id=net.enderio.capacitoradditions # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. mod_authors=lustig7 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Adds Allthemodium, Vibranium, and Enderium capacitors to Ender IO, enhancing machine speed and capacity for All the Mods progression.\n +mod_description=Adds Allthemodium, Vibranium, and Enderium capacitors to Ender IO, enhancing machine speed and capacity for faster processing time.\n ## Dependencies diff --git a/src/main/java/net/enderio/capacitoradditions/CapacitorAdditions.java b/src/main/java/net/enderio/capacitoradditions/CapacitorAdditions.java index a06854a..c9c6fad 100644 --- a/src/main/java/net/enderio/capacitoradditions/CapacitorAdditions.java +++ b/src/main/java/net/enderio/capacitoradditions/CapacitorAdditions.java @@ -1,7 +1,5 @@ package net.enderio.capacitoradditions; -import com.enderio.base.api.capacitor.CapacitorData; -import com.mojang.logging.LogUtils; import item.Items; import net.enderio.capacitoradditions.component.ModDataComponents; import net.minecraft.core.registries.Registries; @@ -10,7 +8,6 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.InterModComms; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; @@ -22,22 +19,19 @@ import net.neoforged.neoforge.event.server.ServerStartingEvent; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; -import org.slf4j.Logger; - -import java.util.Map; // The value here should match an entry in the META-INF/neoforge.mods.toml file @Mod(CapacitorAdditions.MOD_ID) public class CapacitorAdditions { - public static final String MOD_ID = "capacitatoradditions"; + public static final String MOD_ID = "capacitoradditions"; public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister .create(Registries.CREATIVE_MODE_TAB, MOD_ID); public static final DeferredHolder CAPACITOR_TAB = CREATIVE_MODE_TABS .register("capacitor_tab", () -> CreativeModeTab.builder() - .title(Component.translatable("tab.capacitatoradditions.capacitor")) + .title(Component.translatable("tab.capacitoradditions.capacitor")) .icon(() -> Items.unobtainium_capacitor.get().getDefaultInstance()) .displayItems((parameters, output) -> { diff --git a/src/main/resources/assets/capacitatoradditions/lang/en_us.json b/src/main/resources/assets/capacitatoradditions/lang/en_us.json deleted file mode 100644 index 8ce4e54..0000000 --- a/src/main/resources/assets/capacitatoradditions/lang/en_us.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "item.capacitatoradditions.allthemodium_capacitor": "Allthemodium Capacitator", - "item.capacitatoradditions.vibranium_capacitor": "Vibranium Capacitor", - "item.capacitatoradditions.unobtainium_capacitor": "Unobtainium Capacitor", - "tab.capacitatoradditions.capacitor": "Capacitors" -} diff --git a/src/main/resources/assets/capacitatoradditions/models/item/allthemodium_capacitor.json b/src/main/resources/assets/capacitatoradditions/models/item/allthemodium_capacitor.json deleted file mode 100644 index c30fc01..0000000 --- a/src/main/resources/assets/capacitatoradditions/models/item/allthemodium_capacitor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "capacitatoradditions:item/allthemodium_capacitor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/capacitatoradditions/models/item/unobtainium_capacitor.json b/src/main/resources/assets/capacitatoradditions/models/item/unobtainium_capacitor.json deleted file mode 100644 index bf06e45..0000000 --- a/src/main/resources/assets/capacitatoradditions/models/item/unobtainium_capacitor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "capacitatoradditions:item/unobtainium_capacitor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/capacitoradditions/lang/en_us.json b/src/main/resources/assets/capacitoradditions/lang/en_us.json new file mode 100644 index 0000000..56cf3be --- /dev/null +++ b/src/main/resources/assets/capacitoradditions/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "item.capacitoradditions.allthemodium_capacitor": "Allthemodium Capacitor", + "item.capacitoradditions.vibranium_capacitor": "Vibranium Capacitor", + "item.capacitoradditions.unobtainium_capacitor": "Unobtainium Capacitor", + "tab.capacitoradditions.capacitor": "Capacitors" +} diff --git a/src/main/resources/assets/capacitoradditions/models/item/allthemodium_capacitor.json b/src/main/resources/assets/capacitoradditions/models/item/allthemodium_capacitor.json new file mode 100644 index 0000000..b28d23e --- /dev/null +++ b/src/main/resources/assets/capacitoradditions/models/item/allthemodium_capacitor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "capacitoradditions:item/allthemodium_capacitor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/capacitoradditions/models/item/unobtainium_capacitor.json b/src/main/resources/assets/capacitoradditions/models/item/unobtainium_capacitor.json new file mode 100644 index 0000000..9f6ff0d --- /dev/null +++ b/src/main/resources/assets/capacitoradditions/models/item/unobtainium_capacitor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "capacitoradditions:item/unobtainium_capacitor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/capacitatoradditions/models/item/vibranium_capacitor.json b/src/main/resources/assets/capacitoradditions/models/item/vibranium_capacitor.json similarity index 50% rename from src/main/resources/assets/capacitatoradditions/models/item/vibranium_capacitor.json rename to src/main/resources/assets/capacitoradditions/models/item/vibranium_capacitor.json index 857a7da..45e7df8 100644 --- a/src/main/resources/assets/capacitatoradditions/models/item/vibranium_capacitor.json +++ b/src/main/resources/assets/capacitoradditions/models/item/vibranium_capacitor.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "capacitatoradditions:item/vibranium_capacitor" + "layer0": "capacitoradditions:item/vibranium_capacitor" } } \ No newline at end of file diff --git a/src/main/resources/assets/capacitatoradditions/textures/item/allthemodium_capacitor.png b/src/main/resources/assets/capacitoradditions/textures/item/allthemodium_capacitor.png similarity index 100% rename from src/main/resources/assets/capacitatoradditions/textures/item/allthemodium_capacitor.png rename to src/main/resources/assets/capacitoradditions/textures/item/allthemodium_capacitor.png diff --git a/src/main/resources/assets/capacitatoradditions/textures/item/unobtainium_capacitor.png b/src/main/resources/assets/capacitoradditions/textures/item/unobtainium_capacitor.png similarity index 100% rename from src/main/resources/assets/capacitatoradditions/textures/item/unobtainium_capacitor.png rename to src/main/resources/assets/capacitoradditions/textures/item/unobtainium_capacitor.png diff --git a/src/main/resources/assets/capacitatoradditions/textures/item/vibranium_capacitor.png b/src/main/resources/assets/capacitoradditions/textures/item/vibranium_capacitor.png similarity index 100% rename from src/main/resources/assets/capacitatoradditions/textures/item/vibranium_capacitor.png rename to src/main/resources/assets/capacitoradditions/textures/item/vibranium_capacitor.png diff --git a/src/main/resources/data/capacitatoradditions/recipe/allthemodium_capacitor.json b/src/main/resources/data/capacitoradditions/recipe/allthemodium_capacitor.json similarity index 85% rename from src/main/resources/data/capacitatoradditions/recipe/allthemodium_capacitor.json rename to src/main/resources/data/capacitoradditions/recipe/allthemodium_capacitor.json index aaebc7e..b2c5108 100644 --- a/src/main/resources/data/capacitatoradditions/recipe/allthemodium_capacitor.json +++ b/src/main/resources/data/capacitoradditions/recipe/allthemodium_capacitor.json @@ -15,6 +15,6 @@ "pattern": [" AG", "ADA", "GA "], "result": { "count": 1, - "id": "capacitatoradditions:allthemodium_capacitor" + "id": "capacitoradditions:allthemodium_capacitor" } } diff --git a/src/main/resources/data/capacitatoradditions/recipe/unobtainium_capacitor.json b/src/main/resources/data/capacitoradditions/recipe/unobtainium_capacitor.json similarity index 72% rename from src/main/resources/data/capacitatoradditions/recipe/unobtainium_capacitor.json rename to src/main/resources/data/capacitoradditions/recipe/unobtainium_capacitor.json index 8e15eaf..5434bcc 100644 --- a/src/main/resources/data/capacitatoradditions/recipe/unobtainium_capacitor.json +++ b/src/main/resources/data/capacitoradditions/recipe/unobtainium_capacitor.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "C": { - "item": "capacitatoradditions:vibranium_capacitor" + "item": "capacitoradditions:vibranium_capacitor" }, "G": { "item": "enderio:grains_of_infinity" @@ -15,6 +15,6 @@ "pattern": [" I ", "CGC", " I "], "result": { "count": 1, - "id": "capacitatoradditions:unobtainium_capacitor" + "id": "capacitoradditions:unobtainium_capacitor" } } diff --git a/src/main/resources/data/capacitatoradditions/recipe/vibranium_capacitor.json b/src/main/resources/data/capacitoradditions/recipe/vibranium_capacitor.json similarity index 71% rename from src/main/resources/data/capacitatoradditions/recipe/vibranium_capacitor.json rename to src/main/resources/data/capacitoradditions/recipe/vibranium_capacitor.json index 397eb8e..bea7cc2 100644 --- a/src/main/resources/data/capacitatoradditions/recipe/vibranium_capacitor.json +++ b/src/main/resources/data/capacitoradditions/recipe/vibranium_capacitor.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "capacitatoradditions:allthemodium_capacitor" + "item": "capacitoradditions:allthemodium_capacitor" }, "C": { "item": "enderio:powdered_coal" @@ -15,6 +15,6 @@ "pattern": [" I ", "ACA", " I "], "result": { "count": 1, - "id": "capacitatoradditions:vibranium_capacitor" + "id": "capacitoradditions:vibranium_capacitor" } }