keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Move FML to net.minecraft.fml package.

Browse source
This commit is contained in:
Lex Manos 2014-09-22 22:01:24 -07:00
parent 1f1166e722
commit 28ff001cc0
298 changed files with 1188 additions and 1060 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fml/build.gradle
View file

@ -33,8 +33,8 @@ minecraft {
mcpVersion = '9.10'
mappings = 'snapshot_nodoc_20140916'
fmlDir = projectDir.getAbsolutePath();
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
installerVersion = "1.4"
}

BIN
fml/eclipse-workspace-dev.zip
View file

Binary file not shown.

6
fml/install/src/main/java/com/example/examplemod/ExampleMod.java
View file

@ -1,9 +1,9 @@
package com.example.examplemod;
import net.minecraft.init.Blocks;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION)
public class ExampleMod

2
fml/jsons/1.8-dev.json
View file

@ -3,7 +3,7 @@
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.11"

120
fml/jsons/1.8-rel.json Normal file
View file

@ -0,0 +1,120 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"mainClass": "net.minecraft.launchwrapper.Launch",
"minimumLauncherVersion": 14,
"assets": "1.8",
"inheritsFrom": "1.8",
"jar": "1.8",
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.11",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:5.0.3",
"serverreq":true
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
"serverreq":true,
"clientreq":true
},
{
"name": "com.typesafe:config:1.2.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-compiler:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-library:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-reflect:2.11.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
"serverreq":true,
"clientreq":true
},
{
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
"serverreq":true,
"clientreq":true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq":true
}
]
}
}

6
fml/patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -5,7 +5,7 @@
{
private static final ResourceLocation field_176230_a = new ResourceLocation("air");
- public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a);
+ public static final RegistryNamespacedDefaultedByKey field_149771_c = cpw.mods.fml.common.registry.GameData.getBlockRegistry();
+ public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap();
private CreativeTabs field_149772_a;
public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
@ -13,8 +13,8 @@
private String field_149770_b;
private static final String __OBFID = "CL_00000199";
+ public final cpw.mods.fml.common.registry.RegistryDelegate<Block> delegate =
+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
+ public final net.minecraftforge.fml.common.registry.RegistryDelegate<Block> delegate =
+ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
+
public static int func_149682_b(Block p_149682_0_)
{

2
fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
View file

@ -5,6 +5,6 @@
public static String getClientModName()
{
- return "vanilla";
+ return cpw.mods.fml.common.FMLCommonHandler.instance().getModName();
+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName();
}
}

2
fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch
View file

@ -6,7 +6,7 @@
+ try
+ {
+ if (!cpw.mods.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering
+ if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering
+ {
Tessellator tessellator = Tessellator.func_178181_a();
WorldRenderer worldrenderer = tessellator.func_178180_c();

52
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -1,38 +1,38 @@
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
@@ -410,7 +410,7 @@
@@ -411,7 +411,7 @@
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
this.field_110451_am.func_110542_a(this.field_135017_as);
- this.func_110436_a();
+ cpw.mods.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
this.field_71446_o = new TextureManager(this.field_110451_am);
this.field_110451_am.func_110542_a(this.field_71446_o);
this.func_180510_a(this.field_71446_o);
@@ -482,12 +482,13 @@
@@ -483,12 +483,13 @@
this.field_71458_u = new GuiAchievement(this);
GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
+ cpw.mods.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
+ net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
this.func_71361_d("Post startup");
this.field_71456_v = new GuiIngame(this);
if (this.field_71475_ae != null)
{
- this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af));
+ cpw.mods.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af);
}
else
{
@@ -503,6 +504,7 @@
@@ -504,6 +505,7 @@
this.func_71352_k();
}
+ cpw.mods.fml.client.FMLClientHandler.instance().onInitializationComplete();
+ net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete();
try
{
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
@@ -681,21 +683,23 @@
@@ -682,21 +684,23 @@
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
@ -55,52 +55,52 @@
- System.exit(-2);
+ retVal = -2;
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleExit(retVal);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal);
}
public boolean func_152349_b()
@@ -1034,9 +1038,11 @@
@@ -1035,9 +1039,11 @@
if (!this.field_71454_w)
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
this.field_71424_I.func_76318_c("gameRenderer");
this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
this.field_71424_I.func_76319_b();
+ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
}
this.field_71424_I.func_76319_b();
@@ -1591,6 +1597,8 @@
@@ -1592,6 +1598,8 @@
--this.field_71467_ac;
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreClientTick();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
+
this.field_71424_I.func_76320_a("gui");
if (!this.field_71445_n)
@@ -1744,6 +1752,7 @@
@@ -1745,6 +1753,7 @@
this.field_71462_r.func_146274_d();
}
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().fireMouseInput();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput();
}
if (this.field_71429_W > 0)
@@ -1920,6 +1929,7 @@
@@ -1921,6 +1930,7 @@
}
}
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().fireKeyInput();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
}
for (i = 0; i < 9; ++i)
@@ -2120,12 +2130,15 @@
@@ -2121,12 +2131,15 @@
this.field_71453_ak.func_74428_b();
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostClientTick();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
+
this.field_71424_I.func_76319_b();
this.field_71423_H = func_71386_F();
@ -108,15 +108,15 @@
public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_)
{
+ cpw.mods.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
this.func_71403_a((WorldClient)null);
System.gc();
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
@@ -2161,6 +2174,12 @@
@@ -2162,6 +2175,12 @@
while (!this.field_71437_Z.func_71200_ad())
{
+ if (!cpw.mods.fml.common.StartupQuery.check())
+ if (!net.minecraftforge.fml.common.StartupQuery.check())
+ {
+ func_71403_a(null);
+ func_147108_a(null);
@ -125,7 +125,7 @@
String s2 = this.field_71437_Z.func_71195_b_();
if (s2 != null)
@@ -2186,7 +2205,7 @@
@@ -2187,7 +2206,7 @@
SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
@ -134,11 +134,11 @@
networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e()));
this.field_71453_ak = networkmanager;
}
@@ -2237,6 +2256,7 @@
@@ -2238,6 +2257,7 @@
this.func_71351_a((ServerData)null);
this.field_71455_al = false;
+ cpw.mods.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
}
this.field_147127_av.func_147690_c();

