From dd3b69a6337b651e7d6e7a1a73fc118f4a1b0660 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Wed, 15 Nov 2017 16:25:10 +0000 Subject: [PATCH] Rebranding! I feel kinda guilty about this, but it's probably a good idea to make it clear that this isn't "actual, proper, stable" ComputerCraft. --- build.gradle | 6 +++--- .../dan200/computercraft/ComputerCraft.java | 2 +- .../computercraft/client/gui/GuiConfigCC.java | 2 +- .../shared/util/CreativeTabMain.java | 10 +++++++--- src/main/resources/mcmod.info | 13 +++++++------ src/main/resources/pack.mcmeta | 12 ++++++------ src/main/resources/pack.png | Bin 499 -> 638 bytes 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index ca917d21f..abb783478 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,9 @@ } */ -version = "1.80pr1" -group = "dan200.computercraft" -archivesBaseName = "ComputerCraft" +version = "1.80pr1.1" +group = "org.squiddev" +archivesBaseName = "cc-tweaked" minecraft { version = "1.12-14.21.1.2387" diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java index e4ae41899..2cde4f61c 100644 --- a/src/main/java/dan200/computercraft/ComputerCraft.java +++ b/src/main/java/dan200/computercraft/ComputerCraft.java @@ -94,7 +94,7 @@ /////////////// @Mod( - modid = ComputerCraft.MOD_ID, name = "ComputerCraft", version = "${version}", + modid = ComputerCraft.MOD_ID, name = "CC: Tweaked", version = "${version}", guiFactory = "dan200.computercraft.client.gui.GuiConfigCC$Factory" ) public class ComputerCraft diff --git a/src/main/java/dan200/computercraft/client/gui/GuiConfigCC.java b/src/main/java/dan200/computercraft/client/gui/GuiConfigCC.java index 4dc9d928f..567287165 100644 --- a/src/main/java/dan200/computercraft/client/gui/GuiConfigCC.java +++ b/src/main/java/dan200/computercraft/client/gui/GuiConfigCC.java @@ -18,7 +18,7 @@ public class GuiConfigCC extends GuiConfig { public GuiConfigCC( GuiScreen parentScreen ) { - super( parentScreen, getConfigElements(), ComputerCraft.MOD_ID, false, false, "ComputerCraft" ); + super( parentScreen, getConfigElements(), ComputerCraft.MOD_ID, false, false, "CC: Tweaked" ); } private static List getConfigElements() diff --git a/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java b/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java index d8e343bca..aae0741e5 100644 --- a/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java +++ b/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java @@ -9,6 +9,8 @@ import dan200.computercraft.ComputerCraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; @@ -16,18 +18,20 @@ public class CreativeTabMain extends CreativeTabs { public CreativeTabMain( int i ) { - super( i, "ComputerCraft" ); + super( i, "CC: Tweaked" ); } - + @Nonnull @Override + @SideOnly(Side.CLIENT) public ItemStack getTabIconItem() { return new ItemStack( ComputerCraft.Blocks.computer ); } - + @Nonnull @Override + @SideOnly(Side.CLIENT) public String getTranslatedTabLabel() { return getTabLabel(); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index abc4117a1..b9f123359 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,18 +1,19 @@ [ { "modid" : "computercraft", - "name" : "ComputerCraft", + "name" : "CC: Tweaked", "version" : "${version}", "mcversion" : "${mcversion}", - "url" : "http://www.computercraft.info", + "url" : "https://github.com/SquidDev-CC/CC-Tweaked", "credits" : "Created by Daniel Ratcliffe (@DanTwoHundred)", - "authors" : [ + "authorList" : [ "Daniel Ratcliffe", - "Aaron Mills" + "Aaron Mills", + "SquidDev" ], - "description" : "ComputerCraft adds Computers, Programming and Robotics to Minecraft.", + "description" : "CC: Tweaked is a fork of ComputerCraft with a focus on more experimental features.", "logoFile" : "pack.png", - "updateUrl" : "http://www.computercraft.info", + "updateUrl" : "https://github.com/SquidDev-CC/CC-Tweaked", "parent" : "", "screenshots": [ ] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index af003a582..56d71f203 100755 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ -{ - "pack": { - "pack_format": 1, - "description": "ComputerCraft" - } -} +{ + "pack": { + "pack_format": 1, + "description": "CC: Tweaked" + } +} diff --git a/src/main/resources/pack.png b/src/main/resources/pack.png index 9fe740e2f222071935139266e606789c79684f39..1832d080ddd6c6e8c4a1b414d427f6a87e6cb2a9 100644 GIT binary patch delta 563 zcmV-30?hsM1O5b%R(~0EMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfK7U)Yh_O0005* zNkl8f*tHa@bnXY35HZEP8v#>N1v#(}|+!ZE^avVUgm8Z{#deB(@q>_T?o zNZ}aaHX*x^UC1ugDp0&Xr0Krhr71pc%W2+}(;j2&>lcjKqFqnJ*IS}MF4Zl- zdzcI=V9`Uklz&Chtf%2;Lx}>pRJQNd{P>>E)am&GV>Ymj|rv|dls@b_Vf0=ZPT zz_IaU@a+66vO9-H6!=Tzb;vH&D)4Nu$IKwR69sZ1uYVH-a(OYxE>R#CvJ2UzS_OCy z`&FFjusjj|A0ts<6!JPOPlW6;{{@Z=_7+|%T#`qF=iTA9q1ZyWBz(Tf;dtS59ufum z;kKdJLbxR4bvRzgF7sdD#Nd2~y(hvJ4p|(Qg)JPOUx@;vu!Tcjhh002ovPDHLkV1fnt B3gQ3& delta 423 zcmV;Y0a*V21oH!sR(~3FMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOFfjCTp#T5@ zVo5|nRA@u(nN149FcgGy76lOzMNvc-?iCN!qj@qBp^Go*t1UIZ&aARZX5PF>n#LV~ zoq;W|23Ek*z!W$E*1DW#2JC?i;3S}RK@PO-JF116LSSZ~5P$xS1f+J#b6^gT828{D z#^lDc$VosXd+K$72Zxn`2N0>?Z_AJy+ulh)BunabfS=QS&Vf{UAUEDIy!(Iz1k6Ld z4lIB%=K!-2A}6K;643U&9Qd*Um@UN1L7#0j;6~FqHMvayCjpTxsn-Gi-z+5qN5Dxy zf(*!kNJaOSVShgP&QN3qBp|C6x&n6~1<9^8$?Xg{35aBs9EenCa~V3|y$_U_0SQRa zPF1y#_sCab1|%SL26{Qb(BwAevzYlUlpAUCk$}|hcn(~E)WlxvTN?zqc_Eg7AKUhS z4%~nr7cvDkqSh&A(%q!fOF)KH89w3XGlYjxGlmj37=n2XZeuAHi RVOanG002ovPDHLkV1m$Vw|@Wt