[Refactor] Fixed package name (com.github.halotroop)

pull/4/head
Caroline Bell 2020-02-23 22:13:57 -08:00
parent 96c6c507cb
commit 7cf3b8a219
38 changed files with 71 additions and 175 deletions

View File

@ -1,7 +1,7 @@
package io.github.halotroop.litecraft.types.block;
package com.github.halotroop.litecraft.types.block;
import io.github.hydos.ginger.engine.obj.ModelLoader;
import io.github.hydos.ginger.engine.render.models.TexturedModel;
import com.github.hydos.ginger.engine.obj.ModelLoader;
import com.github.hydos.ginger.engine.render.models.TexturedModel;
public class Block
{

View File

@ -0,0 +1,12 @@
package com.github.halotroop.litecraft.types.block;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.math.vectors.Vector3f;
public class BlockEntity extends RenderObject
{
public BlockEntity(Block block, Vector3f position)
{
super(block.model, position, 0, 0, 0, new Vector3f(1f,1f,1f));
}
}

View File

@ -1,10 +1,11 @@
package io.github.halotroop.litecraft.world;
package com.github.halotroop.litecraft.world;
import java.util.ArrayList;
import java.util.List;
import io.github.halotroop.litecraft.types.block.Block;
import io.github.halotroop.litecraft.types.block.BlockEntity;
import com.github.halotroop.litecraft.types.block.*;
import com.github.hydos.ginger.engine.math.vectors.Vector3f;
import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@ -45,7 +46,7 @@ public class Chunk
if (render && !this.render) // if it has been changed to true
{
this.blocks.forEach((coord, block) -> {
if (block.visible) this.blockEntities.add(new BlockEntity(block, new))
if (block.visible) this.blockEntities.add(new BlockEntity(block, new Vector3f(0,0,0)));
});
}
else if (this.render) // else if it has been changed to false

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.cameras;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWScrollCallback;
import org.lwjgl.glfw.*;
import com.github.hydos.ginger.engine.elements.objects.Player;
import com.github.hydos.ginger.engine.io.Window;

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.font;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
/**
* Represents a line of text during the loading of a text.

View File

@ -1,10 +1,7 @@
package com.github.hydos.ginger.engine.font;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
import java.io.*;
import java.util.*;
import com.github.hydos.ginger.engine.io.Window;

View File

@ -1,9 +1,6 @@
package com.github.hydos.ginger.engine.font;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import com.github.hydos.ginger.engine.render.renderers.FontRenderer;
import com.github.hydos.ginger.engine.utils.Loader;

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.font;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
public class TextMeshCreator {

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.font;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
/**
* During the loading of a text this represents one word in the text.

View File

@ -1,16 +1,11 @@
package com.github.hydos.ginger.engine.io;
import java.nio.DoubleBuffer;
import java.nio.IntBuffer;
import java.nio.*;
import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWImage;
import org.lwjgl.glfw.GLFWVidMode;
import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLCapabilities;
import org.lwjgl.glfw.*;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.math.vectors.*;
import com.github.hydos.ginger.engine.render.texture.Image;

View File

@ -1,15 +1,10 @@
package com.github.hydos.ginger.engine.obj;
import org.lwjgl.assimp.AIFace;
import org.lwjgl.assimp.AIMesh;
import org.lwjgl.assimp.AIScene;
import org.lwjgl.assimp.AIVector3D;
import org.lwjgl.assimp.*;
import org.lwjgl.assimp.AIVector3D.Buffer;
import com.github.hydos.ginger.engine.math.vectors.*;
import org.lwjgl.assimp.Assimp;
public class OBJFileLoader {

View File

@ -1,10 +1,7 @@
package com.github.hydos.ginger.engine.obj.normals;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.io.*;
import java.util.*;
import com.github.hydos.ginger.engine.math.vectors.*;
import com.github.hydos.ginger.engine.render.models.RawModel;

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.obj.normals;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
import com.github.hydos.ginger.engine.math.vectors.Vector3f;

View File

@ -1,10 +1,6 @@
package com.github.hydos.ginger.engine.particle;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import com.github.hydos.ginger.engine.cameras.Camera;

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.postprocessing;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.*;
public class ContrastChanger {

View File

@ -7,9 +7,7 @@ import static org.lwjgl.opengl.GL11.*;
import java.nio.ByteBuffer;
import org.lwjgl.glfw.GLFWErrorCallback;
import org.lwjgl.glfw.GLFWFramebufferSizeCallback;
import org.lwjgl.glfw.GLFWKeyCallback;
import org.lwjgl.glfw.*;
import org.lwjgl.system.Callback;
import com.github.hydos.ginger.engine.io.Window;

View File

@ -1,8 +1,6 @@
package com.github.hydos.ginger.engine.postprocessing;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.render.models.RawModel;
import com.github.hydos.ginger.engine.utils.Loader;

View File

@ -1,13 +1,9 @@
package com.github.hydos.ginger.engine.render;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.joml.Vector4f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.GuiTexture;

View File

@ -1,12 +1,8 @@
package com.github.hydos.ginger.engine.render.renderers;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.math.Maths;

View File

@ -1,13 +1,8 @@
package com.github.hydos.ginger.engine.render.renderers;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.font.*;
import com.github.hydos.ginger.engine.render.shaders.FontShader;

View File

@ -2,10 +2,7 @@ package com.github.hydos.ginger.engine.render.renderers;
import java.util.List;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.elements.GuiTexture;
import com.github.hydos.ginger.engine.math.Maths;

View File

@ -1,13 +1,9 @@
package com.github.hydos.ginger.engine.render.renderers;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.joml.Vector4f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.elements.objects.*;

View File

@ -1,15 +1,10 @@
package com.github.hydos.ginger.engine.render.renderers;
import java.nio.FloatBuffer;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL31;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.math.Maths;

View File

@ -1,9 +1,6 @@
package com.github.hydos.ginger.engine.render.renderers;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.cameras.Camera;
import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;

View File

@ -2,10 +2,7 @@ package com.github.hydos.ginger.engine.render.renderers;
import java.util.List;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.math.Maths;
import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;

View File

@ -1,14 +1,11 @@
package com.github.hydos.ginger.engine.render.shaders;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.*;
import java.nio.FloatBuffer;
import org.joml.Vector4f;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.math.matrixes.Matrix4f;
import com.github.hydos.ginger.engine.math.vectors.*;

View File

@ -1,13 +1,10 @@
package com.github.hydos.ginger.engine.render.texture;
import static org.lwjgl.stb.STBImage.stbi_failure_reason;
import static org.lwjgl.stb.STBImage.stbi_info_from_memory;
import static org.lwjgl.stb.STBImage.stbi_load_from_memory;
import static org.lwjgl.stb.STBImage.*;
import static org.lwjgl.system.MemoryStack.stackPush;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.*;
import org.lwjgl.system.MemoryStack;

View File

@ -1,8 +1,6 @@
package com.github.hydos.ginger.engine.render.texture;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
public class ModelTexture {
private int textureID = GL11.glGenTextures();

View File

@ -2,11 +2,9 @@ package com.github.hydos.ginger.engine.render.tools;
import static org.lwjgl.BufferUtils.createByteBuffer;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.*;
import org.lwjgl.BufferUtils;

View File

@ -2,11 +2,7 @@ package com.github.hydos.ginger.engine.shadow;
import java.nio.ByteBuffer;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.io.Window;

View File

@ -1,12 +1,8 @@
package com.github.hydos.ginger.engine.shadow;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.elements.objects.RenderObject;
import com.github.hydos.ginger.engine.math.Maths;

View File

@ -1,7 +1,6 @@
package com.github.hydos.ginger.engine.shadow;
import java.util.List;
import java.util.Map;
import java.util.*;
import org.lwjgl.opengl.GL11;

View File

@ -1,19 +1,10 @@
package com.github.hydos.ginger.engine.utils;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.List;
import java.nio.*;
import java.util.*;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.EXTTextureFilterAnisotropic;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL33;
import org.lwjgl.opengl.*;
import com.github.hydos.ginger.engine.io.Window;
import com.github.hydos.ginger.engine.render.models.RawModel;

View File

@ -1,12 +0,0 @@
package io.github.halotroop.litecraft.types.block;
import io.github.hydos.ginger.engine.elements.objects.RenderObject;
import io.github.hydos.ginger.engine.math.vectors.Vector3f;
public class BlockEntity extends RenderObject
{
public BlockEntity(Block block, Vector3f position)
{
super(block.model, position, 0, 0, 0, new Vector3f(1f,1f,1f));
}
}

View File

@ -1,14 +1,7 @@
package tk.valoeghese.sod;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.io.*;
import java.util.*;
import tk.valoeghese.sod.exception.SODParseException;

View File

@ -1,8 +1,6 @@
package tk.valoeghese.sod;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.*;
/**
* Represents a section of SOD data.

View File

@ -1,10 +1,7 @@
package tk.valoeghese.sod;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.io.*;
import java.util.*;
import tk.valoeghese.sod.exception.SODParseException;

View File

@ -1,7 +1,6 @@
package tk.valoeghese.sod;
import java.io.File;
import java.io.IOException;
import java.io.*;
public class TestMain {