2
fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
View file

@ -17,7 +17,7 @@
this.field_146297_k.func_147108_a(new GuiShareToLan(this));
+ break;
+ case 12:
+ cpw.mods.fml.client.FMLClientHandler.instance().showInGameModOptions(this);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this);
+ break;
}
}

4
fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
View file

@ -18,7 +18,7 @@
+ if (p_146284_1_.field_146127_k == 6)
+ {
+ this.field_146297_k.func_147108_a(new cpw.mods.fml.client.GuiModList(this));
+ this.field_146297_k.func_147108_a(new net.minecraftforge.fml.client.GuiModList(this));
+ }
+
if (p_146284_1_.field_146127_k == 11)
@ -29,7 +29,7 @@
}
- this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
+ java.util.List<String> brandings = com.google.common.collect.Lists.reverse(cpw.mods.fml.common.FMLCommonHandler.instance().getBrandings(true));
+ java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
+ for (int i = 0; i < brandings.size(); i++)
+ {
+ String brd = brandings.get(i);

4
fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
View file

@ -4,7 +4,7 @@
public GuiMultiplayer(GuiScreen p_i1040_1_)
{
this.field_146798_g = p_i1040_1_;
+ cpw.mods.fml.client.FMLClientHandler.instance().setupServerList();
+ net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList();
}
public void func_73866_w_()
@ -13,7 +13,7 @@
private void func_146791_a(ServerData p_146791_1_)
{
- this.field_146297_k.func_147108_a(new GuiConnecting(this, this.field_146297_k, p_146791_1_));
+ cpw.mods.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_);
}
public void func_146790_a(int p_146790_1_)

2
fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
View file

@ -5,7 +5,7 @@
ArrayList arraylist = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)});
+ arraylist.add("");
+ arraylist.addAll(cpw.mods.fml.common.FMLCommonHandler.instance().getBrandings(false));
+ arraylist.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
+
if (this.func_175236_d())
{

2
fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
View file

@ -5,7 +5,7 @@
if (this.field_146297_k.func_71359_d().func_90033_f(s))
{
- this.field_146297_k.func_71371_a(s, s1, (WorldSettings)null);
+ cpw.mods.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1);
}
}
}

4
fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
View file

@ -5,7 +5,7 @@
boolean flag3 = flag1 || flag2;
this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
- List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
+ List list = this.field_148300_d.field_71466_p.func_78271_c(cpw.mods.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2);
+ List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2);
for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1)
{
@ -13,7 +13,7 @@
int k2 = p_180790_6_ - p_180790_2_;
int l2 = p_180790_7_ - p_180790_3_;
+ String tooltip = cpw.mods.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2);
+ String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2);
+ if (tooltip != null)
+ {
+ this.field_148303_c.func_146793_a(tooltip);

2
fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch
View file

@ -4,7 +4,7 @@
public void func_147383_a(C00Handshake p_147383_1_)
{
+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return;
+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return;
this.field_147384_b.func_150723_a(p_147383_1_.func_149594_c());
this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b));
}

4
fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch
View file

@ -5,10 +5,10 @@
this.field_175091_e = p_147390_1_.func_179730_a();
this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
- this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e));
+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d);
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d);
+ NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e);
+ this.field_147393_d.func_150719_a(nhpc);
+ cpw.mods.fml.client.FMLClientHandler.instance().setPlayClient(nhpc);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().setPlayClient(nhpc);
}
public void func_147231_a(IChatComponent p_147231_1_)

2
fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch
View file

@ -4,7 +4,7 @@
p_147224_1_.func_147407_a((String)null);
}
+ cpw.mods.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
this.field_175092_e = Minecraft.func_71386_F();
networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e));
this.field_147403_d = true;

2
fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch
View file

@ -5,7 +5,7 @@
return field_110906_m;
default:
- return field_110903_f;
+ return cpw.mods.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f);
+ return net.minecraftforge.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f);
}
}

2
fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch
View file

@ -4,7 +4,7 @@
}
field_135049_a.func_135022_a(p_110549_1_, arraylist);
+ cpw.mods.fml.common.registry.LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c);
+ net.minecraftforge.fml.common.registry.LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c);
StringTranslate.func_135063_a(field_135049_a.field_135032_a);
}

