From fa5ffa8157b1ca64cb5f9f06bb7b4b3ac4c0313b Mon Sep 17 00:00:00 2001
From: Caspian Rychlik-Prince <cprince@puppygames.net>
Date: Sun, 20 Feb 2005 20:53:50 +0000
Subject: [PATCH] Refactored generator into util package

---
 src/templates/org/lwjgl/openal/AL10.java                        | 2 +-
 src/templates/org/lwjgl/opengl/ARB_buffer_object.java           | 2 +-
 src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java      | 2 +-
 src/templates/org/lwjgl/opengl/ARB_draw_buffers.java            | 2 +-
 src/templates/org/lwjgl/opengl/ARB_imaging.java                 | 2 +-
 src/templates/org/lwjgl/opengl/ARB_matrix_palette.java          | 2 +-
 src/templates/org/lwjgl/opengl/ARB_multisample.java             | 2 +-
 src/templates/org/lwjgl/opengl/ARB_multitexture.java            | 2 +-
 src/templates/org/lwjgl/opengl/ARB_occlusion_query.java         | 2 +-
 src/templates/org/lwjgl/opengl/ARB_point_parameters.java        | 2 +-
 src/templates/org/lwjgl/opengl/ARB_program.java                 | 2 +-
 src/templates/org/lwjgl/opengl/ARB_shader_objects.java          | 2 +-
 src/templates/org/lwjgl/opengl/ARB_texture_compression.java     | 2 +-
 src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java        | 2 +-
 src/templates/org/lwjgl/opengl/ARB_vertex_blend.java            | 2 +-
 src/templates/org/lwjgl/opengl/ARB_vertex_program.java          | 2 +-
 src/templates/org/lwjgl/opengl/ARB_vertex_shader.java           | 2 +-
 src/templates/org/lwjgl/opengl/ATI_draw_buffers.java            | 2 +-
 src/templates/org/lwjgl/opengl/ATI_element_array.java           | 2 +-
 src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java          | 2 +-
 src/templates/org/lwjgl/opengl/ATI_fragment_shader.java         | 2 +-
 src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java       | 2 +-
 src/templates/org/lwjgl/opengl/ATI_pn_triangles.java            | 2 +-
 src/templates/org/lwjgl/opengl/ATI_separate_stencil.java        | 2 +-
 src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java | 2 +-
 src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java     | 2 +-
 .../org/lwjgl/opengl/ATI_vertex_attrib_array_object.java        | 2 +-
 src/templates/org/lwjgl/opengl/ATI_vertex_streams.java          | 2 +-
 src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java | 2 +-
 src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java     | 2 +-
 src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java   | 2 +-
 src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java       | 2 +-
 src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java     | 2 +-
 src/templates/org/lwjgl/opengl/EXT_fog_coord.java               | 2 +-
 src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java      | 2 +-
 src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java       | 2 +-
 src/templates/org/lwjgl/opengl/EXT_paletted_texture.java        | 2 +-
 src/templates/org/lwjgl/opengl/EXT_point_parameters.java        | 2 +-
 src/templates/org/lwjgl/opengl/EXT_secondary_color.java         | 2 +-
 src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java        | 2 +-
 .../org/lwjgl/opengl/EXT_texture_compression_s3tc.java          | 2 +-
 src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java        | 2 +-
 src/templates/org/lwjgl/opengl/EXT_vertex_shader.java           | 2 +-
 src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java        | 2 +-
 src/templates/org/lwjgl/opengl/GL11.java                        | 2 +-
 src/templates/org/lwjgl/opengl/GL12.java                        | 2 +-
 src/templates/org/lwjgl/opengl/GL13.java                        | 2 +-
 src/templates/org/lwjgl/opengl/GL14.java                        | 2 +-
 src/templates/org/lwjgl/opengl/GL15.java                        | 2 +-
 src/templates/org/lwjgl/opengl/GL20.java                        | 2 +-
 src/templates/org/lwjgl/opengl/NV_evaluators.java               | 2 +-
 src/templates/org/lwjgl/opengl/NV_fence.java                    | 2 +-
 src/templates/org/lwjgl/opengl/NV_fragment_program.java         | 2 +-
 src/templates/org/lwjgl/opengl/NV_half_float.java               | 2 +-
 src/templates/org/lwjgl/opengl/NV_occlusion_query.java          | 2 +-
 src/templates/org/lwjgl/opengl/NV_pixel_data_range.java         | 2 +-
 src/templates/org/lwjgl/opengl/NV_point_sprite.java             | 2 +-
 src/templates/org/lwjgl/opengl/NV_primitive_restart.java        | 2 +-
 src/templates/org/lwjgl/opengl/NV_program.java                  | 2 +-
 src/templates/org/lwjgl/opengl/NV_register_combiners.java       | 2 +-
 src/templates/org/lwjgl/opengl/NV_register_combiners2.java      | 2 +-
 src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java  | 2 +-
 src/templates/org/lwjgl/opengl/NV_vertex_array_range.java       | 2 +-
 src/templates/org/lwjgl/opengl/NV_vertex_program.java           | 2 +-
 64 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/templates/org/lwjgl/openal/AL10.java b/src/templates/org/lwjgl/openal/AL10.java
