diff --git a/resources/sound/gun0.ogg b/resources/sound/gun0.ogg index 58218af..2724434 100644 Binary files a/resources/sound/gun0.ogg and b/resources/sound/gun0.ogg differ diff --git a/resources/sound/gun1.ogg b/resources/sound/gun1.ogg index 679e2c6..bf9796e 100644 Binary files a/resources/sound/gun1.ogg and b/resources/sound/gun1.ogg differ diff --git a/resources/sound/gun2.ogg b/resources/sound/gun2.ogg index 1ec23b7..7c67efe 100644 Binary files a/resources/sound/gun2.ogg and b/resources/sound/gun2.ogg differ diff --git a/resources/sound/gun3.ogg b/resources/sound/gun3.ogg index 27f4628..99cc690 100644 Binary files a/resources/sound/gun3.ogg and b/resources/sound/gun3.ogg differ diff --git a/resources/sound/gun4.ogg b/resources/sound/gun4.ogg index 50a98da..66e2082 100644 Binary files a/resources/sound/gun4.ogg and b/resources/sound/gun4.ogg differ diff --git a/resources/sound/gun5.ogg b/resources/sound/gun5.ogg index b551cf4..18acd20 100644 Binary files a/resources/sound/gun5.ogg and b/resources/sound/gun5.ogg differ diff --git a/resources/sound/gun6.ogg b/resources/sound/gun6.ogg index 28917dd..334089a 100644 Binary files a/resources/sound/gun6.ogg and b/resources/sound/gun6.ogg differ diff --git a/resources/sound/gun7.ogg b/resources/sound/gun7.ogg index bfb7d0e..4ad608b 100644 Binary files a/resources/sound/gun7.ogg and b/resources/sound/gun7.ogg differ diff --git a/resources/sound/gun8.ogg b/resources/sound/gun8.ogg index 1001b3d..d88168a 100644 Binary files a/resources/sound/gun8.ogg and b/resources/sound/gun8.ogg differ diff --git a/resources/sound/gun9.ogg b/resources/sound/gun9.ogg index 0b2004c..a850e17 100644 Binary files a/resources/sound/gun9.ogg and b/resources/sound/gun9.ogg differ diff --git a/src/shootergame/display/DisplayRender.java b/src/shootergame/display/DisplayRender.java index d66f44c..7c38cae 100644 --- a/src/shootergame/display/DisplayRender.java +++ b/src/shootergame/display/DisplayRender.java @@ -1,6 +1,15 @@ package shootergame.display; -import static org.lwjgl.opengl.GL33.*; +import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; +import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; +import static org.lwjgl.opengl.GL11.GL_MODELVIEW; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glClear; +import static org.lwjgl.opengl.GL11.glLoadMatrixf; +import static org.lwjgl.opengl.GL11.glMatrixMode; +import static org.lwjgl.opengl.GL11.glViewport; import org.joml.Matrix4f; import org.lwjgl.opengl.GL; diff --git a/src/shootergame/entity/particle/ParticleBlood.java b/src/shootergame/entity/particle/ParticleBlood.java index 67762f7..b56a6ca 100644 --- a/src/shootergame/entity/particle/ParticleBlood.java +++ b/src/shootergame/entity/particle/ParticleBlood.java @@ -2,7 +2,6 @@ package shootergame.entity.particle; import java.util.Random; -import shootergame.Main; import shootergame.display.Camera; import shootergame.entity.EntityParticle; import shootergame.util.gl.GlHelpers; diff --git a/src/shootergame/resources/Resource.java b/src/shootergame/resources/Resource.java index baccea3..7823209 100644 --- a/src/shootergame/resources/Resource.java +++ b/src/shootergame/resources/Resource.java @@ -56,7 +56,7 @@ public class Resource }*/ private String fileURL(String path) { - return "https://www.onewaycoding.ml/files/game_resources/ShooterGame/"+path; + return "https://www.onewaycoding.com/files/game_resources/ShooterGame/"+path; } private String filePath(String path) { diff --git a/src/shootergame/util/gl/GlHelpers.java b/src/shootergame/util/gl/GlHelpers.java index 0116ab5..c48f2a0 100644 --- a/src/shootergame/util/gl/GlHelpers.java +++ b/src/shootergame/util/gl/GlHelpers.java @@ -1,6 +1,23 @@ package shootergame.util.gl; -import static org.lwjgl.opengl.GL33.*; +import static org.lwjgl.opengl.GL11.GL_ALPHA; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_CULL_FACE; +import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST; +import static org.lwjgl.opengl.GL11.GL_QUADS; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; +import static org.lwjgl.opengl.GL11.glBegin; +import static org.lwjgl.opengl.GL11.glColor3d; +import static org.lwjgl.opengl.GL11.glColor4d; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.glEnd; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glRotated; +import static org.lwjgl.opengl.GL11.glTranslated; +import static org.lwjgl.opengl.GL11.glVertex2d; +import static org.lwjgl.opengl.GL11.glVertex3d; import shootergame.Main;