From b7b97efe8192cc7ebdf69b4dd2d2e85a56c0f03f Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 13 Nov 2013 19:10:11 -0500 Subject: [PATCH 1/5] Actually do it correctly. Should be more forge friendly now. --- .../multiplayer/NetClientHandler.java.patch | 14 ++++---- .../network/NetServerHandler.java.patch | 35 +++++++------------ 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index 4e66d9b041..606fefde1f 100644 --- a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -64,19 +64,19 @@ } } -@@ -804,7 +814,11 @@ +@@ -804,6 +814,11 @@ public void func_72481_a(Packet3Chat p_72481_1_) { + p_72481_1_ = FMLNetworkHandler.handleChatMessage(this, p_72481_1_); -+ if (p_72481_1_ != null) ++ if (p_72481_1_ == null) + { - this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(ChatMessageComponent.func_111078_c(p_72481_1_.field_73476_b).func_111068_a(true)); ++ return; + } + this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(ChatMessageComponent.func_111078_c(p_72481_1_.field_73476_b).func_111068_a(true)); } - public void func_72524_a(Packet18Animation p_72524_1_) -@@ -1403,6 +1417,11 @@ +@@ -1403,6 +1418,11 @@ public void func_72494_a(Packet131MapData p_72494_1_) { @@ -88,7 +88,7 @@ if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT) { ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c); -@@ -1514,6 +1533,11 @@ +@@ -1514,6 +1534,11 @@ public void func_72501_a(Packet250CustomPayload p_72501_1_) { @@ -100,7 +100,7 @@ if ("MC|TrList".equals(p_72501_1_.field_73630_a)) { DataInputStream datainputstream = new DataInputStream(new ByteArrayInputStream(p_72501_1_.field_73629_c)); -@@ -1707,4 +1731,20 @@ +@@ -1707,4 +1732,20 @@ { return this.field_72555_g; } diff --git a/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch b/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index b977a9649c..8f1d001217 100644 --- a/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -17,38 +17,29 @@ import net.minecraft.network.packet.Packet13PlayerLookMove; import net.minecraft.network.packet.Packet14BlockDig; import net.minecraft.network.packet.Packet15Place; -@@ -618,6 +621,10 @@ +@@ -618,6 +621,12 @@ public void func_72481_a(Packet3Chat p_72481_1_) { + p_72481_1_ = FMLNetworkHandler.handleChatMessage(this, p_72481_1_); -+ -+ if (p_72481_1_ != null) ++ ++ if (p_72481_1_ == null || p_72481_1_.field_73476_b == null) + { ++ return; ++ } if (this.field_72574_e.func_71126_v() == 2) { this.func_72567_b(new Packet3Chat(ChatMessageComponent.func_111077_e("chat.cannotSend").func_111059_a(EnumChatFormatting.RED))); -@@ -635,6 +642,8 @@ +@@ -633,8 +642,6 @@ + } + else { - s = StringUtils.normalizeSpace(s); - -+ if (s != null) -+ { +- s = StringUtils.normalizeSpace(s); +- for (int i = 0; i < s.length(); ++i) { if (!ChatAllowedCharacters.func_71566_a(s.charAt(i))) -@@ -666,7 +675,9 @@ - { - this.func_72565_c("disconnect.spam"); - } -- } -+ } -+ } -+ } - } - } - -@@ -1013,6 +1024,11 @@ +@@ -1013,6 +1020,11 @@ } public void func_72501_a(Packet250CustomPayload p_72501_1_) @@ -60,11 +51,11 @@ { DataInputStream datainputstream; ItemStack itemstack; -@@ -1182,4 +1198,18 @@ +@@ -1182,4 +1194,18 @@ { return this.field_72576_c; } -+ ++ + + @Override + public void func_72494_a(Packet131MapData p_72494_1_) From af3e74d94054b3173fd62e8081f90c0c2901cd47 Mon Sep 17 00:00:00 2001 From: AbrarSyed Date: Sun, 17 Nov 2013 18:21:24 -0600 Subject: [PATCH 2/5] updated samples --- fml/install/build.gradle | 16 +++++++++++++++ .../com/example/examplemod/ExampleMod.java | 20 +++++++++++++++++++ fml/install/src/main/resources/mcmod.info | 16 +++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 fml/install/src/main/java/com/example/examplemod/ExampleMod.java create mode 100644 fml/install/src/main/resources/mcmod.info diff --git a/fml/install/build.gradle b/fml/install/build.gradle index a69475afc4..15495bc1fc 100644 --- a/fml/install/build.gradle +++ b/fml/install/build.gradle @@ -19,4 +19,20 @@ archivesBaseName = "modid" minecraft { version = "${version}" +} + +processResources +{ + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod/info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } } \ No newline at end of file diff --git a/fml/install/src/main/java/com/example/examplemod/ExampleMod.java b/fml/install/src/main/java/com/example/examplemod/ExampleMod.java new file mode 100644 index 0000000000..f993c1cd83 --- /dev/null +++ b/fml/install/src/main/java/com/example/examplemod/ExampleMod.java @@ -0,0 +1,20 @@ +package com.example.examplemod; + +import net.minecraft.block.Block; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; + +@Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION) +public class ExampleMod +{ + public static final String MODID = "examplemod"; + public static final String VERSION = "1.0"; + + @EventHandler + public void init(FMLInitializationEvent event) + { + // some example code + System.out.println("DIRT BLOCK >> "+Block.dirt.getUnlocalizedName()); + } +} diff --git a/fml/install/src/main/resources/mcmod.info b/fml/install/src/main/resources/mcmod.info new file mode 100644 index 0000000000..e7148b2187 --- /dev/null +++ b/fml/install/src/main/resources/mcmod.info @@ -0,0 +1,16 @@ +[ +{ + "modid": "examplemod", + "name": "Example Mod", + "description": "Example placeholder mod.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authors": ["ExampleDude"], + "credits": "The Forge and FML guys, for making this example", + "logoFile": "", + "screenshots": [], + "dependencies": [] +} +] From 7b737de2c1d1cdd3ecf8179b4bd7481c3dc4e20c Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sun, 17 Nov 2013 19:26:21 -0800 Subject: [PATCH 3/5] Make the working directory the root of the eclipse workspace. --- .../.plugins/org.eclipse.debug.core/.launches/Client.launch | 4 ++-- .../.plugins/org.eclipse.debug.core/.launches/Server.launch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch index a010befe10..f3673cc71b 100644 --- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch +++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch @@ -1,7 +1,7 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch index 550685c761..980c6c1dc0 100644 --- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch +++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch @@ -9,5 +9,5 @@ - + From 45aa1485b3c038929fa9788f2c97fce0fa8e95ed Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 20 Nov 2013 13:18:26 -0800 Subject: [PATCH 4/5] Don't validate signatures in dev env. --- .../.plugins/org.eclipse.debug.core/.launches/Client.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch index f3673cc71b..69f71b3de1 100644 --- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch +++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch @@ -9,6 +9,6 @@ - + From 75b64fe9b824476ae86200841e6a84d7417cdeb4 Mon Sep 17 00:00:00 2001 From: Abrar Syed Date: Tue, 26 Nov 2013 14:23:31 -0600 Subject: [PATCH 5/5] fix derp in example builscript --- fml/install/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fml/install/build.gradle b/fml/install/build.gradle index 15495bc1fc..d1b137d92e 100644 --- a/fml/install/build.gradle +++ b/fml/install/build.gradle @@ -25,7 +25,7 @@ processResources { // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { - include 'mcmod/info' + include 'mcmod.info' // replace version and mcversion expand 'version':project.version, 'mcversion':project.minecraft.version @@ -35,4 +35,4 @@ processResources from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' } -} \ No newline at end of file +}