From 883c477b5946748996d25dc53e4dde690ecf2942 Mon Sep 17 00:00:00 2001 From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> Date: Thu, 4 Jan 2024 17:16:31 +1100 Subject: [PATCH] Add CCL To Dep List, Remove Mod Tooltip, Change Mod Name --- dependencies.gradle | 3 +++ gradle.properties | 4 ++-- src/main/java/com/nomiceu/gregtechdrawers/GTDrawers.java | 3 ++- .../com/nomiceu/gregtechdrawers/item/ItemGTDrawers.java | 2 -- .../java/com/nomiceu/gregtechdrawers/item/ItemGTTrim.java | 7 ------- src/main/resources/assets/gregtechdrawers/lang/en_us.lang | 1 - src/main/resources/mcmod.info | 6 +++--- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 57e7a01..5f1ee1a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,4 +24,7 @@ dependencies { implementation rfg.deobf("curse.maven:storage-drawers-223852:2952606") implementation rfg.deobf("curse.maven:chameleon-230497:2450900") + + runtimeOnly rfg.deobf("curse.maven:codechicken-lib-1-8-242818:2779848") // Version 3.2.3.358 + runtimeOnly rfg.deobf("maven.modrinth:gregtech-ce-unofficial:Kff6K1WR") // Version 2.8.5 } diff --git a/gradle.properties b/gradle.properties index 66c1148..566c27b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -modName = Gregtech Drawers +modName = GregTech Drawers # This is a case-sensitive string to identify your mod. Convention is to use lower case. modId = gregtechdrawers @@ -113,7 +113,7 @@ curseForgeProjectId = 845779 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], # and the name is the CurseForge project slug of the other mod. # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft -curseForgeRelations = requiredDependency:storage-drawers;requiredDependency:chameleon;requiredDependency:gregtech-ce-unofficial; +curseForgeRelations = requiredDependency:storage-drawers;requiredDependency:chameleon;requiredDependency:gregtech-ce-unofficial;requiredDependency:codechicken-lib-1-8; # This project's release type on CurseForge and/or Modrinth # Alternatively this can be set with the 'RELEASE_TYPE' environment variable. diff --git a/src/main/java/com/nomiceu/gregtechdrawers/GTDrawers.java b/src/main/java/com/nomiceu/gregtechdrawers/GTDrawers.java index d39043a..811c083 100644 --- a/src/main/java/com/nomiceu/gregtechdrawers/GTDrawers.java +++ b/src/main/java/com/nomiceu/gregtechdrawers/GTDrawers.java @@ -18,12 +18,13 @@ name = GTDrawers.NAME, acceptedMinecraftVersions = "[1.12.2,1.13)", dependencies = "required:forge@[14.23.5.2847,);" + + "required-after:codechickenlib@[3.2.3,);" + "required-after:gregtech@[2.6,);" + "required-after:storagedrawers;") public class GTDrawers { public static final String MODID = "gregtechdrawers"; - public static final String NAME = "Gregtech Drawers"; + public static final String NAME = "GregTech Drawers"; @Instance(GTDrawers.MODID) public static GTDrawers instance; diff --git a/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTDrawers.java b/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTDrawers.java index af12af5..8f4ce12 100644 --- a/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTDrawers.java +++ b/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTDrawers.java @@ -55,8 +55,6 @@ public int getMetadata(int damage) { @SideOnly(Side.CLIENT) public void addInformation(@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { list.add(I18n.format("storagedrawers.material", I18n.format("storagedrawers.material." + this.mod + '.' + this.material))); - if(advanced.isAdvanced()) - list.add(I18n.format("storagedrawers.mod", mod.getModName())); list.add(I18n.format("storagedrawers.drawers.description", getCapacityForBlock(itemStack))); if(itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey("tile")) diff --git a/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTTrim.java b/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTTrim.java index 0a64efe..2a4050d 100644 --- a/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTTrim.java +++ b/src/main/java/com/nomiceu/gregtechdrawers/item/ItemGTTrim.java @@ -35,11 +35,4 @@ public ItemGTTrim(BlockGTTrim block) { public String getItemStackDisplayName(ItemStack stack) { return I18n.format("storagedrawers.trim", I18n.format("storagedrawers.material." + this.mod + '.' + this.material), super.getItemStackDisplayName(stack)); } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { - if(advanced.isAdvanced()) - list.add(I18n.format("storagedrawers.mod", mod.getModName())); - } } diff --git a/src/main/resources/assets/gregtechdrawers/lang/en_us.lang b/src/main/resources/assets/gregtechdrawers/lang/en_us.lang index b41b7b0..bf60946 100644 --- a/src/main/resources/assets/gregtechdrawers/lang/en_us.lang +++ b/src/main/resources/assets/gregtechdrawers/lang/en_us.lang @@ -1,5 +1,4 @@ itemGroup.gregtechdrawers=GregTech Drawers -storagedrawers.mod=Mod: %s storagedrawers.trim=%1$s %2$s tile.storagedrawers.trim.name=Trim diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 00290c3..a309e32 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,13 +1,13 @@ [{ "modid": "gregtechdrawers", - "name": "Gregtech Drawers", - "description": "Rubber and Treated Wood Drawers from GTCEu", + "name": "GregTech Drawers", + "description": "Rubber and Treated Wood Drawers from GTCEu!", "version": "${version}", "mcversion": "${mcversion}", "logoFile": "assets/gregtechdrawers/textures/logo.png", "url": "https://www.curseforge.com/minecraft/mc-mods/gregtech-drawers", "authorList": [ "integerlimit_", "ung3froren", "Raptor__" ], - "credits": "Forked from Storage Drawers KAPPA Addon by ung3froren", + "credits": "Forked from Storage Drawers KAPPA Addon by ung3froren.", "dependencies": [ "storagedrawers", "gregtech"