2
fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
View file

@ -4,7 +4,7 @@
public void func_74303_b()
{
+ if (cpw.mods.fml.client.FMLClientHandler.instance().isLoading()) return;
+ if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return;
try
{
PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai));

2
fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch
View file

@ -4,7 +4,7 @@
return IntCache.func_85144_b();
}
});
+ cpw.mods.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
}
public String func_71501_a()

2
fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch
View file

@ -22,7 +22,7 @@
+ }
+ catch (Exception e)
+ {
+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
+ p_75615_0_.func_74779_i("id"), oclass.getName());
+ entity = null;

2
fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch
View file

@ -4,7 +4,7 @@
public void func_72786_a(Entity p_72786_1_)
{
+ if (cpw.mods.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return;
+ if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return;
+
if (p_72786_1_ instanceof EntityPlayerMP)
{

4
fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch
View file

@ -9,7 +9,7 @@
+ int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D);
+ if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f)
+ {
+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
+ }
+
if (this.field_73143_t && !(packet instanceof S0FPacketSpawnMob))
@ -19,7 +19,7 @@
field_151262_p.warn("Fetching addPacket for removed entity");
}
+ Packet pkt = cpw.mods.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a);
+ Packet pkt = net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a);
+ if (pkt != null) return pkt;
+
if (this.field_73132_a instanceof EntityItem)

4
fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch
View file

@ -1,8 +1,8 @@
--- ../src-base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
+++ ../src-work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
@@ -4,7 +4,6 @@
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-@SideOnly(Side.CLIENT)
public interface IBossDisplayData

2
fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
View file

@ -4,7 +4,7 @@
}
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this);
if (!this.func_174814_R())
{
this.field_70170_p.func_72956_a(p_70100_1_, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);

2
fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch
View file

@ -29,7 +29,7 @@
{
p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_);
- this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5));
+ cpw.mods.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v);
+ net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v);
this.func_175552_ct();
return p_180482_2_;
}

6
fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
View file

@ -4,7 +4,7 @@
public void func_70071_h_()
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this);
this.field_70145_X = this.func_175149_v();
if (this.func_175149_v())
@ -12,7 +12,7 @@
{
this.func_70107_b(d3, this.field_70163_u, d4);
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this);
}
public int func_82145_z()
@ -33,7 +33,7 @@
+ */
+ public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
+ {
+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
+ }
+
public static enum EnumChatVisibility

2
fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch
View file

@ -4,7 +4,7 @@
public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_)
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a);
this.func_75208_c(p_82870_2_);
ItemStack[] aitemstack = CraftingManager.func_77594_a().func_180303_b(this.field_75239_a, p_82870_1_.field_70170_p);

2
fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch
View file

@ -4,7 +4,7 @@
this.field_75228_b = 0;
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_);
+
if (p_75208_1_.func_77973_b() == Items.field_151042_j)
{

6
fml/patches/minecraft/net/minecraft/item/Item.java.patch
View file

@ -5,7 +5,7 @@
public class Item
{
- public static final RegistryNamespaced field_150901_e = new RegistryNamespaced();
+ public static final RegistryNamespaced field_150901_e = cpw.mods.fml.common.registry.GameData.getItemRegistry();
+ public static final RegistryNamespaced field_150901_e = net.minecraftforge.fml.common.registry.GameData.getItemRegistry();
private static final Map field_179220_a = Maps.newHashMap();
protected static final UUID field_111210_e = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
private CreativeTabs field_77701_a;
@ -13,8 +13,8 @@
private String field_77774_bZ;
private static final String __OBFID = "CL_00000041";
+ public final cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate =
+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class);
+ public final net.minecraftforge.fml.common.registry.RegistryDelegate<Item> delegate =
+ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class);
+
public static int func_150891_b(Item p_150891_0_)
{

2
fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch
View file

@ -4,7 +4,7 @@
private boolean field_179551_k;
private static final String __OBFID = "CL_00000043";
+ private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
+ private net.minecraftforge.fml.common.registry.RegistryDelegate<Item> delegate;
public ItemStack(Block p_i1876_1_)
{
this(p_i1876_1_, 1);

6
fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch
View file

@ -17,7 +17,7 @@
final EnumConnectionState enumconnectionstate1 = (EnumConnectionState)this.field_150746_k.attr(field_150739_c).get();
- if (enumconnectionstate1 != enumconnectionstate)
+ if (enumconnectionstate1 != enumconnectionstate && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket))
+ if (enumconnectionstate1 != enumconnectionstate && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket))
{
field_150735_g.debug("Disabled auto read");
this.field_150746_k.config().setAutoRead(false);
@ -26,7 +26,7 @@
if (this.field_150746_k.eventLoop().inEventLoop())
{
- if (enumconnectionstate != enumconnectionstate1)
+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket))
+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket))
{
this.func_150723_a(enumconnectionstate);
}
@ -35,7 +35,7 @@
public void run()
{
- if (enumconnectionstate != enumconnectionstate1)
+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof cpw.mods.fml.common.network.internal.FMLProxyPacket))
+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket))
{
NetworkManager.this.func_150723_a(enumconnectionstate);
}

2
fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch
View file

