Added Basic Class-Level SAS Capability to checkSAS, added Vector4f to SAS (#7385)
This commit is contained in:
parent
f5b53d5d10
commit
5648336893
|
@ -1062,5 +1062,3 @@ task setup() {
|
||||||
dependsOn ':clean:extractMapped'
|
dependsOn ':clean:extractMapped'
|
||||||
dependsOn ':forge:extractMapped' //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
dependsOn ':forge:extractMapped' //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,31 +21,44 @@ public class CheckSAS extends DefaultTask {
|
||||||
sass.each { f ->
|
sass.each { f ->
|
||||||
def lines = []
|
def lines = []
|
||||||
f.eachLine { line ->
|
f.eachLine { line ->
|
||||||
if (line[0] == '\t') return //Skip any tabed lines, those are ones we add
|
if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
|
||||||
def idx = line.indexOf('#')
|
def idx = line.indexOf('#')
|
||||||
if (idx == 0 || line.isEmpty()) {
|
if (idx == 0 || line.isEmpty()) {
|
||||||
lines.add(line)
|
lines.add(line)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
def comment = idx == -1 ? null : line.substring(idx)
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
if (idx != -1) line = line.substring(0, idx - 1)
|
||||||
|
|
||||||
def (cls, desc) = (line.trim() + ' ').split(' ', -1)
|
def (cls, desc) = (line.trim() + ' ').split(' ', -1)
|
||||||
cls = cls.replaceAll('\\.', '/')
|
cls = cls.replaceAll('\\.', '/')
|
||||||
desc = desc.replace('(', ' (')
|
desc = desc.replace('(', ' (')
|
||||||
if (desc.isEmpty() || json[cls] == null || json[cls]['methods'] == null || json[cls]['methods'][desc] == null) {
|
|
||||||
|
if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
|
||||||
println('Invalid: ' + line)
|
println('Invalid: ' + line)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
def mtd = json[cls]['methods'][desc]
|
//Class SAS
|
||||||
|
if (desc.isEmpty()) {
|
||||||
|
lines.add(cls + (comment == null ? '' : ' ' + comment))
|
||||||
|
if (json[cls]['methods'] != null)
|
||||||
|
(json[cls]['methods'] as TreeMap).each {
|
||||||
|
findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//Method SAS
|
||||||
lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
|
lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
|
||||||
def children = json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
|
findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
|
||||||
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
|
||||||
children.each { lines.add('\t' + it) }
|
|
||||||
}
|
}
|
||||||
f.text = lines.join('\n')
|
f.text = lines.join('\n')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static findChildMethods(json, cls, desc)
|
||||||
|
{
|
||||||
|
return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
|
||||||
|
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/net/minecraft/util/math/vector/Vector4f.java
|
--- a/net/minecraft/util/math/vector/Vector4f.java
|
||||||
+++ b/net/minecraft/util/math/vector/Vector4f.java
|
+++ b/net/minecraft/util/math/vector/Vector4f.java
|
||||||
@@ -128,4 +128,16 @@
|
@@ -125,4 +125,16 @@
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "[" + this.field_229368_a_ + ", " + this.field_229369_b_ + ", " + this.field_229370_c_ + ", " + this.field_229371_d_ + "]";
|
return "[" + this.field_229368_a_ + ", " + this.field_229369_b_ + ", " + this.field_229370_c_ + ", " + this.field_229371_d_ + "]";
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,6 +92,7 @@ net/minecraft/util/Direction$Axis func_176717_a(Ljava/lang/String;)Lnet/minecraf
|
||||||
net/minecraft/util/math/vector/Vector3d func_216371_e()Lnet/minecraft/util/math/vector/Vector3d;
|
net/minecraft/util/math/vector/Vector3d func_216371_e()Lnet/minecraft/util/math/vector/Vector3d;
|
||||||
net/minecraft/util/math/vector/Vector3d func_189984_a(Lnet/minecraft/util/math/vector/Vector2f;)Lnet/minecraft/util/math/vector/Vector3d; # fromPitchYaw
|
net/minecraft/util/math/vector/Vector3d func_189984_a(Lnet/minecraft/util/math/vector/Vector2f;)Lnet/minecraft/util/math/vector/Vector3d; # fromPitchYaw
|
||||||
net/minecraft/util/math/vector/Vector3d func_189986_a(FF)Lnet/minecraft/util/math/vector/Vector3d; # fromPitchYaw
|
net/minecraft/util/math/vector/Vector3d func_189986_a(FF)Lnet/minecraft/util/math/vector/Vector3d; # fromPitchYaw
|
||||||
|
net/minecraft/util/math/vector/Vector4f # Vector 4f Class
|
||||||
net/minecraft/util/text/Style func_240719_a_(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/util/text/Style; #setFontId
|
net/minecraft/util/text/Style func_240719_a_(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/util/text/Style; #setFontId
|
||||||
net/minecraft/util/text/Style func_240723_c_(Lnet/minecraft/util/text/TextFormatting;)Lnet/minecraft/util/text/Style; #forceFormatting
|
net/minecraft/util/text/Style func_240723_c_(Lnet/minecraft/util/text/TextFormatting;)Lnet/minecraft/util/text/Style; #forceFormatting
|
||||||
# BiomeAmbiance getters, needed for it to be useful during BiomeLoadingEvent to be useful
|
# BiomeAmbiance getters, needed for it to be useful during BiomeLoadingEvent to be useful
|
||||||
|
|
Loading…
Reference in New Issue