mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-13 16:54:22 +00:00
Delete conf, server compile, update fml, and fix install script.
This commit is contained in:
LexManos committed
1 parent
f31b8a98a9
commit
a759939e13
20 files changed
+279
-46545
No files matched your search
+4
-5
@@ -1,19 +1,18 @@
|
||||
package net.minecraftforge.client.event.sound;
|
||||
package net.minecraftforge.event.entity;
|
||||
|
||||
import net.minecraft.src.Entity;
|
||||
import net.minecraftforge.event.Cancelable;
|
||||
|
||||
@Cancelable
|
||||
public class PlaySoundAtEntityEvent extends SoundEvent
|
||||
{
|
||||
public final Entity entity;
|
||||
public class PlaySoundAtEntityEvent extends EntityEvent
|
||||
{
|
||||
public String name;
|
||||
public final float volume;
|
||||
public final float pitch;
|
||||
|
||||
public PlaySoundAtEntityEvent(Entity entity, String name, float volume, float pitch)
|
||||
{
|
||||
this.entity = entity;
|
||||
super(entity);
|
||||
this.name = name;
|
||||
this.volume = volume;
|
||||
this.pitch = pitch;
|
||||
@@ -1,19 +0,0 @@
|
||||
# Artistic Style format configuration
|
||||
# see http://astyle.sourceforge.net/astyle.html
|
||||
|
||||
style=allman
|
||||
|
||||
add-brackets
|
||||
break-closing-brackets
|
||||
|
||||
indent-switches
|
||||
|
||||
max-instatement-indent=2
|
||||
|
||||
pad-oper
|
||||
pad-header
|
||||
unpad-paren
|
||||
|
||||
break-blocks
|
||||
|
||||
delete-empty-lines
|
||||
-3907
File diff suppressed because it is too large.
Load diff
-6170
File diff suppressed because it is too large.
Load diff
-14363
File diff suppressed because it is too large.
Load diff
-155
@@ -1,155 +0,0 @@
|
||||
[DEFAULT]
|
||||
DirTemp = temp
|
||||
DirSrc = src
|
||||
DirLogs = logs
|
||||
DirBin = bin
|
||||
DirJars = jars
|
||||
DirReobf = reobf
|
||||
DirConf = conf
|
||||
DirRuntime = runtime
|
||||
DirLib = lib
|
||||
DirTempSrc = temp/src
|
||||
DirTempCls = temp/cls
|
||||
DirTempBin = temp/bin
|
||||
DirModSrc = modsrc
|
||||
DirEclipse = eclipse
|
||||
|
||||
[CSV]
|
||||
Classes = %(DirConf)s/classes.csv
|
||||
Methods = %(DirConf)s/methods.csv
|
||||
Fields = %(DirConf)s/fields.csv
|
||||
Params = %(DirConf)s/params.csv
|
||||
NewIds = %(DirConf)s/newids.csv
|
||||
|
||||
[SRGS]
|
||||
ConfClient = %(DirConf)s/joined.srg
|
||||
ConfServer = %(DirConf)s/joined.srg
|
||||
Client = %(DirTemp)s/client_rg.srg
|
||||
Server = %(DirTemp)s/server_rg.srg
|
||||
DeobfClient = %(DirTemp)s/client_deobf.srg
|
||||
DeobfServer = %(DirTemp)s/server_deobf.srg
|
||||
ReobfClient = %(DirTemp)s/client_ro.srg
|
||||
ReobfServer = %(DirTemp)s/server_ro.srg
|
||||
|
||||
[JAR]
|
||||
DirNatives = %(DirJars)s/bin/natives
|
||||
Client = %(DirJars)s/bin/minecraft.jar
|
||||
Server = %(DirJars)s/minecraft_server.jar
|
||||
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||
MD5Client = 266ccbc9798afd2eadf3d6c01b4c562a
|
||||
MD5Server = f44a3cfe6ec35b1ac3f2b635e73d96fe
|
||||
|
||||
[RETROGUARD]
|
||||
Location = %(DirRuntime)s/bin/retroguard.jar
|
||||
RetroConf = %(DirTemp)s/retroguard.cfg
|
||||
RetroReobConf = %(DirTemp)s/retroguard_ro.cfg
|
||||
ClientConf = %(DirTemp)s/client_rg.cfg
|
||||
ServerConf = %(DirTemp)s/server_rg.cfg
|
||||
ClientReobConf = %(DirTemp)s/client_ro.cfg
|
||||
ServerReobConf = %(DirTemp)s/server_ro.cfg
|
||||
ClientOut = %(DirTemp)s/minecraft_rg.jar
|
||||
ServerOut = %(DirTemp)s/minecraft_server_rg.jar
|
||||
ClientLog = %(DirLogs)s/client_rg.log
|
||||
ServerLog = %(DirLogs)s/server_rg.log
|
||||
ClientDeobLog = %(DirLogs)s/client_deob.log
|
||||
ServerDeobLog = %(DirLogs)s/server_deob.log
|
||||
NullPkg = net/minecraft/src
|
||||
|
||||
[EXCEPTOR]
|
||||
XClientCfg = %(DirConf)s/joined.exc
|
||||
XServerCfg = %(DirConf)s/joined.exc
|
||||
XClientOut = %(DirTemp)s/minecraft_exc.jar
|
||||
XServerOut = %(DirTemp)s/minecraft_server_exc.jar
|
||||
XClientLog = %(DirLogs)s/client_exc.log
|
||||
XServerLog = %(DirLogs)s/server_exc.log
|
||||
|
||||
[DECOMPILE]
|
||||
ClsClientTemp = %(DirTempCls)s/minecraft
|
||||
ClsServerTemp = %(DirTempCls)s/minecraft_server
|
||||
SrcClientTemp = %(DirTempSrc)s/minecraft
|
||||
SrcServerTemp = %(DirTempSrc)s/minecraft_server
|
||||
FFSource = net
|
||||
|
||||
[OUTPUT]
|
||||
BinClientTemp = %(DirTempBin)s/minecraft
|
||||
BinServerTemp = %(DirTempBin)s/minecraft_server
|
||||
SrcClient = %(DirSrc)s/minecraft
|
||||
SrcServer = %(DirSrc)s/minecraft_server
|
||||
TestClient = net/minecraft/client/Minecraft
|
||||
TestServer = net/minecraft/server/MinecraftServer
|
||||
|
||||
[PATCHES]
|
||||
PatchClient = %(DirConf)s/patches/minecraft.patch
|
||||
PatchServer = %(DirConf)s/patches/minecraft_server.patch
|
||||
PatchTemp = %(DirTemp)s/temp.patch
|
||||
FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
|
||||
FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
|
||||
PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
|
||||
PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
|
||||
|
||||
[RECOMPILE]
|
||||
BinClient = %(DirBin)s/minecraft
|
||||
BinServer = %(DirBin)s/minecraft_server
|
||||
LogClient = %(DirLogs)s/client_compile.log
|
||||
LogServer = %(DirLogs)s/server_compile.log
|
||||
ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||
ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
|
||||
ClientFixes = %(DirConf)s/patches
|
||||
FixStart = Start
|
||||
IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
|
||||
|
||||
[REOBF]
|
||||
MD5Client = %(DirTemp)s/client.md5
|
||||
MD5Server = %(DirTemp)s/server.md5
|
||||
MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
|
||||
MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
|
||||
RecompJarClient = %(DirTemp)s/client_recomp.jar
|
||||
RecompJarServer = %(DirTemp)s/server_recomp.jar
|
||||
ObfJarClient = %(DirTemp)s/client_reobf.jar
|
||||
ObfJarServer = %(DirTemp)s/server_reobf.jar
|
||||
ReobfDirClient = %(DirReobf)s/minecraft
|
||||
ReobfDirServer = %(DirReobf)s/minecraft_server
|
||||
ClientRoLog = %(DirLogs)s/client_ro.log
|
||||
ServerRoLog = %(DirLogs)s/server_ro.log
|
||||
ReobfClientLog = %(DirLogs)s/client_reob.log
|
||||
ReobfServerLog = %(DirLogs)s/server_reob.log
|
||||
|
||||
[GETMODSOURCE]
|
||||
OutSRCClient = %(DirModSrc)s/minecraft
|
||||
OutSRCServer = %(DirModSrc)s/minecraft_server
|
||||
|
||||
[MCP]
|
||||
LogFile = %(DirLogs)s/mcp.log
|
||||
LogFileErr = %(DirLogs)s/mcperr.log
|
||||
UpdateUrl =
|
||||
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
||||
RGIndex = 70000
|
||||
ParamIndex = 3000
|
||||
|
||||
[ASTYLE]
|
||||
AstyleConfig = %(DirConf)s/astyle.cfg
|
||||
|
||||
[COMMANDS]
|
||||
Wine = wine
|
||||
Patcher_win = %(DirRuntime)s/bin/applydiff.exe
|
||||
Patcher_linux = patch
|
||||
Patcher_osx = patch
|
||||
Jad_win = %(DirRuntime)s/bin/jad.exe
|
||||
Jad_osx = %(DirRuntime)s/bin/jad-osx
|
||||
AStyle_win = %(DirRuntime)s/bin/astyle.exe
|
||||
AStyle_linux = astyle
|
||||
AStyle_osx = %(DirRuntime)s/bin/astyle-osx
|
||||
JadRetro = %(DirRuntime)s/bin/jadretro.jar
|
||||
Fernflower = %(DirRuntime)s/bin/fernflower.jar
|
||||
Exceptor = %(DirRuntime)s/bin/mcinjector.jar
|
||||
CmdPatch = %s -p1 -u -i {patchfile} -d {srcdir}
|
||||
CmdJad = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
|
||||
CmdAStyle = %s --suffix=none --quiet --options={conffile} {classes}
|
||||
CmdRG = %s -cp "{classpath}" RetroGuard -searge {conffile}
|
||||
CmdRGReobf = %s -cp "{classpath}" RetroGuard -notch {conffile}
|
||||
CmdJadretro = %s -jar %s {targetdir}
|
||||
CmdFernflower = %s -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
|
||||
CmdExceptor = %s -jar %s {input} {output} {conf} {log}
|
||||
CmdRecomp = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
||||
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
|
||||
CmdStartClt = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
|
||||
-3509
File diff suppressed because it is too large.
Load diff
-8820
File diff suppressed because it is too large.
Load diff
-9145
File diff suppressed because it is too large.
Load diff
@@ -1,79 +0,0 @@
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
public class Start
|
||||
{
|
||||
public static void main(String[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Field f = Minecraft.class.getDeclaredField("field_71463_am");
|
||||
Field.setAccessible(new Field[] { f }, true);
|
||||
f.set(null, new File("."));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
return;
|
||||
}
|
||||
if (args.length != 2)
|
||||
{
|
||||
Minecraft.main(args);
|
||||
}
|
||||
else
|
||||
{
|
||||
try {
|
||||
String parameters = "http://login.minecraft.net/?user=" + URLEncoder.encode(args[0], "UTF-8") +
|
||||
"&password=" + URLEncoder.encode(args[1], "UTF-8") +
|
||||
"&version=" + 13;
|
||||
String result = openUrl(parameters);
|
||||
|
||||
if (result == null)
|
||||
{
|
||||
System.out.println("Can't connect to minecraft.net");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!result.contains(":"))
|
||||
{
|
||||
System.out.println("Login Failed: " + result);
|
||||
return;
|
||||
}
|
||||
//latestVersion, downloadTicket, userName, sessionId
|
||||
String[] values = result.split(":");
|
||||
Minecraft.main(new String[]{values[2].trim(), values[3].trim()});
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String openUrl(String addr)
|
||||
{
|
||||
try {
|
||||
URL url = new URL(addr);
|
||||
java.io.InputStream is;
|
||||
is = url.openConnection().getInputStream();
|
||||
|
||||
java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.InputStreamReader(is));
|
||||
String buf = "";
|
||||
String line = null;
|
||||
while((line = reader.readLine() ) != null)
|
||||
{
|
||||
buf += "\n" + line;
|
||||
}
|
||||
reader.close();
|
||||
return buf;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,184 +0,0 @@
|
||||
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
|
||||
--- minecraft\net\minecraft\client\Minecraft.java Wed Aug 01 18:13:27 2012
|
||||
+++ minecraft_patched\net\minecraft\client\Minecraft.java Wed Aug 01 18:23:13 2012
|
||||
@@ -539,9 +539,8 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- while(true) {
|
||||
try {
|
||||
- if(this.field_71425_J) {
|
||||
+ while(this.field_71425_J) {
|
||||
if(this.field_71434_R && this.field_71433_S != null) {
|
||||
this.func_71377_b(this.field_71433_S);
|
||||
return;
|
||||
@@ -559,7 +558,6 @@
|
||||
this.func_71373_a(new GuiMemoryErrorScreen());
|
||||
System.gc();
|
||||
}
|
||||
- continue;
|
||||
}
|
||||
} catch (MinecraftError var12) {
|
||||
;
|
||||
@@ -577,8 +575,6 @@
|
||||
this.func_71405_e();
|
||||
}
|
||||
|
||||
- return;
|
||||
- }
|
||||
}
|
||||
|
||||
private void func_71411_J() {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
|
||||
--- minecraft\net\minecraft\src\CodecMus.java Wed Aug 01 18:13:28 2012
|
||||
+++ minecraft_patched\net\minecraft\src\CodecMus.java Wed Aug 01 18:24:06 2012
|
||||
@@ -1,5 +1,6 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
+import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import net.minecraft.src.MusInputStream;
|
||||
import paulscode.sound.codecs.CodecJOrbis;
|
||||
@@ -7,6 +8,10 @@
|
||||
public class CodecMus extends CodecJOrbis {
|
||||
|
||||
protected InputStream openInputStream() {
|
||||
+ try {
|
||||
return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
|
||||
+ } catch(IOException ex) {
|
||||
+ return null;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:13:28 2012
|
||||
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:33 2012
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||
|
||||
+ public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
|
||||
+ super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
|
||||
+ }
|
||||
+
|
||||
public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
|
||||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
|
||||
--- minecraft\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:13:29 2012
|
||||
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012
|
||||
@@ -183,7 +183,7 @@
|
||||
|
||||
}
|
||||
|
||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
||||
return super.func_71230_b(p_71230_1_);
|
||||
}
|
||||
@@ -192,7 +192,7 @@
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
- protected void func_71190_q() {
|
||||
+ public void func_71190_q() {
|
||||
super.func_71190_q();
|
||||
this.func_71333_ah();
|
||||
}
|
||||
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
|
||||
--- minecraft\net\minecraft\src\FontRenderer.java Thu Aug 02 02:35:41 2012
|
||||
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Thu Aug 02 02:37:34 2012
|
||||
@@ -711,8 +711,6 @@
|
||||
for(boolean var7 = false; var5 < var3; ++var5) {
|
||||
char var8 = p_78259_1_.charAt(var5);
|
||||
switch(var8) {
|
||||
- case 32:
|
||||
- var6 = var5;
|
||||
case 167:
|
||||
if(var5 < var3 - 1) {
|
||||
++var5;
|
||||
@@ -726,6 +724,8 @@
|
||||
}
|
||||
}
|
||||
break;
|
||||
+ case 32:
|
||||
+ var6 = var5;
|
||||
default:
|
||||
var4 += this.func_78263_a(var8);
|
||||
if(var7) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
|
||||
--- minecraft\net\minecraft\src\IntegratedServer.java Wed Aug 01 18:13:30 2012
|
||||
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Wed Aug 01 18:32:27 2012
|
||||
@@ -97,7 +97,7 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
- protected void func_71217_p() {
|
||||
+ public void func_71217_p() {
|
||||
boolean var1 = this.field_71348_o;
|
||||
this.field_71348_o = this.field_71347_n.func_71752_f();
|
||||
if(!var1 && this.field_71348_o) {
|
||||
@@ -144,7 +144,7 @@
|
||||
this.field_71349_l.func_71404_a(p_71228_1_);
|
||||
}
|
||||
|
||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
p_71230_1_.func_71500_a("Type", new CallableType3(this));
|
||||
p_71230_1_.func_71500_a("Is Modded", new CallableIsModded(this));
|
||||
return super.func_71230_b(p_71230_1_);
|
||||
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
|
||||
--- minecraft\net\minecraft\src\ItemMap.java Wed Aug 01 18:13:31 2012
|
||||
+++ minecraft_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:03 2012
|
||||
@@ -24,7 +24,6 @@
|
||||
}
|
||||
|
||||
public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {
|
||||
- "map_" + p_77874_0_;
|
||||
MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);
|
||||
if(var3 == null) {
|
||||
int var4 = p_77874_1_.func_72841_b("map");
|
||||
@@ -37,7 +36,6 @@
|
||||
}
|
||||
|
||||
public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
|
||||
- "map_" + p_77873_1_.func_77960_j();
|
||||
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
|
||||
if(var4 == null) {
|
||||
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
||||
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
||||
--- minecraft\net\minecraft\src\RenderGlobal.java Wed Aug 01 18:13:32 2012
|
||||
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Wed Aug 01 18:33:03 2012
|
||||
@@ -1431,7 +1431,7 @@
|
||||
double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
|
||||
double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
|
||||
double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
|
||||
- Object var21 = null;
|
||||
+ EntityFX var21 = null;
|
||||
if(p_72726_1_.equals("hugeexplosion")) {
|
||||
this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
|
||||
} else if(p_72726_1_.equals("largeexplode")) {
|
||||
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
|
||||
--- minecraft\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:13:32 2012
|
||||
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:27:42 2012
|
||||
@@ -11,6 +11,7 @@
|
||||
this.field_74504_a = p_i3285_1_;
|
||||
}
|
||||
|
||||
+ @SuppressWarnings("deprecation")
|
||||
public void run() {
|
||||
try {
|
||||
Thread.sleep(5000L);
|
||||
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:13:32 2012
|
||||
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:10 2012
|
||||
@@ -20,7 +20,9 @@
|
||||
}
|
||||
|
||||
public void run() {
|
||||
+ while(true) {
|
||||
this.func_75736_b();
|
||||
+ }
|
||||
}
|
||||
|
||||
private void func_75736_b() {
|
||||
@@ -1,70 +0,0 @@
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:15:36 2012
|
||||
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:32 2012
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||
|
||||
+ public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
|
||||
+ super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
|
||||
+ }
|
||||
+
|
||||
public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
|
||||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
|
||||
--- minecraft_server\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:15:36 2012
|
||||
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012
|
||||
@@ -184,7 +184,7 @@
|
||||
|
||||
}
|
||||
|
||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
||||
return super.func_71230_b(p_71230_1_);
|
||||
}
|
||||
@@ -193,7 +193,7 @@
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
- protected void func_71190_q() {
|
||||
+ public void func_71190_q() {
|
||||
super.func_71190_q();
|
||||
this.func_71333_ah();
|
||||
}
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
|
||||
--- minecraft_server\net\minecraft\src\ItemMap.java Wed Aug 01 18:15:37 2012
|
||||
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:23 2012
|
||||
@@ -24,7 +24,6 @@
|
||||
}
|
||||
|
||||
public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
|
||||
- "map_" + p_77873_1_.func_77960_j();
|
||||
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
|
||||
if(var4 == null) {
|
||||
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
|
||||
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:15:38 2012
|
||||
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:28:41 2012
|
||||
@@ -11,6 +11,7 @@
|
||||
this.field_74504_a = p_i3285_1_;
|
||||
}
|
||||
|
||||
+ @SuppressWarnings("deprecation")
|
||||
public void run() {
|
||||
try {
|
||||
Thread.sleep(5000L);
|
||||
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:15:38 2012
|
||||
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:56 2012
|
||||
@@ -20,7 +20,9 @@
|
||||
}
|
||||
|
||||
public void run() {
|
||||
+ while(true) {
|
||||
this.func_75736_b();
|
||||
+ }
|
||||
}
|
||||
|
||||
private void func_75736_b() {
|
||||
@@ -1,4 +0,0 @@
|
||||
[VERSION]
|
||||
MCPVersion = 7.0a
|
||||
ClientVersion = 1.3.1
|
||||
ServerVersion = 1.3.1
|
||||
@@ -1,2 +1,3 @@
|
||||
ENABLE_ANIMATIONS=false
|
||||
eclipse.preferences.version=1
|
||||
showIntro=false
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="ASCII"?>
|
||||
<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_8CN7Id4HEeGVeZPPN-V-EA" elementId="org.eclipse.e4.legacy.ide.application" contributorURI="platform:/plugin/org.eclipse.ui.workbench" selectedElement="_8CN7It4HEeGVeZPPN-V-EA" bindingContexts="_8CN7K94HEeGVeZPPN-V-EA">
|
||||
<tags>activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration</tags>
|
||||
<children xsi:type="basic:TrimmedWindow" xmi:id="_8CN7It4HEeGVeZPPN-V-EA" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.ui.workbench" selectedElement="_8xmJoN4HEeGVeZPPN-V-EA" x="1083" y="103" width="1024" height="768">
|
||||
<children xsi:type="basic:TrimmedWindow" xmi:id="_8CN7It4HEeGVeZPPN-V-EA" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.ui.workbench" selectedElement="_8xmJoN4HEeGVeZPPN-V-EA" x="0" y="0" width="1920" height="1050">
|
||||
<tags>topLevel</tags>
|
||||
<tags>shellMaximized</tags>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_8xmJoN4HEeGVeZPPN-V-EA" selectedElement="_8xmJod4HEeGVeZPPN-V-EA" horizontal="true">
|
||||
@@ -67,6 +67,7 @@
|
||||
<tags>persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task</tags>
|
||||
<tags>persp.viewSC:org.eclipse.wb.core.StructureView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.wb.core.PaletteView</tags>
|
||||
<tags>persp.actionSet:org.eclipse.debug.ui.debugActionSet</tags>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9Qvjwd4HEeGVeZPPN-V-EA" selectedElement="_9QwK2d4HEeGVeZPPN-V-EA" horizontal="true">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9Qvjwt4HEeGVeZPPN-V-EA" containerData="1762" selectedElement="_9Qvjw94HEeGVeZPPN-V-EA">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9Qvjw94HEeGVeZPPN-V-EA" elementId="left" containerData="6000" selectedElement="_9QwK0N4HEeGVeZPPN-V-EA">
|
||||
@@ -86,9 +87,9 @@
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9QwK2d4HEeGVeZPPN-V-EA" containerData="8238" selectedElement="_9Qwx594HEeGVeZPPN-V-EA">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9QwK2t4HEeGVeZPPN-V-EA" containerData="5176" selectedElement="_9QwK294HEeGVeZPPN-V-EA" horizontal="true">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9QwK2t4HEeGVeZPPN-V-EA" containerData="5470" selectedElement="_9QwK294HEeGVeZPPN-V-EA" horizontal="true">
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9QwK294HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.editorss" containerData="8082" ref="_9PHzIN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9QwK3N4HEeGVeZPPN-V-EA" containerData="1918">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_9QwK3N4HEeGVeZPPN-V-EA" containerData="1918" selectedElement="_9Qwx4t4HEeGVeZPPN-V-EA">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9Qwx4N4HEeGVeZPPN-V-EA" elementId="org.eclipse.mylyn.tasks.ui.views.tasksMStack" toBeRendered="false" containerData="5000">
|
||||
<tags>newtablook</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx4d4HEeGVeZPPN-V-EA" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" toBeRendered="false" ref="_9QtukN4HEeGVeZPPN-V-EA"/>
|
||||
@@ -103,20 +104,98 @@
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9Qwx594HEeGVeZPPN-V-EA" elementId="bottom" containerData="4824" selectedElement="_9Qwx6N4HEeGVeZPPN-V-EA">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9Qwx594HEeGVeZPPN-V-EA" elementId="bottom" containerData="4530" selectedElement="_9Qwx6N4HEeGVeZPPN-V-EA">
|
||||
<tags>newtablook</tags>
|
||||
<tags>org.eclipse.e4.secondaryDataStack</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx6N4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.ProblemView" ref="_9QDnQ94HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx6d4HEeGVeZPPN-V-EA" elementId="org.eclipse.jdt.ui.JavadocView" ref="_9QE1YN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx6t4HEeGVeZPPN-V-EA" elementId="org.eclipse.jdt.ui.SourceView" ref="_9QFccN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx694HEeGVeZPPN-V-EA" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_9QGDgN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx7N4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.console.ConsoleView" toBeRendered="false" ref="_9QGqkN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx694HEeGVeZPPN-V-EA" elementId="org.eclipse.search.ui.views.SearchView" ref="_9QGDgN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx7N4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.console.ConsoleView" ref="_9QGqkN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9Qwx7d4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_9QGqkd4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_9QxY8N4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_9QGqkt4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_xRzJIOJzEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugView" ref="_0Q_TkOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_yn1AkOJ2EeGXDvTwhqcV7A" elementId="org.eclipse.jdt.callhierarchy.view" ref="_yn0ZgOJ2EeGXDvTwhqcV7A"/>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="advanced:Perspective" xmi:id="_0RYVIOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugPerspective" selectedElement="_0RY8MOJyEeGXDvTwhqcV7A" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_persp.gif">
|
||||
<persistedState key="persp.hiddenItems" value="persp.hideToolbarSC:org.eclipse.debug.ui.commands.RunToLine,persp.hideToolbarSC:org.eclipse.jdt.ui.actions.OpenProjectWizard,persp.hideToolbarSC:org.eclipse.ui.edit.text.toggleShowSelectedElementOnly,"/>
|
||||
<tags>persp.actionSet:org.eclipse.mylyn.context.ui.actionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.mylyn.doc.actionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.cheatsheets.actionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.search.searchActionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.actionSet.keyBindings</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.actionSet.openFiles</tags>
|
||||
<tags>persp.actionSet:org.eclipse.wb.core.ui.actionset</tags>
|
||||
<tags>persp.actionSet:org.eclipse.debug.ui.launchActionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.debug.ui.debugActionSet</tags>
|
||||
<tags>persp.viewSC:org.eclipse.debug.ui.DebugView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.debug.ui.VariableView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.debug.ui.BreakpointView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.debug.ui.ExpressionView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.ui.views.ContentOutline</tags>
|
||||
<tags>persp.viewSC:org.eclipse.ui.console.ConsoleView</tags>
|
||||
<tags>persp.viewSC:org.eclipse.ui.views.TaskList</tags>
|
||||
<tags>persp.viewSC:org.eclipse.ant.ui.views.AntView</tags>
|
||||
<tags>persp.actionSet:org.eclipse.ui.NavigateActionSet</tags>
|
||||
<tags>persp.actionSet:org.eclipse.debug.ui.breakpointActionSet</tags>
|
||||
<tags>persp.viewSC:org.eclipse.pde.runtime.LogView</tags>
|
||||
<tags>persp.showIn:org.eclipse.egit.ui.RepositoriesView</tags>
|
||||
<tags>persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet</tags>
|
||||
<tags>persp.viewSC:org.eclipse.jdt.debug.ui.DisplayView</tags>
|
||||
<tags>persp.perspSC:org.eclipse.jdt.ui.JavaPerspective</tags>
|
||||
<tags>persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective</tags>
|
||||
<tags>persp.actionSet:org.eclipse.jdt.ui.JavaActionSet</tags>
|
||||
<tags>persp.showIn:org.eclipse.jdt.ui.PackageExplorer</tags>
|
||||
<tags>persp.perspSC:org.eclipse.wst.xml.ui.perspective</tags>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_0RY8MOJyEeGXDvTwhqcV7A" selectedElement="_0RY8MeJyEeGXDvTwhqcV7A">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_0RY8MeJyEeGXDvTwhqcV7A" containerData="8258" selectedElement="_0RZjR-JyEeGXDvTwhqcV7A">
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_0RY8MuJyEeGXDvTwhqcV7A" containerData="3761" selectedElement="_0RY8M-JyEeGXDvTwhqcV7A" horizontal="true">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_0RY8M-JyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.internal.ui.NavigatorFolderView" containerData="5000" selectedElement="_0RY8NOJyEeGXDvTwhqcV7A">
|
||||
<tags>newtablook</tags>
|
||||
<tags>org.eclipse.e4.primaryNavigationStack</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RY8NOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugView" ref="_0Q_TkOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RY8NeJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_9QDnQd4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjQOJyEeGXDvTwhqcV7A" elementId="org.eclipse.jdt.ui.PackageExplorer" toBeRendered="false" ref="_9P1k0N4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjQeJyEeGXDvTwhqcV7A" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_9QDnQN4HEeGVeZPPN-V-EA"/>
|
||||
</children>
|
||||
<children xsi:type="basic:PartStack" xmi:id="_0RZjQuJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.internal.ui.ToolsFolderView" containerData="5000" selectedElement="_0RZjQ-JyEeGXDvTwhqcV7A">
|
||||
<tags>newtablook</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjQ-JyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.VariableView" ref="_0Q_6oOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjROJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.BreakpointView" ref="_0RAhsOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjReJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.ExpressionView" toBeRendered="false" ref="_0RBIwOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RZjRuJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.RegisterView" toBeRendered="false" ref="_0RBv0OJyEeGXDvTwhqcV7A"/>
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="basic:PartSashContainer" xmi:id="_0RZjR-JyEeGXDvTwhqcV7A" containerData="6239" selectedElement="_0RaKUOJyEeGXDvTwhqcV7A" horizontal="true">
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKUOJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.editorss" containerData="7500" ref="_9PHzIN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="basic:PartStack" xmi:id="_0RaKUeJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.internal.ui.OutlineFolderView" containerData="2500" selectedElement="_0RaKUuJyEeGXDvTwhqcV7A">
|
||||
<tags>newtablook</tags>
|
||||
<tags>org.eclipse.e4.secondaryNavigationStack</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKUuJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.ContentOutline" ref="_9QGqk94HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKU-JyEeGXDvTwhqcV7A" elementId="org.eclipse.ant.ui.views.AntView" toBeRendered="false" ref="_9Qr5YN4HEeGVeZPPN-V-EA"/>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="basic:PartStack" xmi:id="_0RaKVOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.internal.ui.ConsoleFolderView" containerData="1742" selectedElement="_0RaKVeJyEeGXDvTwhqcV7A">
|
||||
<tags>newtablook</tags>
|
||||
<tags>org.eclipse.e4.secondaryDataStack</tags>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKVeJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.console.ConsoleView" ref="_9QGqkN4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKVuJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.TaskList" ref="_0Q9eYOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKV-JyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_9QGqkd4HEeGVeZPPN-V-EA"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaKWOJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.PropertySheet" toBeRendered="false" ref="_0Q-sgOJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaxYOJyEeGXDvTwhqcV7A" elementId="org.eclipse.jdt.debug.ui.DisplayView" toBeRendered="false" ref="_0RWf8OJyEeGXDvTwhqcV7A"/>
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_0RaxYeJyEeGXDvTwhqcV7A" elementId="org.eclipse.search.SearchResultView" toBeRendered="false" ref="_0RXuEOJyEeGXDvTwhqcV7A"/>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
<children xsi:type="basic:PartStack" xmi:id="_8xmJot4HEeGVeZPPN-V-EA" elementId="stickyFolderRight" toBeRendered="false" containerData="2500">
|
||||
<children xsi:type="advanced:Placeholder" xmi:id="_8xmJo94HEeGVeZPPN-V-EA" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_8xbKgN4HEeGVeZPPN-V-EA"/>
|
||||
@@ -137,19 +216,79 @@
|
||||
<tags>categoryTag:Help</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="advanced:Area" xmi:id="_9PHzIN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.editorss" selectedElement="_9PIaMN4HEeGVeZPPN-V-EA">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9PIaMN4HEeGVeZPPN-V-EA" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_iO7kQOBtEeGkBp1e8Q54Uw">
|
||||
<children xsi:type="basic:PartStack" xmi:id="_9PIaMN4HEeGVeZPPN-V-EA" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_sAA64OJ9EeGXDvTwhqcV7A">
|
||||
<tags>newtablook</tags>
|
||||
<tags>org.eclipse.e4.primaryDataStack</tags>
|
||||
<tags>EditorStack</tags>
|
||||
<children xsi:type="basic:Part" xmi:id="_iO7kQOBtEeGkBp1e8Q54Uw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="SlotCrafting.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-common/net/minecraft/src/SlotCrafting.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-common/net/minecraft/src/SlotCrafting.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="19" selectionOffset="3851" selectionTopPixel="1710"/>
</editor>"/>
|
||||
<children xsi:type="basic:Part" xmi:id="_T5MeIOJ4EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Minecraft.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-client/net/minecraft/client/Minecraft.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-client/net/minecraft/client/Minecraft.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="14305" selectionTopPixel="5160"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_qLTOQOJ4EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="RenderEngine.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-client/net/minecraft/src/RenderEngine.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-client/net/minecraft/src/RenderEngine.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="12133" selectionTopPixel="5640"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_I-wUYOJ5EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="TextureLoadEvent.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/forge-client/net/minecraftforge/client/event/TextureLoadEvent.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/forge-client/net/minecraftforge/client/event/TextureLoadEvent.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="327" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_ZT9BMOJ5EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="ForgeHooksClient.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/forge-client/net/minecraftforge/client/ForgeHooksClient.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/forge-client/net/minecraftforge/client/ForgeHooksClient.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="8299" selectionTopPixel="3150"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_bcfbAOJ5EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="EventBus.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/forge-common/net/minecraftforge/event/EventBus.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/forge-common/net/minecraftforge/event/EventBus.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="3372" selectionTopPixel="1020"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_meS7kOJ5EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Event.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/forge-common/net/minecraftforge/event/Event.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/forge-common/net/minecraftforge/event/Event.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="575" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_CFlAoOJ6EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="MinecraftServer.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-common/net/minecraft/server/MinecraftServer.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-common/net/minecraft/server/MinecraftServer.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="29" selectionOffset="13428" selectionTopPixel="4710"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_DOxdUOJ6EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="BlockLeaves.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-common/net/minecraft/src/BlockLeaves.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-common/net/minecraft/src/BlockLeaves.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="3682" selectionTopPixel="1170"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_Q9DLMOJ6EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="BlockLog.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/src-common/net/minecraft/src/BlockLog.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/src-common/net/minecraft/src/BlockLog.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="2038" selectionTopPixel="585"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_d4SyQOJ9EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="PlaySoundAtEntityEvent.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Client/forge-common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Client/forge-common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="0" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_kJ4sIOJ9EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="PlaySoundAtEntityEvent.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Server/forge-common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Server/forge-common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="76" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_lYKdIOJ9EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="FMLServerHandler.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Forge-Server/src-server/cpw/mods/fml/server/FMLServerHandler.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Forge-Server/src-server/cpw/mods/fml/server/FMLServerHandler.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="16" selectionOffset="2961" selectionTopPixel="1415"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_sAA64OJ9EeGXDvTwhqcV7A" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="FMLServerHandler.java" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/obj16/jcu_obj.gif" tooltip="Clean-Server/src/cpw/mods/fml/server/FMLServerHandler.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/Clean-Server/src/cpw/mods/fml/server/FMLServerHandler.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="16" selectionOffset="2961" selectionTopPixel="1415"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
</children>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9P1k0N4HEeGVeZPPN-V-EA" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/eview16/package.gif" tooltip="Workspace" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</view>"/>
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view group_libraries="1" layout="1" linkWithEditor="0" rootMode="1" workingSetName="">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</view>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Java</tags>
|
||||
<menus xmi:id="_9UjFsN4HEeGVeZPPN-V-EA" elementId="org.eclipse.jdt.ui.PackageExplorer">
|
||||
@@ -170,8 +309,8 @@
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QDnQ94HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide//icons/full/eview16/problems_view.gif" tooltip="17 errors, 0 warnings, 0 others" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view PRIMARY_SORT_FIELD="org.eclipse.ui.ide.severityAndDescriptionField" categoryGroup="org.eclipse.ui.ide.severity" markerContentGenerator="org.eclipse.ui.ide.problemsGenerator" partName="Problems">
<expanded>
<category IMemento.internal.id="Errors"/>
</expanded>
<columnWidths org.eclipse.ui.ide.locationField="90" org.eclipse.ui.ide.markerType="90" org.eclipse.ui.ide.pathField="120" org.eclipse.ui.ide.resourceField="90" org.eclipse.ui.ide.severityAndDescriptionField="442"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.severityAndDescriptionField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.resourceField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.pathField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.locationField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.markerType"/>
</view>"/>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QDnQ94HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide//icons/full/eview16/problems_view.gif" tooltip="1 error, 0 warnings, 0 others" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view PRIMARY_SORT_FIELD="org.eclipse.ui.ide.severityAndDescriptionField" categoryGroup="org.eclipse.ui.ide.severity" markerContentGenerator="org.eclipse.ui.ide.problemsGenerator" partName="Problems">
<expanded>
<category IMemento.internal.id="Warnings"/>
<category IMemento.internal.id="Errors"/>
</expanded>
<columnWidths org.eclipse.ui.ide.locationField="90" org.eclipse.ui.ide.markerType="90" org.eclipse.ui.ide.pathField="120" org.eclipse.ui.ide.resourceField="90" org.eclipse.ui.ide.severityAndDescriptionField="778"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.severityAndDescriptionField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.resourceField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.pathField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.locationField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.markerType"/>
</view>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
<menus xmi:id="_9xC0cN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.ProblemView">
|
||||
@@ -188,13 +327,25 @@
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Java</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QGDgN4HEeGVeZPPN-V-EA" elementId="org.eclipse.search.ui.views.SearchView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Search" iconURI="platform:/plugin/org.eclipse.search//icons/full/eview16/searchres.gif" closeable="true">
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QGDgN4HEeGVeZPPN-V-EA" elementId="org.eclipse.search.ui.views.SearchView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Search" iconURI="platform:/plugin/org.eclipse.search//icons/full/eview16/searchres.gif" tooltip="" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view isPinned="false">
<view IMemento.internal.id="org.eclipse.search.text.FileSearchResultPage" org.eclipse.search.lastActivation="2" org.eclipse.search.resultpage.layout="2" org.eclipse.search.resultpage.limit="1000" org.eclipse.search.resultpage.sorting="2"/>
<view IMemento.internal.id="org.eclipse.jdt.ui.JavaSearchResultPage" org.eclipse.jdt.search.resultpage.grouping="3" org.eclipse.jdt.search.resultpage.limit="1000" org.eclipse.jdt.search.resultpage.limit_enabled="TRUE" org.eclipse.jdt.search.resultpage.sorting="1" org.eclipse.search.lastActivation="3" org.eclipse.search.resultpage.layout="2"/>
<view IMemento.internal.id="" org.eclipse.search.lastActivation="0"/>
</view>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
<menus xmi:id="_7bk4IOIIEeGXDvTwhqcV7A" elementId="org.eclipse.search.ui.views.SearchView">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_7bk4IeIIEeGXDvTwhqcV7A" elementId="org.eclipse.search.ui.views.SearchView" visible="false"/>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QGqkN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console//icons/full/cview16/console_view.gif" closeable="true">
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QGqkN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console//icons/full/cview16/console_view.gif" tooltip="" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view/>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
<menus xmi:id="_0d68UOJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.console.ConsoleView">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_0d68UeJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.console.ConsoleView" visible="false"/>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_9QGqkd4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.views.BookmarkView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide//icons/full/eview16/bkmrk_nav.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
@@ -252,6 +403,68 @@
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:WindowBuilder</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0Q9eYOJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.TaskList" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide//icons/full/eview16/tasks_tsk.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0Q-sgOJyEeGXDvTwhqcV7A" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views//icons/full/eview16/prop_ps.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0Q_TkOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui//icons/full/eview16/debug_view.gif" tooltip="" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view/>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
<menus xmi:id="_0VLQAOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugView">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_0VL3EOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.DebugView" visible="false"/>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0Q_6oOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.VariableView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Variables" iconURI="platform:/plugin/org.eclipse.debug.ui//icons/full/eview16/variable_view.gif" tooltip="" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
<menus xmi:id="_0ZyDMOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.VariableView">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_0ZyDMeJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.VariableView" visible="false"/>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0RAhsOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.BreakpointView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Breakpoints" iconURI="platform:/plugin/org.eclipse.debug.ui//icons/full/eview16/breakpoint_view.gif" tooltip="" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
<menus xmi:id="_00ykMOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.BreakpointView">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_00zLQOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.BreakpointView" visible="false"/>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0RBIwOJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.ExpressionView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Expressions" iconURI="platform:/plugin/org.eclipse.debug.ui//icons/full/eview16/watchlist_view.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0RBv0OJyEeGXDvTwhqcV7A" elementId="org.eclipse.debug.ui.RegisterView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Registers" iconURI="platform:/plugin/org.eclipse.debug.ui//icons/full/eview16/register_view.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0RWf8OJyEeGXDvTwhqcV7A" elementId="org.eclipse.jdt.debug.ui.DisplayView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Display" iconURI="platform:/plugin/org.eclipse.jdt.debug.ui//icons/full/etool16/disp_sbook.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Debug</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_0RXuEOJyEeGXDvTwhqcV7A" elementId="org.eclipse.search.SearchResultView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Classic Search" iconURI="platform:/plugin/org.eclipse.search//icons/full/eview16/searchres.gif" closeable="true">
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_yn0ZgOJ2EeGXDvTwhqcV7A" elementId="org.eclipse.jdt.callhierarchy.view" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui//icons/full/eview16/call_hierarchy.gif" tooltip="Call Hierarchy" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view search_scope_type="1"/>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:Java</tags>
|
||||
<menus xmi:id="_yofu8OJ2EeGXDvTwhqcV7A" elementId="org.eclipse.jdt.callhierarchy.view">
|
||||
<tags>ViewMenu</tags>
|
||||
<tags>menuContribution:menu</tags>
|
||||
</menus>
|
||||
<toolbar xmi:id="_yogWAOJ2EeGXDvTwhqcV7A" elementId="org.eclipse.jdt.callhierarchy.view" visible="false"/>
|
||||
</sharedElements>
|
||||
<trimBars xmi:id="_8-eIAN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.main.toolbar"/>
|
||||
<trimBars xmi:id="_-N4hcN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.trim.status" side="Bottom">
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_-N5vkN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.StatusLine" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
|
||||
@@ -260,6 +473,19 @@
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_-OLcYN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.HeapStatus" toBeRendered="false" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim"/>
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_-OUmUN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.ProgressBar" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim"/>
|
||||
</trimBars>
|
||||
<trimBars xmi:id="_B1MqAOJ0EeGXDvTwhqcV7A" elementId="org.eclipse.ui.trim.vertical1" toBeRendered="false" side="Left">
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_B1XCEOJ0EeGXDvTwhqcV7A" elementId="left(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
|
||||
<tags>TrimStack</tags>
|
||||
</children>
|
||||
</trimBars>
|
||||
<trimBars xmi:id="_B3r9UOJ0EeGXDvTwhqcV7A" elementId="org.eclipse.ui.trim.vertical2" toBeRendered="false" side="Right">
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_B3tygOJ0EeGXDvTwhqcV7A" elementId="right(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
|
||||
<tags>TrimStack</tags>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_B4LskOJ0EeGXDvTwhqcV7A" elementId="bottom(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
|
||||
<tags>TrimStack</tags>
|
||||
</children>
|
||||
</trimBars>
|
||||
</children>
|
||||
<handlers xmi:id="_8CN7I94HEeGVeZPPN-V-EA" elementId="_UW9TY_r3Ed6gmo7caOxU9g" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.ExitHandler" command="_8CN7L94HEeGVeZPPN-V-EA"/>
|
||||
<handlers xmi:id="_8CN7JN4HEeGVeZPPN-V-EA" elementId="_BESTZfr3Ed6gmo7caOxU04" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.internal.workbench.swt.handlers.ShowViewHandler" command="_8CN7MN4HEeGVeZPPN-V-EA"/>
|
||||
@@ -662,6 +888,7 @@
|
||||
<bindingTables xmi:id="_9PbVIN4HEeGVeZPPN-V-EA" bindingContext="_9PauEt4HEeGVeZPPN-V-EA"/>
|
||||
<bindingTables xmi:id="_9PbVIt4HEeGVeZPPN-V-EA" bindingContext="_9PbVId4HEeGVeZPPN-V-EA"/>
|
||||
<bindingTables xmi:id="_9Pb8Md4HEeGVeZPPN-V-EA" bindingContext="_9Pb8MN4HEeGVeZPPN-V-EA"/>
|
||||
<bindingTables xmi:id="_0gRsweJyEeGXDvTwhqcV7A" bindingContext="_0gRswOJyEeGXDvTwhqcV7A"/>
|
||||
<rootContext xmi:id="_8CN7K94HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.contexts.dialogAndWindow" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="In Dialogs and Windows" description="Either a dialog or a window is open">
|
||||
<children xmi:id="_8CN7LN4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.contexts.window" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="In Windows" description="A window is open">
|
||||
<children xmi:id="_8CN7Ld4HEeGVeZPPN-V-EA" elementId="org.eclipse.e4.ui.contexts.views" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="%bindingcontext.name.bindingView"/>
|
||||
@@ -765,6 +992,7 @@
|
||||
<rootContext xmi:id="_9PauEt4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.actionSet.openFiles" name="Auto::org.eclipse.ui.actionSet.openFiles"/>
|
||||
<rootContext xmi:id="_9PbVId4HEeGVeZPPN-V-EA" elementId="org.eclipse.ui.edit.text.actionSet.presentation" name="Auto::org.eclipse.ui.edit.text.actionSet.presentation"/>
|
||||
<rootContext xmi:id="_9Pb8MN4HEeGVeZPPN-V-EA" elementId="org.eclipse.wb.core.ui.actionset" name="Auto::org.eclipse.wb.core.ui.actionset"/>
|
||||
<rootContext xmi:id="_0gRswOJyEeGXDvTwhqcV7A" elementId="org.eclipse.jdt.launching.localJavaApplication.internal.org.eclipse.debug.ui.DebugPerspective" name="Auto::org.eclipse.jdt.launching.localJavaApplication.internal.org.eclipse.debug.ui.DebugPerspective"/>
|
||||
<descriptors xmi:id="_8RUuIN4HEeGVeZPPN-V-EA" elementId="org.eclipse.e4.ui.compatibility.editor" allowMultiple="true" category="org.eclipse.e4.primaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor">
|
||||
<tags>Editor</tags>
|
||||
</descriptors>
|
||||
|
||||
Binary file not shown.
+14
-78
@@ -6,100 +6,36 @@ import subprocess, logging
|
||||
forge_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
mcp_dir = os.path.abspath('..')
|
||||
src_dir = os.path.join(mcp_dir, 'src')
|
||||
fml_dir = os.path.join(forge_dir, 'fml')
|
||||
|
||||
sys.path.append(mcp_dir)
|
||||
from runtime.decompile import decompile
|
||||
sys.path.append(fml_dir)
|
||||
from runtime.updatenames import updatenames
|
||||
from runtime.updatemd5 import updatemd5
|
||||
from runtime.cleanup import cleanup
|
||||
from runtime.updatemcp import updatemcp
|
||||
|
||||
from forge import apply_patches, copytree, reset_logger, download_ff, cleanup_source, pre_decompile, post_decompile
|
||||
from forge import apply_forge_patches
|
||||
from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp, reset_logger
|
||||
|
||||
def main():
|
||||
print '=================================== Minecraft Forge Setup Start ================================='
|
||||
|
||||
if os.path.isdir(os.path.join(mcp_dir, 'conf')):
|
||||
shutil.rmtree(os.path.join(mcp_dir, 'conf'))
|
||||
copytree(os.path.join(forge_dir, 'conf'), os.path.join(mcp_dir, 'conf'))
|
||||
|
||||
if os.path.isdir(src_dir):
|
||||
os.chdir(mcp_dir)
|
||||
cleanup(None, False)
|
||||
reset_logger()
|
||||
os.chdir(forge_dir)
|
||||
|
||||
if os.path.isdir(src_dir):
|
||||
print 'Please make sure to backup your modified files, and say yes when it asks you to do cleanup.'
|
||||
sys.exit(1)
|
||||
|
||||
if not download_ff(mcp_dir):
|
||||
sys.exit(1)
|
||||
|
||||
try:
|
||||
pre_decompile()
|
||||
|
||||
os.chdir(mcp_dir)
|
||||
# Conf JAD CSV -r -d -a -n -p -o -l -g
|
||||
decompile(None, False, False, True, True, False, True, False, False, False, False)
|
||||
reset_logger()
|
||||
os.chdir(forge_dir)
|
||||
|
||||
post_decompile()
|
||||
|
||||
except SystemExit, e:
|
||||
print 'Decompile Exception: %d ' % e.code
|
||||
raise e
|
||||
|
||||
if not os.path.isdir(src_dir):
|
||||
print 'Something went wrong, src folder not found at: %s' % src_dir
|
||||
sys.exit(1)
|
||||
|
||||
cleanup_source(src_dir)
|
||||
print '================ Forge ModLoader Setup Start ==================='
|
||||
setup_mcp(fml_dir, mcp_dir, True)
|
||||
setup_fml(fml_dir, mcp_dir)
|
||||
apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src'))
|
||||
finish_setup_fml(fml_dir, mcp_dir)
|
||||
print '================ Forge ModLoader Setup End ==================='
|
||||
|
||||
has_client = os.path.isdir(os.path.join(mcp_dir, 'src', 'minecraft'))
|
||||
has_server = os.path.isdir(os.path.join(mcp_dir, 'src', 'minecraft_server'))
|
||||
|
||||
fml_dir = os.path.join(forge_dir, 'fml')
|
||||
print 'Applying Forge ModLoader patches'
|
||||
if has_client:
|
||||
if os.path.isdir(os.path.join(fml_dir, 'patches', 'minecraft')):
|
||||
apply_patches(os.path.join(fml_dir, 'patches', 'minecraft'), src_dir)
|
||||
if os.path.isdir(os.path.join(fml_dir, 'src', 'minecraft')):
|
||||
copytree(os.path.join(fml_dir, 'src', 'minecraft'), os.path.join(src_dir, 'minecraft'))
|
||||
if has_server:
|
||||
if os.path.isdir(os.path.join(fml_dir, 'patches', 'minecraft_server')):
|
||||
apply_patches(os.path.join(fml_dir, 'patches', 'minecraft_server'), src_dir)
|
||||
if os.path.isdir(os.path.join(fml_dir, 'src', 'minecraft_server')):
|
||||
copytree(os.path.join(fml_dir, 'src', 'minecraft_server'), os.path.join(src_dir, 'minecraft_server'))
|
||||
|
||||
os.chdir(mcp_dir)
|
||||
updatenames(None, True)
|
||||
reset_logger()
|
||||
os.chdir(forge_dir)
|
||||
|
||||
print '=============================== Minecraft Forge Setup Start ====================================='
|
||||
print 'Applying forge patches'
|
||||
if has_client:
|
||||
if os.path.isdir(os.path.join(forge_dir, 'patches', 'minecraft')):
|
||||
apply_patches(os.path.join(forge_dir, 'patches', 'minecraft'), src_dir)
|
||||
if os.path.isdir(os.path.join(forge_dir, 'src', 'minecraft')):
|
||||
copytree(os.path.join(forge_dir, 'src', 'minecraft'), os.path.join(src_dir, 'minecraft'))
|
||||
if has_server:
|
||||
if os.path.isdir(os.path.join(forge_dir, 'patches', 'minecraft_server')):
|
||||
apply_patches(os.path.join(forge_dir, 'patches', 'minecraft_server'), src_dir)
|
||||
if os.path.isdir(os.path.join(forge_dir, 'src', 'minecraft_server')):
|
||||
copytree(os.path.join(forge_dir, 'src', 'minecraft_server'), os.path.join(src_dir, 'minecraft_server'))
|
||||
|
||||
apply_forge_patches(os.path.join(forge_dir, 'fml'), mcp_dir, forge_dir, src_dir, False)
|
||||
os.chdir(mcp_dir)
|
||||
updatemcp(None, True)
|
||||
reset_logger()
|
||||
updatenames(None, True)
|
||||
reset_logger()
|
||||
updatemd5(None, True)
|
||||
reset_logger()
|
||||
os.chdir(forge_dir)
|
||||
|
||||
print '=================================== Minecraft Forge Setup Finished ================================='
|
||||
os.chdir(forge_dir)
|
||||
print '=============================== Minecraft Forge Setup Finished ================================='
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -22,7 +22,6 @@
|
||||
{
|
||||
StatList.initStats();
|
||||
}
|
||||
-}
|
||||
+
|
||||
+ /* =========================================================== FORGE START ===============================================================*/
|
||||
+ public boolean isDefaultTexture = true;
|
||||
@@ -204,4 +203,4 @@
|
||||
+ {
|
||||
+ return new ItemStack(getContainerItem());
|
||||
+ }
|
||||
+}
|
||||
}
|
||||
@@ -4,11 +4,11 @@
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
+import net.minecraftforge.client.event.sound.PlaySoundAtEntityEvent;
|
||||
+import net.minecraftforge.common.MinecraftForge;
|
||||
+import net.minecraftforge.common.Orientation;
|
||||
+import net.minecraftforge.event.entity.EntityEvent;
|
||||
+import net.minecraftforge.event.world.WorldEvent;
|
||||
+import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
|
||||
+
|
||||
public abstract class World implements IBlockAccess
|
||||
{
|
||||
|
||||
+16
-20
@@ -9,8 +9,7 @@ src_dir = os.path.join(mcp_dir, 'src')
|
||||
sys.path.append(mcp_dir)
|
||||
from runtime.reobfuscate import reobfuscate
|
||||
|
||||
from forge import reset_logger, load_version, zip_folder, zip_create, inject_version
|
||||
from build import build
|
||||
from forge import reset_logger, load_version, zip_folder, zip_create, inject_version, build_forge_dev
|
||||
|
||||
reobf_dir = os.path.join(mcp_dir, 'reobf')
|
||||
client_dir = os.path.join(reobf_dir, 'minecraft')
|
||||
@@ -29,7 +28,8 @@ def main():
|
||||
except:
|
||||
pass
|
||||
ret = 0
|
||||
ret = build(build_num)
|
||||
fml_dir = os.path.join(forge_dir, 'fml')
|
||||
build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num)
|
||||
if ret != 0:
|
||||
sys.exit(ret)
|
||||
|
||||
@@ -55,42 +55,40 @@ def main():
|
||||
|
||||
os.makedirs(out_folder)
|
||||
|
||||
update_info('forge_common/mod_MinecraftForge.info', version_str)
|
||||
|
||||
zip_start('minecraftforge-client-%s.zip' % version_str)
|
||||
zip_folder(client_dir, '', zip)
|
||||
zip_add('forge_common/mod_MinecraftForge.info', 'mod_MinecraftForge.info')
|
||||
zip_add('forge_client/src/forge_logo.png')
|
||||
zip_add('install/MinecraftForge-Credits.txt')
|
||||
zip_add('install/MinecraftForge-License.txt')
|
||||
zip_add('fml/CREDITS-fml.txt')
|
||||
zip_add('fml/LICENSE-fml.txt')
|
||||
zip_add('fml/README-fml.txt')
|
||||
zip_add('fml/src/minecraft/fmlversion.properties')
|
||||
zip_add('fml/common/fml_at.cfg')
|
||||
zip_add('fml/common/fml_marker.cfg')
|
||||
zip_add('fml/common/fmlversion.properties')
|
||||
zip_add('install/Paulscode IBXM Library License.txt')
|
||||
zip_add('install/Paulscode SoundSystem CodecIBXM License.txt')
|
||||
zip_end()
|
||||
|
||||
zip_start('minecraftforge-server-%s.zip' % version_str)
|
||||
zip_folder(server_dir, '', zip)
|
||||
zip_add('forge_common/mod_MinecraftForge.info', 'mod_MinecraftForge.info')
|
||||
zip_add('install/MinecraftForge-Credits.txt')
|
||||
zip_add('install/MinecraftForge-License.txt')
|
||||
zip_add('fml/CREDITS-fml.txt')
|
||||
zip_add('fml/LICENSE-fml.txt')
|
||||
zip_add('fml/README-fml.txt')
|
||||
zip_add('fml/src/minecraft_server/fmlversion.properties')
|
||||
zip_add('fml/common/fml_at.cfg')
|
||||
zip_add('fml/common/fml_marker.cfg')
|
||||
zip_add('fml/common/fmlversion.properties')
|
||||
zip_end()
|
||||
|
||||
inject_version(os.path.join(forge_dir, 'forge_common', 'net', 'minecraft', 'src', 'forge', 'ForgeHooks.java'), build_num)
|
||||
inject_version(os.path.join(forge_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), build_num)
|
||||
zip_start('minecraftforge-src-%s.zip' % version_str, 'forge')
|
||||
zip_add('forge_client/src', 'src/minecraft')
|
||||
zip_add('forge_server/src', 'src/minecraft_server')
|
||||
zip_add('forge_common', 'src/minecraft')
|
||||
zip_add('forge_common', 'src/minecraft_server')
|
||||
zip_add('patches', 'patches')
|
||||
zip_add('fml', 'fml')
|
||||
zip_add('conf', 'conf')
|
||||
zip_add('client', 'client')
|
||||
zip_add('common', 'common')
|
||||
zip_add('server', 'server')
|
||||
zip_add('patches', 'patches')
|
||||
zip_add('fml', 'fml')
|
||||
zip_add('install/install.cmd')
|
||||
zip_add('install/install.sh')
|
||||
zip_add('install/README-MinecraftForge.txt')
|
||||
@@ -101,9 +99,7 @@ def main():
|
||||
zip_add('install/Paulscode IBXM Library License.txt')
|
||||
zip_add('install/Paulscode SoundSystem CodecIBXM License.txt')
|
||||
zip_end()
|
||||
inject_version(os.path.join(forge_dir, 'forge_common', 'net', 'minecraft', 'src', 'forge', 'ForgeHooks.java'), 0)
|
||||
|
||||
shutil.move(os.path.join(forge_dir, 'file.backup'), os.path.join(forge_dir, 'forge_common/mod_MinecraftForge.info'.replace('/', os.sep)))
|
||||
inject_version(os.path.join(forge_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), 0)
|
||||
|
||||
print '=================================== Release Finished %d =================================' % error_level
|
||||
sys.exit(error_level)
|
||||
|
||||
Reference in new issue
Block a user