@ -5,7 +5,7 @@
}
- p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND));
+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(cpw.mods.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND));
+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND));
NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.SERVERBOUND);
NetworkSystem.this.field_151272_f.add(networkmanager);
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);

4
fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch
View file

@ -4,7 +4,7 @@
serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon"));
}
+ cpw.mods.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject);
return serverstatusresponse;
}
@ -12,7 +12,7 @@
jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d());
}
+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject);
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject);
return jsonobject;
}

2
fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch
View file

@ -4,7 +4,7 @@
try
{
+ cpw.mods.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_);
+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_);
inetaddress = InetAddress.getByName(p_connect_1_);
if (RealmsConnect.this.aborted)

30
fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
View file

@ -5,7 +5,7 @@
public void func_71260_j()
{
- if (!this.field_71290_O)
+ if (!this.field_71290_O && cpw.mods.fml.common.Loader.instance().hasReachedState(cpw.mods.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice
+ if (!this.field_71290_O && net.minecraftforge.fml.common.Loader.instance().hasReachedState(net.minecraftforge.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice
{
field_147145_h.info("Stopping server");
@ -13,7 +13,7 @@
{
if (this.func_71197_b())
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarted();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarted();
this.field_175591_ab = func_130071_aq();
long i = 0L;
this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
@ -21,19 +21,19 @@
Thread.sleep(Math.max(1L, 50L - i));
this.field_71296_Q = true;
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStopping();
+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopping();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
}
else
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
this.func_71228_a((CrashReport)null);
}
}
+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e)
+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
+ {
+ // ignore silently
+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
+ }
catch (Throwable throwable1)
{
@ -42,7 +42,7 @@
field_147145_h.error("We were unable to save this crash report to disk.");
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
this.func_71228_a(crashreport);
}
finally
@ -50,7 +50,7 @@
}
finally
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStopped();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopped();
+ this.field_71316_v = true;
this.func_71240_o();
}
@ -59,7 +59,7 @@
public void func_71217_p()
{
long i = System.nanoTime();
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreServerTick();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreServerTick();
++this.field_71315_w;
if (this.field_71295_T)
@ -67,7 +67,7 @@
this.field_71304_b.func_76319_b();
this.field_71304_b.func_76319_b();
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostServerTick();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostServerTick();
}
public void func_71190_q()
@ -75,7 +75,7 @@
}
this.field_71304_b.func_76320_a("tick");
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver);
CrashReport crashreport;
try
@ -83,7 +83,7 @@
throw new ReportedException(crashreport);
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver);
this.field_71304_b.func_76319_b();
this.field_71304_b.func_76320_a("tracker");
worldserver.func_73039_n().func_72788_a();
@ -91,7 +91,7 @@
public void func_71256_s()
{
+ cpw.mods.fml.common.StartupQuery.reset();
+ net.minecraftforge.fml.common.StartupQuery.reset();
this.field_175590_aa = new Thread(this, "Server thread");
this.field_175590_aa.start();
}
@ -100,7 +100,7 @@
public String getServerModName()
{
- return "vanilla";
+ return cpw.mods.fml.common.FMLCommonHandler.instance().getModName();
+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName();
}
public CrashReport func_71230_b(CrashReport p_71230_1_)

8
fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
View file

@ -12,7 +12,7 @@
field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().onServerStart(this);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStart(this);
+
field_155771_h.info("Loading properties");
this.field_71340_o = new PropertyManager(new File("server.properties"));
@ -21,7 +21,7 @@
}
else
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().onServerStarted();
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStarted();
this.func_152361_a(new DedicatedPlayerList(this));
long j = System.nanoTime();
@ -29,7 +29,7 @@
this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false;
+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false;
field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
long i1 = System.nanoTime() - j;
@ -38,7 +38,7 @@
}
- return true;
+ return cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
}
}
}

4
fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
View file

@ -4,11 +4,11 @@
this.func_71245_h(true);
field_147148_h.info("Generating keypair");
this.func_71253_a(CryptManager.func_75891_b());
+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false;
+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false;
this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j());
this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());
- return true;
+ return cpw.mods.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
}
public void func_71217_p()

8
fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
View file

@ -22,7 +22,7 @@
p_72355_2_.func_71116_b();
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_);
if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
{
Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
@ -39,7 +39,7 @@
public void func_72367_e(EntityPlayerMP p_72367_1_)
{
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_);
p_72367_1_.func_71029_a(StatList.field_75947_j);
this.func_72391_b(p_72367_1_);
WorldServer worldserver = p_72367_1_.func_71121_q();
@ -47,7 +47,7 @@
this.field_177454_f.put(entityplayermp1.func_110124_au(), entityplayermp1);
entityplayermp1.func_71116_b();
entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
return entityplayermp1;
}
@ -55,7 +55,7 @@
PotionEffect potioneffect = (PotionEffect)iterator.next();
p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_);
}
public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_)

2
fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch
View file

