Compare commits

...
2 Commits
Author SHA1 Message Date
mezz 4e1e8f52e0 Fix log4j configuration 2017-06-07 20:49:14 -07:00
diesieben07 f10f7502c8 Make ASMDataTable more useful: (#2911)
- EnumHolder now has getters for it's data
- enum arrays work now
- nested annotations work now outside of being in arrays
2016-06-22 22:40:27 -04:00
3 changed files with 15 additions and 9 deletions

No files matched your search

@@ -27,8 +27,8 @@ public class ModAnnotation
{
public class EnumHolder
{
private String desc;
private String value;
private final String desc;
private final String value;
public EnumHolder(String desc, String value)
{
@@ -36,6 +36,15 @@ public class ModAnnotation
this.value = value;
}
public String getDesc()
{
return desc;
}
public String getValue()
{
return value;
}
}
AnnotationType type;
Type asmType;
@@ -100,7 +109,7 @@ public class ModAnnotation
public void addEnumProperty(String key, String enumName, String value)
{
values.put(key, new EnumHolder(enumName, value));
addProperty(key, new EnumHolder(enumName, value));
}
public void endArray()
@@ -111,10 +120,7 @@ public class ModAnnotation
public ModAnnotation addChildAnnotation(String name, String desc)
{
ModAnnotation child = new ModAnnotation(AnnotationType.SUBTYPE, Type.getType(desc), this);
if (arrayList != null)
{
arrayList.add(child.getValues());
}
addProperty(name, child.getValues());
return child;
}
}
+1 -1
View File
@@ -7,7 +7,7 @@
<Console name="SysOut" target="SYSTEM_OUT">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
</Console>
<Queue name="ServerGuiConsole">
<Queue name="ServerGuiConsole" ignoreExceptions="true">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
</Queue>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+1 -1
View File
@@ -9,7 +9,7 @@
</TerminalConsole>
<!-- Keep a console appender open so log4j2 doesn't close our main out stream if we redirect System.out to the logger -->
<Console name="SysOut" target="SYSTEM_OUT"/>
<Queue name="ServerGuiConsole">
<Queue name="ServerGuiConsole" ignoreExceptions="true">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %replace{%msg}{(?i)\u00A7[0-9A-FK-OR]}{}%n" />
</Queue>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">