index dcaca285..6649ca5d 100644
--- a/src/templates/org/lwjgl/openal/AL10.java
+++ b/src/templates/org/lwjgl/openal/AL10.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
index 03073f71..66a5d087 100644
--- a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
+++ b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.*;
 
diff --git a/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java b/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
index 23706e3d..f58c8321 100644
--- a/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
+++ b/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_color_buffer_float {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java b/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java
index bc5017e7..e694737a 100644
--- a/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java
+++ b/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.IntBuffer;
 
diff --git a/src/templates/org/lwjgl/opengl/ARB_imaging.java b/src/templates/org/lwjgl/opengl/ARB_imaging.java
index 5024462f..d0a77e19 100644
--- a/src/templates/org/lwjgl/opengl/ARB_imaging.java
+++ b/src/templates/org/lwjgl/opengl/ARB_imaging.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java b/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java
index 8c23b8e5..93eb822f 100644
--- a/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java
+++ b/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java
@@ -36,7 +36,7 @@ import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_matrix_palette {
 	int GL_MATRIX_PALETTE_ARB = 0x8840;
diff --git a/src/templates/org/lwjgl/opengl/ARB_multisample.java b/src/templates/org/lwjgl/opengl/ARB_multisample.java
index da719c21..44989e3a 100644
--- a/src/templates/org/lwjgl/opengl/ARB_multisample.java
+++ b/src/templates/org/lwjgl/opengl/ARB_multisample.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_multisample {
 	int GL_MULTISAMPLE_ARB = 0x809D;
diff --git a/src/templates/org/lwjgl/opengl/ARB_multitexture.java b/src/templates/org/lwjgl/opengl/ARB_multitexture.java
index c366aa1f..8af0ed25 100644
--- a/src/templates/org/lwjgl/opengl/ARB_multitexture.java
+++ b/src/templates/org/lwjgl/opengl/ARB_multitexture.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_multitexture {
 	int GL_TEXTURE0_ARB = 0x84C0;
diff --git a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
index b798afc1..0b574a74 100644
--- a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
+++ b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_occlusion_query {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ARB_point_parameters.java b/src/templates/org/lwjgl/opengl/ARB_point_parameters.java
index 18261488..a3f2c974 100644
--- a/src/templates/org/lwjgl/opengl/ARB_point_parameters.java
+++ b/src/templates/org/lwjgl/opengl/ARB_point_parameters.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_point_parameters {
 	int GL_POINT_SIZE_MIN_ARB = 0x8126;
diff --git a/src/templates/org/lwjgl/opengl/ARB_program.java b/src/templates/org/lwjgl/opengl/ARB_program.java
index a3385d7c..3a6b9e43 100644
--- a/src/templates/org/lwjgl/opengl/ARB_program.java
+++ b/src/templates/org/lwjgl/opengl/ARB_program.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="ARB", isFinal=false)
 public interface ARB_program {
diff --git a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
index 83653cf0..20d85ddf 100644
--- a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
+++ b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
@@ -35,7 +35,7 @@ import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_shader_objects {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
index e2f116cd..d143b84f 100644
--- a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
+++ b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_texture_compression {
 	int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
diff --git a/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java b/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java
index d15887ac..8bd120a7 100644
--- a/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java
+++ b/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_transpose_matrix {
 	int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java b/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java
index 1246c86d..b95cddd3 100644
--- a/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java
+++ b/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java
@@ -37,7 +37,7 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_vertex_blend {
 	int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_program.java b/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
index af7e05b3..639acc77 100644
--- a/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
+++ b/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
@@ -36,7 +36,7 @@ import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_vertex_program extends ARB_program {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java b/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
index 58f8ae84..8104dce6 100644
--- a/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
+++ b/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ARB_vertex_shader {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java b/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java
index 8f364803..994dac71 100644
--- a/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java
+++ b/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_draw_buffers {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/ATI_element_array.java b/src/templates/org/lwjgl/opengl/ATI_element_array.java
index ef5be090..a1f04ec5 100644
--- a/src/templates/org/lwjgl/opengl/ATI_element_array.java
+++ b/src/templates/org/lwjgl/opengl/ATI_element_array.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_element_array {
 	int GL_ELEMENT_ARRAY_ATI = 0x8768;
diff --git a/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java b/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java
index 702a5dc0..84ef7d49 100644
--- a/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java
+++ b/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_envmap_bumpmap {
 	int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
diff --git a/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java b/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java
index 95ccf631..37d26450 100644
--- a/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java
+++ b/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java
@@ -38,7 +38,7 @@ package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_fragment_shader {
 	int GL_FRAGMENT_SHADER_ATI = 0x8920;
diff --git a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
index 5201ecc9..1c750c9e 100644
--- a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
+++ b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_map_object_buffer {
 	/**
diff --git a/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java b/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java
index 886a3b16..a9484a10 100644
--- a/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java
+++ b/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_pn_triangles {
 	int GL_PN_TRIANGLES_ATI = 0x87F0;
diff --git a/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java b/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java
index d928361b..9cb6b209 100644
--- a/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java
+++ b/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_separate_stencil {
 	int GL_STENCIL_BACK_FUNC_ATI = 0x8800;
diff --git a/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java b/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java
index 6e300156..4ab3f449 100644
--- a/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java
+++ b/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="ATI", className="ATITextureCompression3DC")
 public interface ATI_texture_compression_3dc {
diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
index 7d2ed44c..498593e6 100644
--- a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
+++ b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_vertex_array_object {
 	int GL_STATIC_ATI = 0x8760;
diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java b/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java
index e40ca75f..83433b38 100644
--- a/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java
+++ b/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_vertex_attrib_array_object {
 	void glVertexAttribArrayObjectATI(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride, @GLuint int buffer, @GLuint int offset);
diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java b/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
index 06a2658c..e4db7c8c 100644
--- a/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
+++ b/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface ATI_vertex_streams {
 	int GL_MAX_VERTEX_STREAMS_ATI = 0x876B;
diff --git a/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java b/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java
index ed701776..004030cd 100644
--- a/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java
+++ b/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_blend_equation_separate {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java b/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java
index 3996361a..8cb0a953 100644
--- a/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java
+++ b/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_blend_func_separate {
 	int GL_BLEND_DST_RGB_EXT = 0x80C8;
diff --git a/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java b/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java
index 2090d502..ac912334 100644
--- a/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java
+++ b/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_compiled_vertex_array {
 	int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8;
diff --git a/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java b/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java
index 73b0f0bf..09b9c15a 100644
--- a/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java
+++ b/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_depth_bounds_test {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java b/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java
index c97cd3db..8bc0a597 100644
--- a/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java
+++ b/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_draw_range_elements {
 	int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
diff --git a/src/templates/org/lwjgl/opengl/EXT_fog_coord.java b/src/templates/org/lwjgl/opengl/EXT_fog_coord.java
index dd17d7bf..883c8c6a 100644
--- a/src/templates/org/lwjgl/opengl/EXT_fog_coord.java
+++ b/src/templates/org/lwjgl/opengl/EXT_fog_coord.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_fog_coord {
 	int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
diff --git a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
index 51fa71be..bbd8f694 100644
--- a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
+++ b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.IntBuffer;
 
diff --git a/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java b/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java
index fe38923c..536e93cd 100644
--- a/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java
+++ b/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_multi_draw_arrays {
 	@Code(	"		if (piFirst.remaining() != piCount.remaining()) {\n" +
diff --git a/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java b/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java
index af8fada9..078c97e5 100644
--- a/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java
+++ b/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.*;
 
diff --git a/src/templates/org/lwjgl/opengl/EXT_point_parameters.java b/src/templates/org/lwjgl/opengl/EXT_point_parameters.java
index 47c99d5e..c132f0d2 100644
--- a/src/templates/org/lwjgl/opengl/EXT_point_parameters.java
+++ b/src/templates/org/lwjgl/opengl/EXT_point_parameters.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_point_parameters {
 	int GL_POINT_SIZE_MIN_EXT = 0x8126;
diff --git a/src/templates/org/lwjgl/opengl/EXT_secondary_color.java b/src/templates/org/lwjgl/opengl/EXT_secondary_color.java
index f82fb217..be3936f0 100644
--- a/src/templates/org/lwjgl/opengl/EXT_secondary_color.java
+++ b/src/templates/org/lwjgl/opengl/EXT_secondary_color.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_secondary_color {
 	int GL_COLOR_SUM_EXT = 0x8458;
diff --git a/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java b/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java
index 8fe897a7..3dc2e71c 100644
--- a/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java
+++ b/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_stencil_two_side {
 	int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910;
diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java b/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java
index dda253c7..90fdf1d0 100644
--- a/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java
+++ b/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="EXT", className="EXTTextureCompressionS3TC")
 public interface EXT_texture_compression_s3tc {
diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java b/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java
index 4606b41a..e90de4a4 100644
--- a/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java
+++ b/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="EXT", className="EXTTextureLODBias")
 public interface EXT_texture_lod_bias {
diff --git a/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java b/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java
index f5989452..ee04d1df 100644
--- a/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java
+++ b/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java
@@ -37,7 +37,7 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_vertex_shader {
 	int GL_VERTEX_SHADER_EXT = 0x8780;
diff --git a/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java b/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
index b95422fa..6d4894aa 100644
--- a/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
+++ b/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface EXT_vertex_weighting {
 	int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
diff --git a/src/templates/org/lwjgl/opengl/GL11.java b/src/templates/org/lwjgl/opengl/GL11.java
index afc878fd..539f59f6 100644
--- a/src/templates/org/lwjgl/opengl/GL11.java
+++ b/src/templates/org/lwjgl/opengl/GL11.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.*;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/GL12.java b/src/templates/org/lwjgl/opengl/GL12.java
index ddfc2e70..d381a743 100644
--- a/src/templates/org/lwjgl/opengl/GL12.java
+++ b/src/templates/org/lwjgl/opengl/GL12.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/GL13.java b/src/templates/org/lwjgl/opengl/GL13.java
index 22cdc1a7..7bf78861 100644
--- a/src/templates/org/lwjgl/opengl/GL13.java
+++ b/src/templates/org/lwjgl/opengl/GL13.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/GL14.java b/src/templates/org/lwjgl/opengl/GL14.java
index 310d37ac..d468a3ac 100644
--- a/src/templates/org/lwjgl/opengl/GL14.java
+++ b/src/templates/org/lwjgl/opengl/GL14.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 /**
  * $Id$
diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java
index 9ca88269..1f219741 100644
--- a/src/templates/org/lwjgl/opengl/GL15.java
+++ b/src/templates/org/lwjgl/opengl/GL15.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.*;
 
diff --git a/src/templates/org/lwjgl/opengl/GL20.java b/src/templates/org/lwjgl/opengl/GL20.java
index 70194c48..f36bfe2f 100644
--- a/src/templates/org/lwjgl/opengl/GL20.java
+++ b/src/templates/org/lwjgl/opengl/GL20.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 import java.nio.*;
 
diff --git a/src/templates/org/lwjgl/opengl/NV_evaluators.java b/src/templates/org/lwjgl/opengl/NV_evaluators.java
index 228be81d..551cb079 100644
--- a/src/templates/org/lwjgl/opengl/NV_evaluators.java
+++ b/src/templates/org/lwjgl/opengl/NV_evaluators.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_evaluators {
 	int GL_EVAL_2D_NV = 0x86C0;
diff --git a/src/templates/org/lwjgl/opengl/NV_fence.java b/src/templates/org/lwjgl/opengl/NV_fence.java
index da179a4f..88a9d716 100644
--- a/src/templates/org/lwjgl/opengl/NV_fence.java
+++ b/src/templates/org/lwjgl/opengl/NV_fence.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_fence {
 	int GL_ALL_COMPLETED_NV = 0x84F2;
diff --git a/src/templates/org/lwjgl/opengl/NV_fragment_program.java b/src/templates/org/lwjgl/opengl/NV_fragment_program.java
index f58a7250..511d301b 100644
--- a/src/templates/org/lwjgl/opengl/NV_fragment_program.java
+++ b/src/templates/org/lwjgl/opengl/NV_fragment_program.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_fragment_program extends NV_program {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/NV_half_float.java b/src/templates/org/lwjgl/opengl/NV_half_float.java
index 272f2199..72537474 100644
--- a/src/templates/org/lwjgl/opengl/NV_half_float.java
+++ b/src/templates/org/lwjgl/opengl/NV_half_float.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.ShortBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_half_float {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
index c2f96569..45ff1821 100644
--- a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
+++ b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_occlusion_query {
 	int GL_OCCLUSION_TEST_HP = 0x8165;
diff --git a/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java b/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java
index 6a8ea130..776d12d5 100644
--- a/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java
+++ b/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_pixel_data_range {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/NV_point_sprite.java b/src/templates/org/lwjgl/opengl/NV_point_sprite.java
index b3a428bb..d5953108 100644
--- a/src/templates/org/lwjgl/opengl/NV_point_sprite.java
+++ b/src/templates/org/lwjgl/opengl/NV_point_sprite.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_point_sprite {
 	int GL_POINT_SPRITE_NV = 0x8861;
diff --git a/src/templates/org/lwjgl/opengl/NV_primitive_restart.java b/src/templates/org/lwjgl/opengl/NV_primitive_restart.java
index ffc719d0..eeb1e744 100644
--- a/src/templates/org/lwjgl/opengl/NV_primitive_restart.java
+++ b/src/templates/org/lwjgl/opengl/NV_primitive_restart.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_primitive_restart {
 	/*
diff --git a/src/templates/org/lwjgl/opengl/NV_program.java b/src/templates/org/lwjgl/opengl/NV_program.java
index 4ad32ea6..1cb5627d 100644
--- a/src/templates/org/lwjgl/opengl/NV_program.java
+++ b/src/templates/org/lwjgl/opengl/NV_program.java
@@ -35,7 +35,7 @@ import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="NV", isFinal=false)
 public interface NV_program {
diff --git a/src/templates/org/lwjgl/opengl/NV_register_combiners.java b/src/templates/org/lwjgl/opengl/NV_register_combiners.java
index a6cf52fe..8248b3ba 100644
--- a/src/templates/org/lwjgl/opengl/NV_register_combiners.java
+++ b/src/templates/org/lwjgl/opengl/NV_register_combiners.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_register_combiners {
 	int GL_REGISTER_COMBINERS_NV = 0x8522;
diff --git a/src/templates/org/lwjgl/opengl/NV_register_combiners2.java b/src/templates/org/lwjgl/opengl/NV_register_combiners2.java
index cb041dcd..937c51cd 100644
--- a/src/templates/org/lwjgl/opengl/NV_register_combiners2.java
+++ b/src/templates/org/lwjgl/opengl/NV_register_combiners2.java
@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_register_combiners2 {
 	int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
diff --git a/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java b/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java
index 3bc81994..dffe536d 100644
--- a/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java
+++ b/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 @Extension(postfix="NV", className="NVTextureCompressionVTC")
 public interface NV_texture_compression_vtc {
diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java b/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
index 1f17ffc0..007f4f82 100644
--- a/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
+++ b/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_vertex_array_range {
 	int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_program.java b/src/templates/org/lwjgl/opengl/NV_vertex_program.java
index 79dbbca3..81a6f436 100644
--- a/src/templates/org/lwjgl/opengl/NV_vertex_program.java
+++ b/src/templates/org/lwjgl/opengl/NV_vertex_program.java
@@ -38,7 +38,7 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.generator.*;
+import org.lwjgl.util.generator.*;
 
 public interface NV_vertex_program extends NV_program {
 	/*