@ -4,7 +4,7 @@
public void func_147383_a(C00Handshake p_147383_1_)
{
+ if (!cpw.mods.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147386_b)) return;
+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147386_b)) return;
+
switch (NetHandlerHandshakeTCP.SwitchEnumConnectionState.field_151291_a[p_147383_1_.func_149594_c().ordinal()])
{

4
fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch
View file

@ -5,7 +5,7 @@
}
- if (this.field_147336_h++ == 600)
+ if (this.field_147336_h++ == cpw.mods.fml.common.network.internal.FMLNetworkHandler.LOGIN_TIMEOUT)
+ if (this.field_147336_h++ == net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.LOGIN_TIMEOUT)
{
this.func_147322_a("Took too long to log in");
}
@ -14,7 +14,7 @@
this.field_147333_a.func_179290_a(new S02PacketLoginSuccess(this.field_147337_i));
- this.field_147327_f.func_71203_ab().func_72355_a(this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i));
+ cpw.mods.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i));
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i));
}
}

2
fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
View file

@ -22,7 +22,7 @@
+ }
+ catch (Exception ex)
+ {
+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex,
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex,
+ "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
+ p_145827_0_.func_74779_i("id"), oclass.getName());
+ tileentity = null;

2
fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch
View file

@ -13,7 +13,7 @@
+ if (item == Items.field_151129_at) return 20000;
+ if (item == Item.func_150898_a(Blocks.field_150345_g)) return 100;
+ if (item == Items.field_151072_bj) return 2400;
+ return cpw.mods.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_);
+ return net.minecraftforge.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_);
}
}

4
fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch
View file

@ -3,8 +3,8 @@
@@ -1,7 +1,5 @@
package net.minecraft.util;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.Validate;
public class ResourceLocation

24
fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch
View file

@ -1,20 +1,6 @@
--- ../src-base/minecraft/net/minecraft/util/StringTranslate.java
+++ ../src-work/minecraft/net/minecraft/util/StringTranslate.java
@@ -3,10 +3,13 @@
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.io.IOException;
import java.io.InputStream;
+import java.util.HashMap;
import java.util.IllegalFormatException;
import java.util.Iterator;
import java.util.Map;
@@ -18,16 +21,35 @@
@@ -18,16 +18,35 @@
{
private static final Pattern field_111053_a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
private static final Splitter field_135065_b = Splitter.on('=').limit(2);
@ -38,21 +24,21 @@
+
+ private static void inject(StringTranslate inst, InputStream inputstream)
+ {
+ HashMap<String, String> map = parseLangFile(inputstream);
+ java.util.HashMap<String, String> map = parseLangFile(inputstream);
+ inst.field_74816_c.putAll(map);
+ inst.field_150511_e = System.currentTimeMillis();
+ }
+
+ public static HashMap<String,String> parseLangFile(InputStream inputstream)
+ public static java.util.HashMap<String,String> parseLangFile(InputStream inputstream)
+ {
+ HashMap<String,String> table = Maps.newHashMap();
+ java.util.HashMap<String,String> table = Maps.newHashMap();
try
{
- InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator();
while (iterator.hasNext())
@@ -42,17 +64,17 @@
@@ -42,17 +61,17 @@
{
String s1 = astring[0];
String s2 = field_111053_a.matcher(astring[1]).replaceAll("%$1s");

4
fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch
View file

@ -14,7 +14,7 @@
+ }
+ catch (Exception e)
+ {
+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
+ entity.getClass().getName());
+ }
@ -32,7 +32,7 @@
+ }
+ catch (Exception e)
+ {
+ cpw.mods.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
+ "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
+ tileentity.getClass().getName());
+ }

2
fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch
View file

@ -4,7 +4,7 @@
if (this.field_73246_d != null)
{
this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
+ cpw.mods.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_);
+ net.minecraftforge.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_);
chunk.func_76630_e();
}
}

4
fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch
View file

@ -4,7 +4,7 @@
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2)));
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_)));
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2)));
+ cpw.mods.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_);
+ net.minecraftforge.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_);
+
Iterator iterator = arraylist.iterator();
@ -15,7 +15,7 @@
}
+ else
+ {
+ object = cpw.mods.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+ object = net.minecraftforge.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+ }
return (StructureVillagePieces.Village)object;

14
fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
View file

