diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56..abbdf94 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -3,4 +3,7 @@ + + \ No newline at end of file diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java index cf15626..139c158 100644 --- a/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -133,6 +133,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { if(!un.equals(un.replaceAll("[^A-Za-z0-9\\-_]", "_").trim())) { System.err.println("Potentially invalid unicode username detected"); // this.disconnect("Go fuck yourself"); + this.disconnect("Security flaw"); // return; } if (BungeeCord.getInstance().tokenVerify.isEmpty()) { diff --git a/lwjgl-rundir/resources/mesh/charles.fallback.png b/lwjgl-rundir/resources/mesh/charles.fallback.png new file mode 100755 index 0000000..7612829 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/charles.fallback.png differ diff --git a/lwjgl-rundir/resources/mesh/charles.png b/lwjgl-rundir/resources/mesh/charles.png new file mode 100755 index 0000000..a23587f Binary files /dev/null and b/lwjgl-rundir/resources/mesh/charles.png differ diff --git a/lwjgl-rundir/resources/mesh/charles0.mdl b/lwjgl-rundir/resources/mesh/charles0.mdl new file mode 100755 index 0000000..76eeab5 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/charles0.mdl differ diff --git a/lwjgl-rundir/resources/mesh/charles1.mdl b/lwjgl-rundir/resources/mesh/charles1.mdl new file mode 100755 index 0000000..dee601d Binary files /dev/null and b/lwjgl-rundir/resources/mesh/charles1.mdl differ diff --git a/lwjgl-rundir/resources/mesh/charles2.mdl b/lwjgl-rundir/resources/mesh/charles2.mdl new file mode 100755 index 0000000..654e956 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/charles2.mdl differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude.fallback.png b/lwjgl-rundir/resources/mesh/laxativedude.fallback.png new file mode 100755 index 0000000..ea207e7 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude.fallback.png differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude.png b/lwjgl-rundir/resources/mesh/laxativedude.png new file mode 100755 index 0000000..ece3e4a Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude.png differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude0.mdl b/lwjgl-rundir/resources/mesh/laxativedude0.mdl new file mode 100755 index 0000000..a92a57f Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude0.mdl differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude1.mdl b/lwjgl-rundir/resources/mesh/laxativedude1.mdl new file mode 100755 index 0000000..f4297b4 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude1.mdl differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude2.mdl b/lwjgl-rundir/resources/mesh/laxativedude2.mdl new file mode 100755 index 0000000..f8d96c4 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude2.mdl differ diff --git a/lwjgl-rundir/resources/mesh/laxativedude3.mdl b/lwjgl-rundir/resources/mesh/laxativedude3.mdl new file mode 100755 index 0000000..d9d0d69 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/laxativedude3.mdl differ diff --git a/lwjgl-rundir/resources/mesh/longarms.fallback.png b/lwjgl-rundir/resources/mesh/longarms.fallback.png new file mode 100755 index 0000000..2665058 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/longarms.fallback.png differ diff --git a/lwjgl-rundir/resources/mesh/longarms.png b/lwjgl-rundir/resources/mesh/longarms.png new file mode 100755 index 0000000..c021684 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/longarms.png differ diff --git a/lwjgl-rundir/resources/mesh/longarms0.mdl b/lwjgl-rundir/resources/mesh/longarms0.mdl new file mode 100755 index 0000000..892380a Binary files /dev/null and b/lwjgl-rundir/resources/mesh/longarms0.mdl differ diff --git a/lwjgl-rundir/resources/mesh/longarms1.mdl b/lwjgl-rundir/resources/mesh/longarms1.mdl new file mode 100755 index 0000000..ba09452 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/longarms1.mdl differ diff --git a/lwjgl-rundir/resources/mesh/longarms2.mdl b/lwjgl-rundir/resources/mesh/longarms2.mdl new file mode 100755 index 0000000..b38255c Binary files /dev/null and b/lwjgl-rundir/resources/mesh/longarms2.mdl differ diff --git a/lwjgl-rundir/resources/mesh/weirdclimber.fallback.png b/lwjgl-rundir/resources/mesh/weirdclimber.fallback.png new file mode 100755 index 0000000..0e900fa Binary files /dev/null and b/lwjgl-rundir/resources/mesh/weirdclimber.fallback.png differ diff --git a/lwjgl-rundir/resources/mesh/weirdclimber.png b/lwjgl-rundir/resources/mesh/weirdclimber.png new file mode 100755 index 0000000..792cac5 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/weirdclimber.png differ diff --git a/lwjgl-rundir/resources/mesh/weirdclimber0.mdl b/lwjgl-rundir/resources/mesh/weirdclimber0.mdl new file mode 100755 index 0000000..47e5708 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/weirdclimber0.mdl differ diff --git a/lwjgl-rundir/resources/mesh/weirdclimber1.mdl b/lwjgl-rundir/resources/mesh/weirdclimber1.mdl new file mode 100755 index 0000000..83f1bb1 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/weirdclimber1.mdl differ diff --git a/lwjgl-rundir/resources/mesh/weirdclimber2.mdl b/lwjgl-rundir/resources/mesh/weirdclimber2.mdl new file mode 100755 index 0000000..88eba4b Binary files /dev/null and b/lwjgl-rundir/resources/mesh/weirdclimber2.mdl differ diff --git a/lwjgl-rundir/resources/mesh/winston.fallback.png b/lwjgl-rundir/resources/mesh/winston.fallback.png new file mode 100755 index 0000000..ca098a6 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/winston.fallback.png differ diff --git a/lwjgl-rundir/resources/mesh/winston.png b/lwjgl-rundir/resources/mesh/winston.png new file mode 100755 index 0000000..fceadbb Binary files /dev/null and b/lwjgl-rundir/resources/mesh/winston.png differ diff --git a/lwjgl-rundir/resources/mesh/winston0.mdl b/lwjgl-rundir/resources/mesh/winston0.mdl new file mode 100755 index 0000000..1d1faec Binary files /dev/null and b/lwjgl-rundir/resources/mesh/winston0.mdl differ diff --git a/lwjgl-rundir/resources/mesh/winston1.mdl b/lwjgl-rundir/resources/mesh/winston1.mdl new file mode 100755 index 0000000..6a38572 Binary files /dev/null and b/lwjgl-rundir/resources/mesh/winston1.mdl differ diff --git a/src/main/java/net/lax1dude/eaglercraft/HighPolySkin.java b/src/main/java/net/lax1dude/eaglercraft/HighPolySkin.java new file mode 100644 index 0000000..ec65721 --- /dev/null +++ b/src/main/java/net/lax1dude/eaglercraft/HighPolySkin.java @@ -0,0 +1,96 @@ +package net.lax1dude.eaglercraft; + +public enum HighPolySkin { + + LONG_ARMS( + new TextureLocation("/mesh/longarms.png"), + new ModelLocation("/mesh/longarms0.mdl"), + null, + new ModelLocation("/mesh/longarms2.mdl"), + new ModelLocation[] { + new ModelLocation("/mesh/longarms1.mdl") + }, + new float[] { + 1.325f + }, + 0.0f, + new TextureLocation("/mesh/longarms.fallback.png") + ), + + WEIRD_CLIMBER_DUDE( + new TextureLocation("/mesh/weirdclimber.png"), + new ModelLocation("/mesh/weirdclimber0.mdl"), + null, + new ModelLocation("/mesh/weirdclimber2.mdl"), + new ModelLocation[] { + new ModelLocation("/mesh/weirdclimber1.mdl") + }, + new float[] { + 2.62f + }, + -90.0f, + new TextureLocation("/mesh/weirdclimber.fallback.png") + ), + + LAXATIVE_DUDE( + new TextureLocation("/mesh/laxativedude.png"), + new ModelLocation("/mesh/laxativedude0.mdl"), + null, + new ModelLocation("/mesh/laxativedude3.mdl"), + new ModelLocation[] { + new ModelLocation("/mesh/laxativedude1.mdl"), + new ModelLocation("/mesh/laxativedude2.mdl") + }, + new float[] { + 2.04f + }, + 0.0f, + new TextureLocation("/mesh/laxativedude.fallback.png") + ), + + BABY_CHARLES( + new TextureLocation("/mesh/charles.png"), + new ModelLocation("/mesh/charles0.mdl"), + new ModelLocation("/mesh/charles1.mdl"), + new ModelLocation("/mesh/charles2.mdl"), + new ModelLocation[] {}, + new float[] {}, + 0.0f, + new TextureLocation("/mesh/charles.fallback.png") + ), + + BABY_WINSTON( + new TextureLocation("/mesh/winston.png"), + new ModelLocation("/mesh/winston0.mdl"), + null, + new ModelLocation("/mesh/winston1.mdl"), + new ModelLocation[] {}, + new float[] {}, + 0.0f, + new TextureLocation("/mesh/winston.fallback.png") + ); + + public static float highPolyScale = 0.5f; + + public final TextureLocation texture; + public final ModelLocation bodyModel; + public final ModelLocation headModel; + public final ModelLocation eyesModel; + public final ModelLocation[] limbsModel; + public final float[] limbsOffset; + public final float limbsInitialRotation; + public final TextureLocation fallbackTexture; + + HighPolySkin(TextureLocation texture, ModelLocation bodyModel, ModelLocation headModel, ModelLocation eyesModel, + ModelLocation[] limbsModel, float[] limbsOffset, float limbsInitialRotation, TextureLocation fallbackTexture) { + this.texture = texture; + this.bodyModel = bodyModel; + this.headModel = headModel; + this.eyesModel = eyesModel; + this.limbsModel = limbsModel; + this.limbsOffset = limbsOffset; + this.limbsInitialRotation = limbsInitialRotation; + this.fallbackTexture = fallbackTexture; + } + +} \ No newline at end of file