fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organise texture folders and misc cleanup

Browse Source
This commit is contained in:
Electroblob77
2020-04-10 00:17:01 +01:00
parent 793ba0eb05
commit a4fd88f21d
128 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java
+12 -12
View File
@@ -55,12 +55,12 @@ import java.util.List;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class WizardryClientEventHandler {
private static final ResourceLocation sixthSenseTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/sixth_sense.png");
private static final ResourceLocation sixthSenseOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_overlay.png");
private static final ResourceLocation frostOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/frost_overlay.png");
private static final ResourceLocation blinkOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/blink_overlay.png");
private static final ResourceLocation pointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/pointer.png");
private static final ResourceLocation targetPointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/target_pointer.png");
private static final ResourceLocation SIXTH_SENSE_MARKER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_marker.png");
private static final ResourceLocation SIXTH_SENSE_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_overlay.png");
private static final ResourceLocation FROST_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/frost_overlay.png");
private static final ResourceLocation BLINK_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/blink_overlay.png");
private static final ResourceLocation POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/pointer.png");
private static final ResourceLocation TARGET_POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/target_pointer.png");
/** The remaining time for which the blink screen overlay effect will be displayed in first-person. Since this is
* only for the first-person player (the instance of which is itself stored in a static variable), this can simply
@@ -298,7 +298,7 @@ public final class WizardryClientEventHandler {
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
mc.renderEngine.bindTexture(targetPointerTexture);
mc.renderEngine.bindTexture(TARGET_POINTER_TEXTURE);
buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex();
buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex();
@@ -340,7 +340,7 @@ public final class WizardryClientEventHandler {
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
mc.renderEngine.bindTexture(pointerTexture);
mc.renderEngine.bindTexture(POINTER_TEXTURE);
buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex();
buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex();
@@ -385,7 +385,7 @@ public final class WizardryClientEventHandler {
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
mc.renderEngine.bindTexture(sixthSenseTexture);
mc.renderEngine.bindTexture(SIXTH_SENSE_MARKER_TEXTURE);
buffer.pos(-0.6, 0.6, 0).tex(0, 0).endVertex();
buffer.pos(0.6, 0.6, 0).tex(1, 0).endVertex();
@@ -414,7 +414,7 @@ public final class WizardryClientEventHandler {
GlStateManager.color(1, 1, 1, 1);
GlStateManager.disableAlpha();
renderScreenOverlay(event, sixthSenseOverlayTexture);
renderScreenOverlay(event, SIXTH_SENSE_OVERLAY_TEXTURE);
GlStateManager.enableAlpha();
GlStateManager.color(1, 1, 1, 1);
@@ -426,7 +426,7 @@ public final class WizardryClientEventHandler {
GlStateManager.color(1, 1, 1, 1);
GlStateManager.disableAlpha();
renderScreenOverlay(event, frostOverlayTexture);
renderScreenOverlay(event, FROST_OVERLAY_TEXTURE);
GlStateManager.enableAlpha();
GlStateManager.color(1, 1, 1, 1);
@@ -440,7 +440,7 @@ public final class WizardryClientEventHandler {
GlStateManager.color(1, 1, 1, alpha);
GlStateManager.disableAlpha();
renderScreenOverlay(event, blinkOverlayTexture);
renderScreenOverlay(event, BLINK_OVERLAY_TEXTURE);
GlStateManager.enableAlpha();
GlStateManager.color(1, 1, 1, 1);
src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
+1 -1
View File
@@ -52,7 +52,7 @@ import java.util.Locale;
public class GuiArcaneWorkbench extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID,
"textures/gui/arcane_workbench.png");
"textures/gui/container/arcane_workbench.png");
private static final int TOOLTIP_WIDTH = 144;
private static final int TOOLTIP_TEXT_INSET = 6;
src/main/java/electroblob/wizardry/client/gui/GuiBookshelf.java
+1 -1
View File
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiBookshelf extends GuiContainer {
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/bookshelf.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/bookshelf.png");
/** The player inventory bound to this GUI. */
private final InventoryPlayer playerInventory;
/** The inventory contained within the corresponding bookshelf. */
src/main/java/electroblob/wizardry/client/gui/GuiButtonSpellSort.java
+1 -1
View File
@@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation;
public class GuiButtonSpellSort extends GuiButton {
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/spell_sort_buttons.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/spell_sort_buttons.png");
private static final int TEXTURE_WIDTH = 32;
private static final int TEXTURE_HEIGHT = 32;
src/main/java/electroblob/wizardry/client/gui/GuiLectern.java
+1 -1
View File
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
public class GuiLectern extends GuiSpellInfo implements ISpellSortable {
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/lectern.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/lectern.png");
/** The distance of the page buttons from the bottom outside corners of the GUI. */
private static final int PAGE_BUTTON_INSET_X = 22, PAGE_BUTTON_INSET_Y = 13;
/** The distance between adjacent page turn buttons. */
src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class GuiWizardHandbook extends GuiScreen {
private static final ResourceLocation DEFAULT = new ResourceLocation(Wizardry.MODID, "texts/handbook_en_us.json");
static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, "textures/gui/handbook.png");
static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, "textures/gui/handbook/handbook.png");
/** Global Gson instance for the handbook. */
private static final Gson gson = new Gson();
src/main/java/electroblob/wizardry/client/renderer/RenderArcaneLock.java
+4 -4
View File
@@ -26,11 +26,11 @@ import java.util.List;
@Mod.EventBusSubscriber(Side.CLIENT)
public class RenderArcaneLock {
private static final ResourceLocation[] textures = new ResourceLocation[8];
private static final ResourceLocation[] TEXTURES = new ResourceLocation[8];
static {
for(int i=0; i<textures.length; i++){
textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/arcane_lock_" + i + ".png");
for(int i = 0; i< TEXTURES.length; i++){
TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/blocks/arcane_lock_" + i + ".png");
}
}
@@ -52,7 +52,7 @@ public class RenderArcaneLock {
GlStateManager.color(1, 1, 1, 1);
Minecraft.getMinecraft().renderEngine.bindTexture(textures[(player.ticksExisted % (textures.length * 2))/2]);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[(player.ticksExisted % (TEXTURES.length * 2))/2]);
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBuffer();
src/main/java/electroblob/wizardry/client/renderer/RenderArcaneWorkbench.java
+2 -2
View File
@@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL11;
public class RenderArcaneWorkbench extends TileEntitySpecialRenderer<TileEntityArcaneWorkbench> {
private static final ResourceLocation runeTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/rune.png");
private static final ResourceLocation RUNE_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/arcane_workbench_rune.png");
public RenderArcaneWorkbench(){}
@@ -56,7 +56,7 @@ public class RenderArcaneWorkbench extends TileEntitySpecialRenderer<TileEntityA
GlStateManager.translate(0.0f, 0.65f, 0.0f);
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBuffer();
bindTexture(runeTexture);
bindTexture(RUNE_TEXTURE);
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
buffer.pos(-0.5f, 0, -0.5f).tex(0, 0).endVertex();
src/main/java/electroblob/wizardry/client/renderer/RenderBlackHole.java
+7 -7
View File
@@ -16,10 +16,10 @@ import java.util.Collections;
public class RenderBlackHole extends Render<EntityBlackHole> {
private static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID,
"textures/entity/dark_ray.png");
private static final ResourceLocation texture2 = new ResourceLocation(Wizardry.MODID,
"textures/entity/black_hole.png");
private static final ResourceLocation RAY_TEXTURE = new ResourceLocation(Wizardry.MODID,
"textures/entity/black_hole/ray.png");
private static final ResourceLocation CENTRE_TEXTURE = new ResourceLocation(Wizardry.MODID,
"textures/entity/black_hole/centre.png");
public RenderBlackHole(RenderManager renderManager){
super(renderManager);
@@ -57,7 +57,7 @@ public class RenderBlackHole extends Render<EntityBlackHole> {
GlStateManager.scale(scale, scale, scale);
}
this.bindTexture(texture);
this.bindTexture(RAY_TEXTURE);
// In theory this stuff should sort the rays into the correct render order based on the distance from
// the 'camera' (i.e. the player's viewpoint)
@@ -142,7 +142,7 @@ public class RenderBlackHole extends Render<EntityBlackHole> {
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
this.bindTexture(texture2);
this.bindTexture(CENTRE_TEXTURE);
buffer.pos(-0.4, 0.4, 0).tex(0, 0).endVertex();
buffer.pos(0.4, 0.4, 0).tex(1, 0).endVertex();
@@ -164,7 +164,7 @@ public class RenderBlackHole extends Render<EntityBlackHole> {
@Override
protected ResourceLocation getEntityTexture(EntityBlackHole entity){
return texture;
return RAY_TEXTURE;
}
}
src/main/java/electroblob/wizardry/client/renderer/RenderBubble.java
+19 -19
View File
@@ -11,14 +11,14 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
public class RenderBubble extends Render<EntityBubble> {
private static final ResourceLocation particleTextures = new ResourceLocation("textures/particle/particles.png");
private static final ResourceLocation darkOrbTexture = new ResourceLocation(Wizardry.MODID,
"textures/entity/dark_orb.png");
private static final ResourceLocation PARTICLE_TEXTURES = new ResourceLocation("textures/particle/particles.png");
private static final ResourceLocation ENTRAPMENT_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/entrapment.png");
public RenderBubble(RenderManager renderManager){
super(renderManager);
@@ -33,18 +33,20 @@ public class RenderBubble extends Render<EntityBubble> {
float yOffset = 0;
if(WizardryUtilities.getRider(entity) != null){
yOffset = WizardryUtilities.getRider(entity).height / 2;
Entity rider = WizardryUtilities.getRider(entity);
if(rider != null){
yOffset = rider.height / 2;
}
GlStateManager.translate((float)par2, (float)par4 + yOffset, (float)par6);
this.bindTexture(((EntityBubble)entity).isDarkOrb ? darkOrbTexture : particleTextures);
this.bindTexture(entity.isDarkOrb ? ENTRAPMENT_TEXTURE : PARTICLE_TEXTURES);
float f6 = 1.0F;
float f7 = 0.5F;
float f8 = 0.5F;
if(((EntityBubble)entity).isDarkOrb){
if(entity.isDarkOrb){
GlStateManager.disableLighting();
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
}else{
@@ -74,24 +76,22 @@ public class RenderBubble extends Render<EntityBubble> {
// tessellator.setColorRGBA_I(k1, 128);
// buffer.normal(0.0F, 1.0F, 0.0F);
if(((EntityBubble)entity).isDarkOrb){
buffer.pos((double)(0.0F - f7), (double)(0.0F - f8), 0.0D).tex(0, 1).endVertex();
buffer.pos((double)(f6 - f7), (double)(0.0F - f8), 0.0D).tex(1, 1).endVertex();
buffer.pos((double)(f6 - f7), (double)(1.0F - f8), 0.0D).tex(1, 0).endVertex();
buffer.pos((double)(0.0F - f7), (double)(1.0F - f8), 0.0D).tex(0, 0).endVertex();
if(entity.isDarkOrb){
buffer.pos(0.0F - f7, 0.0F - f8, 0.0D).tex(0, 1).endVertex();
buffer.pos(f6 - f7, 0.0F - f8, 0.0D).tex(1, 1).endVertex();
buffer.pos(f6 - f7, 1.0F - f8, 0.0D).tex(1, 0).endVertex();
buffer.pos(0.0F - f7, 1.0F - f8, 0.0D).tex(0, 0).endVertex();
}else{
buffer.pos((double)(0.0F - f7), (double)(0.0F - f8), 0.0D).tex(pixelwidth, pixelwidth * 24).endVertex();
buffer.pos((double)(f6 - f7), (double)(0.0F - f8), 0.0D).tex(pixelwidth * 8, pixelwidth * 24).endVertex();
buffer.pos((double)(f6 - f7), (double)(1.0F - f8), 0.0D).tex(pixelwidth * 8, pixelwidth * 17).endVertex();
buffer.pos((double)(0.0F - f7), (double)(1.0F - f8), 0.0D).tex(pixelwidth, pixelwidth * 17).endVertex();
buffer.pos(0.0F - f7, 0.0F - f8, 0.0D).tex(pixelwidth, pixelwidth * 24).endVertex();
buffer.pos(f6 - f7, 0.0F - f8, 0.0D).tex(pixelwidth * 8, pixelwidth * 24).endVertex();
buffer.pos(f6 - f7, 1.0F - f8, 0.0D).tex(pixelwidth * 8, pixelwidth * 17).endVertex();
buffer.pos(0.0F - f7, 1.0F - f8, 0.0D).tex(pixelwidth, pixelwidth * 17).endVertex();
}
tessellator.draw();
GlStateManager.disableBlend();
if(((EntityBubble)entity).isDarkOrb){
GlStateManager.enableLighting();
}
if(entity.isDarkOrb) GlStateManager.enableLighting();
GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix();
src/main/java/electroblob/wizardry/client/renderer/RenderContainmentField.java
+4 -4
View File
@@ -24,14 +24,14 @@ import org.lwjgl.opengl.GL11;
@Mod.EventBusSubscriber(Side.CLIENT)
public class RenderContainmentField {
private static final ResourceLocation[] textures = new ResourceLocation[8];
private static final ResourceLocation[] TEXTURES = new ResourceLocation[8];
private static final float ANIMATION_SPEED = 0.004f;
private static final float FADE_DISTANCE_SQUARED = 15;
static {
for(int i=0; i<textures.length; i++){
textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/containment_field_" + i + ".png");
for(int i = 0; i< TEXTURES.length; i++){
TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/environment/containment_field_" + i + ".png");
}
}
@@ -65,7 +65,7 @@ public class RenderContainmentField {
GlStateManager.color(1, 1, 1, 1);
Minecraft.getMinecraft().renderEngine.bindTexture(textures[(player.ticksExisted % (textures.length * 2))/2]);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[(player.ticksExisted % (TEXTURES.length * 2))/2]);
Tessellator tessellator = Tessellator.getInstance();
src/main/java/electroblob/wizardry/client/renderer/RenderDecay.java
+3 -3
View File
@@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11;
public class RenderDecay extends Render<EntityDecay> {
private static final ResourceLocation[] textures = new ResourceLocation[10];
private static final ResourceLocation[] TEXTURES = new ResourceLocation[10];
public RenderDecay(RenderManager renderManager){
super(renderManager);
for(int i = 0; i < 10; i++){
textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/decay_" + i + ".png");
TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/decay/decay_" + i + ".png");
}
}
@@ -36,7 +36,7 @@ public class RenderDecay extends Render<EntityDecay> {
GlStateManager.translate((float)par2, (float)par4 + yOffset, (float)par6);
this.bindTexture(textures[((EntityDecay)entity).textureIndex]);
this.bindTexture(TEXTURES[((EntityDecay)entity).textureIndex]);
float f6 = 1.0F;
float f7 = 0.5F;
float f8 = 0.5F;
src/main/java/electroblob/wizardry/client/renderer/RenderEvilWizard.java
+4 -3
View File
@@ -10,14 +10,15 @@ import net.minecraft.util.ResourceLocation;
//@SideOnly(Side.CLIENT)
public class RenderEvilWizard extends RenderBiped<EntityEvilWizard> {
static final ResourceLocation[] textures = new ResourceLocation[6];
static final ResourceLocation[] TEXTURES = new ResourceLocation[6];
public RenderEvilWizard(RenderManager renderManager){
super(renderManager, new ModelWizard(), 0.5F);
for(int i = 0; i < 6; i++){
textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/evil_wizard_" + i + ".png");
TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/evil_wizard/evil_wizard_" + i + ".png");
}
// Just using the default without overriding models, since the armour sets its own model anyway.
this.addLayer(new LayerBipedArmor(this));
@@ -25,7 +26,7 @@ public class RenderEvilWizard extends RenderBiped<EntityEvilWizard> {
@Override
protected ResourceLocation getEntityTexture(EntityEvilWizard wizard){
return textures[wizard.textureIndex];
return TEXTURES[wizard.textureIndex];
}
}
src/main/java/electroblob/wizardry/client/renderer/RenderMagicLight.java
+6 -6
View File
@@ -12,10 +12,10 @@ import org.lwjgl.opengl.GL11;
public class RenderMagicLight extends TileEntitySpecialRenderer<TileEntityMagicLight> {
private static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID,
"textures/entity/light_ray.png");
private static final ResourceLocation texture2 = new ResourceLocation(Wizardry.MODID,
"textures/entity/light_aura.png");
private static final ResourceLocation RAY_TEXTURE = new ResourceLocation(Wizardry.MODID,
"textures/entity/light/ray.png");
private static final ResourceLocation FLARE_TEXTURE = new ResourceLocation(Wizardry.MODID,
"textures/entity/light/flare.png");
@Override
public void render(TileEntityMagicLight tileentity, double x, double y, double z, float f,
@@ -60,7 +60,7 @@ public class RenderMagicLight extends TileEntitySpecialRenderer<TileEntityMagicL
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
this.bindTexture(texture2);
this.bindTexture(FLARE_TEXTURE);
buffer.pos(-0.6, 0.6, 0).tex(0, 0).endVertex();
buffer.pos(0.6, 0.6, 0).tex(1, 0).endVertex();
@@ -77,7 +77,7 @@ public class RenderMagicLight extends TileEntitySpecialRenderer<TileEntityMagicL
// ends of the rays to appear black, so I have changed it to this, which looks very slightly different.
GlStateManager.blendFunc(GL11.GL_ONE, GL11.GL_SRC_ALPHA);
this.bindTexture(texture);
this.bindTexture(RAY_TEXTURE);
if(tileentity.randomiser.length >= 30){
for(int j = 0; j < 30; j++){
src/main/java/electroblob/wizardry/client/renderer/RenderWizard.java
+3 -3
View File
@@ -11,14 +11,14 @@ import net.minecraft.util.ResourceLocation;
//@SideOnly(Side.CLIENT)
public class RenderWizard extends RenderBiped<EntityWizard> {
static final ResourceLocation[] textures = new ResourceLocation[6];
static final ResourceLocation[] TEXTURES = new ResourceLocation[6];
public RenderWizard(RenderManager renderManager){
super(renderManager, new ModelWizard(), 0.5F);
for(int i = 0; i < 6; i++){
textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/wizard_" + i + ".png");
TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/wizard/wizard_" + i + ".png");
}
// Just using the default without overriding models, since the armour sets its own model anyway.
this.addLayer(new LayerBipedArmor(this));
@@ -26,7 +26,7 @@ public class RenderWizard extends RenderBiped<EntityWizard> {
@Override
protected ResourceLocation getEntityTexture(EntityWizard wizard){
return textures[wizard.textureIndex];
return TEXTURES[wizard.textureIndex];
}
}