@ -13,10 +13,10 @@
nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
nbttagcompound1 = nbttagcompound.func_74775_l("Data");
+ worldInfo = new WorldInfo(nbttagcompound1);
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
return new WorldInfo(nbttagcompound1);
}
+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e)
+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
+ {
+ throw e;
+ }
@ -26,7 +26,7 @@
}
}
+ cpw.mods.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this);
file1 = new File(this.field_75770_b, "level.dat_old");
if (file1.exists())
@ -36,10 +36,10 @@
nbttagcompound1 = nbttagcompound.func_74775_l("Data");
- return new WorldInfo(nbttagcompound1);
+ worldInfo = new WorldInfo(nbttagcompound1);
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
+ return worldInfo;
+ }
+ catch (cpw.mods.fml.common.StartupQuery.AbortedException e)
+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
+ {
+ throw e;
}
@ -49,7 +49,7 @@
NBTTagCompound nbttagcompound2 = new NBTTagCompound();
nbttagcompound2.func_74782_a("Data", nbttagcompound1);
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2);
+
try
{
@ -58,7 +58,7 @@
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
nbttagcompound1.func_74782_a("Data", nbttagcompound);
+ cpw.mods.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1);
+
try
{

8
fml/src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java → fml/src/main/java/net/minecraftforge/fml/client/CustomModLoadingErrorDisplayException.java
View file

@ -10,13 +10,13 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.IFMLHandledException;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.common.IFMLHandledException;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* If a mod throws this exception during loading, it will be called back to render

2
fml/src/main/java/cpw/mods/fml/client/ExtendedServerListData.java → fml/src/main/java/net/minecraftforge/fml/client/ExtendedServerListData.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.util.Map;

47
fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java → fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View file

@ -10,7 +10,7 @@
* You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.io.File;
import java.io.FileInputStream;
@ -58,6 +58,28 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.storage.SaveFormatOld;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.DuplicateModsFoundException;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.IFMLSidedHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.LoaderException;
import net.minecraftforge.fml.common.MetadataCollection;
import net.minecraftforge.fml.common.MissingModsException;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import net.minecraftforge.fml.common.StartupQuery;
import net.minecraftforge.fml.common.WrongMinecraftVersionException;
import net.minecraftforge.fml.common.eventhandler.EventBus;
import net.minecraftforge.fml.common.network.FMLNetworkEvent;
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.LanguageRegistry;
import net.minecraftforge.fml.common.toposort.ModSortingException;
import net.minecraftforge.fml.relauncher.Side;
import org.apache.logging.log4j.Level;
import org.lwjgl.input.Mouse;
@ -74,29 +96,6 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.DuplicateModsFoundException;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.IFMLSidedHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.LoaderException;
import cpw.mods.fml.common.MetadataCollection;
import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.StartupQuery;
import cpw.mods.fml.common.WrongMinecraftVersionException;
import cpw.mods.fml.common.eventhandler.EventBus;
import cpw.mods.fml.common.network.FMLNetworkEvent;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.common.toposort.ModSortingException;
import cpw.mods.fml.relauncher.Side;
/**
* Handles primary communication from hooked code into the system

16
fml/src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java → fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.util.ArrayList;
import java.util.List;
@ -7,18 +7,18 @@ import java.util.regex.Pattern;
import com.google.common.collect.ImmutableSet;
import cpw.mods.fml.client.config.ConfigGuiType;
import cpw.mods.fml.client.config.DummyConfigElement;
import cpw.mods.fml.client.config.GuiConfig;
import cpw.mods.fml.client.config.GuiConfigEntries.NumberSliderEntry;
import cpw.mods.fml.client.config.IConfigElement;
import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement;
import cpw.mods.fml.client.config.DummyConfigElement.DummyListElement;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fml.client.config.ConfigGuiType;
import net.minecraftforge.fml.client.config.DummyConfigElement;
import net.minecraftforge.fml.client.config.GuiConfig;
import net.minecraftforge.fml.client.config.IConfigElement;
import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement;
import net.minecraftforge.fml.client.config.DummyConfigElement.DummyListElement;
import net.minecraftforge.fml.client.config.GuiConfigEntries.NumberSliderEntry;
public class FMLConfigGuiFactory implements IModGuiFactory
{

8
fml/src/main/java/cpw/mods/fml/client/FMLFileResourcePack.java → fml/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
View file

@ -1,20 +1,20 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.apache.logging.log4j.Level;
import javax.imageio.ImageIO;
import net.minecraft.client.resources.FileResourcePack;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.ModContainer;
import com.google.common.base.Charsets;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.ModContainer;
public class FMLFileResourcePack extends FileResourcePack {
private ModContainer container;

8
fml/src/main/java/cpw/mods/fml/client/FMLFolderResourcePack.java → fml/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
View file

@ -1,20 +1,20 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.apache.logging.log4j.Level;
import javax.imageio.ImageIO;
import net.minecraft.client.resources.FolderResourcePack;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.ModContainer;
import com.google.common.base.Charsets;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.ModContainer;
public class FMLFolderResourcePack extends FolderResourcePack {
private ModContainer container;

2
fml/src/main/java/cpw/mods/fml/client/GuiAccessDenied.java → fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;

2
fml/src/main/java/cpw/mods/fml/client/GuiBackupFailed.java → fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.io.File;
import net.minecraft.client.gui.GuiButton;

4
fml/src/main/java/cpw/mods/fml/client/GuiConfirmation.java → fml/src/main/java/net/minecraftforge/fml/client/GuiConfirmation.java
View file

@ -1,9 +1,9 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiOptionButton;
import net.minecraft.client.resources.I18n;
import cpw.mods.fml.common.StartupQuery;
import net.minecraftforge.fml.common.StartupQuery;
public class GuiConfirmation extends GuiNotification
{

2
fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java → fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;

6
fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java → fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java
View file

@ -10,14 +10,14 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.io.File;
import java.util.Map.Entry;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.DuplicateModsFoundException;
import cpw.mods.fml.common.ModContainer;
import net.minecraftforge.fml.common.DuplicateModsFoundException;
import net.minecraftforge.fml.common.ModContainer;
public class GuiDupesFound extends GuiErrorScreen
{

2
fml/src/main/java/cpw/mods/fml/client/GuiIngameModOptions.java → fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiButton;

11
fml/src/main/java/cpw/mods/fml/client/GuiModList.java → fml/src/main/java/net/minecraftforge/fml/client/GuiModList.java
View file

@ -12,7 +12,7 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.awt.Dimension;
import java.awt.image.BufferedImage;
@ -33,17 +33,16 @@ import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.resources.IResourcePack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.ModContainer.Disableable;
import org.apache.logging.log4j.Level;
import org.lwjgl.opengl.GL11;
import com.google.common.base.Strings;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.ModContainer.Disableable;
/**
* @author cpw
*

2
fml/src/main/java/cpw/mods/fml/client/GuiModOptionList.java → fml/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.renderer.Tessellator;

8
fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java → fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java
View file

@ -10,12 +10,12 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.versioning.ArtifactVersion;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import net.minecraftforge.fml.common.MissingModsException;
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
public class GuiModsMissing extends GuiErrorScreen
{

6
fml/src/main/java/cpw/mods/fml/client/GuiModsMissingForServer.java → fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java
View file

@ -10,13 +10,13 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.versioning.ArtifactVersion;
import net.minecraftforge.fml.common.MissingModsException;
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
public class GuiModsMissingForServer extends GuiScreen
{

4
fml/src/main/java/cpw/mods/fml/client/GuiNotification.java → fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java
View file

@ -1,9 +1,9 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import cpw.mods.fml.common.StartupQuery;
import net.minecraftforge.fml.common.StartupQuery;
public class GuiNotification extends GuiScreen
{

11
fml/src/main/java/cpw/mods/fml/client/GuiOldSaveLoadConfirm.java → fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.io.File;
import java.io.IOException;
@ -10,14 +10,13 @@ import net.minecraft.client.gui.GuiSelectWorld;
import net.minecraft.client.gui.GuiYesNo;
import net.minecraft.client.gui.GuiYesNoCallback;
import net.minecraft.world.WorldSettings;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import net.minecraftforge.fml.common.StartupQuery;
import net.minecraftforge.fml.common.ZipperUtil;
import org.apache.logging.log4j.Level;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.StartupQuery;
import cpw.mods.fml.common.ZipperUtil;
public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback {
private String dirName;

2
fml/src/main/java/cpw/mods/fml/client/GuiScrollingList.java → fml/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.util.List;

9
fml/src/main/java/cpw/mods/fml/client/GuiSlotModList.java → fml/src/main/java/net/minecraftforge/fml/client/GuiSlotModList.java
View file

@ -10,15 +10,14 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.util.ArrayList;
import net.minecraft.client.renderer.Tessellator;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.LoaderState.ModState;
import cpw.mods.fml.common.ModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.LoaderState.ModState;
/**
* @author cpw

8
fml/src/main/java/cpw/mods/fml/client/GuiSortingProblem.java → fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java
View file

@ -1,9 +1,9 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiScreen;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.toposort.ModSortingException;
import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.toposort.ModSortingException;
import net.minecraftforge.fml.common.toposort.ModSortingException.SortingExceptionData;
public class GuiSortingProblem extends GuiScreen {
private SortingExceptionData<ModContainer> failedList;

6
fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java → fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java
View file

@ -10,11 +10,11 @@
* cpw - implementation
*/
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.WrongMinecraftVersionException;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.WrongMinecraftVersionException;
public class GuiWrongMinecraft extends GuiErrorScreen
{

2
fml/src/main/java/cpw/mods/fml/client/IModGuiFactory.java → fml/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client;
package net.minecraftforge.fml.client;
import java.util.List;
import java.util.Set;

2
fml/src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java → fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
public enum ConfigGuiType
{

7
fml/src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java → fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java
View file

@ -10,17 +10,16 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry;
import cpw.mods.fml.client.config.GuiEditArrayEntries.IArrayEntry;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry;
import net.minecraftforge.fml.client.config.GuiEditArrayEntries.IArrayEntry;
/**

2
fml/src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;

2
fml/src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;

21
fml/src/main/java/cpw/mods/fml/client/config/GuiConfig.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java
View file

@ -10,10 +10,10 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR;
import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR;
import java.io.IOException;
import java.util.ArrayList;
@ -24,17 +24,16 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ChatComponentText;
import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
import net.minecraftforge.fml.client.event.ConfigChangedEvent.PostConfigChangedEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
import cpw.mods.fml.client.event.ConfigChangedEvent.PostConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.Event.Result;
/**
* This class is the base GuiScreen for all config GUI screens. It can be extended by mods to provide the top-level config screen
* that will be called when the Config button is clicked from the Main Menu Mods list.

13
fml/src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java
View file

@ -9,10 +9,10 @@
* Contributors (this class):
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR;
import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR;
import java.util.ArrayList;
import java.util.Arrays;
@ -27,13 +27,12 @@ import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
/**
* This class implements the scrolling list functionality of the config GUI screens. It also provides all the default control handlers
* for the various property types.

6
fml/src/main/java/cpw/mods/fml/client/config/GuiEditArray.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.io.IOException;
import java.util.ArrayList;
@ -22,8 +22,8 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.EnumChatFormatting;
import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR;
import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR;
import org.lwjgl.input.Keyboard;

11
fml/src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.util.ArrayList;
import java.util.Arrays;
@ -22,14 +22,13 @@ import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fml.client.config.GuiConfigEntries.ArrayEntry;
import net.minecraftforge.fml.common.FMLLog;
import org.lwjgl.input.Keyboard;
import static cpw.mods.fml.client.config.GuiUtils.INVALID;
import static cpw.mods.fml.client.config.GuiUtils.VALID;
import cpw.mods.fml.client.config.GuiConfigEntries.ArrayEntry;
import cpw.mods.fml.common.FMLLog;
import static net.minecraftforge.fml.client.config.GuiUtils.INVALID;
import static net.minecraftforge.fml.client.config.GuiUtils.VALID;
/**
* This class implements the scrolling list functionality of the GuiEditList screen. It also provides all the default controls

2
fml/src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.gui.GuiDisconnected;
import net.minecraft.client.gui.GuiButton;

7
fml/src/main/java/cpw/mods/fml/client/config/GuiSelectString.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.util.ArrayList;
import java.util.List;
@ -21,9 +21,8 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.EnumChatFormatting;
import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR;
import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.RESET_CHAR;
import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR;
/**
* This class provides a screen that allows the user to select a value from a list.

4
fml/src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.util.ArrayList;
import java.util.Collections;
@ -23,7 +23,7 @@ import java.util.Map.Entry;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiListExtended;
import net.minecraft.client.renderer.Tessellator;
import cpw.mods.fml.client.config.GuiConfigEntries.SelectValueEntry;
import net.minecraftforge.fml.client.config.GuiConfigEntries.SelectValueEntry;
/**
* This class implements the scrolling list functionality of the GuiSelectString screen.

2
fml/src/main/java/cpw/mods/fml/client/config/GuiSlider.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.Minecraft;

2
fml/src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.Minecraft;

2
fml/src/main/java/cpw/mods/fml/client/config/GuiUtils.java → fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper;

2
fml/src/main/java/cpw/mods/fml/client/config/HoverChecker.java → fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java
View file

@ -10,7 +10,7 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import net.minecraft.client.gui.GuiButton;

6
fml/src/main/java/cpw/mods/fml/client/config/IConfigElement.java → fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java
View file

@ -10,13 +10,13 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.config;
package net.minecraftforge.fml.client.config;
import java.util.List;
import java.util.regex.Pattern;
import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry;
import cpw.mods.fml.client.config.GuiEditArrayEntries.IArrayEntry;
import net.minecraftforge.fml.client.config.GuiConfigEntries.IConfigEntry;
import net.minecraftforge.fml.client.config.GuiEditArrayEntries.IArrayEntry;
/**
* This interface provides the information needed by GuiConfig and GuiConfigEntries to display config elements for editing.

6
fml/src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java → fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java
View file

@ -10,10 +10,10 @@
* bspkrs - implementation
*/
package cpw.mods.fml.client.event;
package net.minecraftforge.fml.client.event;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.Event.HasResult;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.Event.HasResult;
/**
* These events are posted from the GuiConfig screen when the done button is pressed. The events are only posted

4
fml/src/main/java/cpw/mods/fml/client/registry/ClientRegistry.java → fml/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java
View file

@ -10,16 +10,16 @@
* cpw - implementation
*/
package cpw.mods.fml.client.registry;
package net.minecraftforge.fml.client.registry;
import org.apache.commons.lang3.ArrayUtils;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class ClientRegistry
{

2
fml/src/main/java/cpw/mods/fml/client/registry/RenderingRegistry.java → fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.client.registry;
package net.minecraftforge.fml.client.registry;
import java.util.List;
import java.util.Map;

2
fml/src/main/java/cpw/mods/fml/common/API.java → fml/src/main/java/net/minecraftforge/fml/common/API.java
View file

@ -1,4 +1,4 @@
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
fml/src/main/java/cpw/mods/fml/common/BukkitPluginRef.java → fml/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
fml/src/main/java/cpw/mods/fml/common/BukkitProxy.java → fml/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
/**
* A marker interface for retrieving a proxy to a bukkit plugin.

2
fml/src/main/java/cpw/mods/fml/common/CertificateHelper.java → fml/src/main/java/net/minecraftforge/fml/common/CertificateHelper.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.nio.ByteBuffer;
import java.security.MessageDigest;

10
fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java → fml/src/main/java/net/minecraftforge/fml/common/DummyModContainer.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.io.File;
import java.security.cert.Certificate;
@ -19,13 +19,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
import net.minecraftforge.fml.common.versioning.VersionRange;
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.EventBus;
import cpw.mods.fml.common.versioning.ArtifactVersion;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.versioning.VersionRange;
public class DummyModContainer implements ModContainer
{
private ModMetadata md;

2
fml/src/main/java/cpw/mods/fml/common/DuplicateModsFoundException.java → fml/src/main/java/net/minecraftforge/fml/common/DuplicateModsFoundException.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.io.File;

19
fml/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java → fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
View file

@ -10,7 +10,7 @@
* cpw - implementation
*/
package cpw.mods.fml.common;
package net.minecraftforge.fml.common;
import java.io.File;
import java.lang.ref.WeakReference;
@ -38,6 +38,14 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.fml.common.eventhandler.EventBus;
import net.minecraftforge.fml.common.gameevent.InputEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.server.FMLServerHandler;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
@ -52,15 +60,6 @@ import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import cpw.mods.fml.common.eventhandler.EventBus;
import cpw.mods.fml.common.gameevent.InputEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.server.FMLServerHandler;
/**
* The main class for non-obfuscated hook handling code

Some files were not shown because too many files have changed in this diff Show more