mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
stirling in a jar
This commit is contained in:
parent
df0693db12
commit
091d6f3d2c
@ -3,7 +3,7 @@ package com.hbm.lib;
|
||||
public class RefStrings {
|
||||
public static final String MODID = "hbm";
|
||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
||||
public static final String VERSION = "1.0.27 BETA (4334)";
|
||||
public static final String VERSION = "1.0.27 BETA (4336)";
|
||||
//HBM's Beta Naming Convention:
|
||||
//V T (X)
|
||||
//V -> next release version
|
||||
|
||||
@ -9,11 +9,13 @@ import com.hbm.render.item.ItemRenderBase;
|
||||
import com.hbm.tileentity.machine.TileEntityStirling;
|
||||
import com.hbm.wiaj.actors.ITileActorRenderer;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
public class RenderStirling extends TileEntitySpecialRenderer implements IItemRendererProvider, ITileActorRenderer {
|
||||
@ -68,6 +70,11 @@ public class RenderStirling extends TileEntitySpecialRenderer implements IItemRe
|
||||
GL11.glTranslated(Math.sin(rot * Math.PI / 90D) * 0.25 + 0.125, 0, 0);
|
||||
ResourceManager.stirling.renderPart("Piston");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void bindTexture(ResourceLocation tex) {
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(tex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemForRenderer() {
|
||||
|
||||
@ -3,19 +3,28 @@ package com.hbm.wiaj;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.render.tileentity.RenderStirling;
|
||||
import com.hbm.wiaj.actions.ActionCreateActor;
|
||||
import com.hbm.wiaj.actions.ActionRotate;
|
||||
import com.hbm.wiaj.actions.ActionSetActorData;
|
||||
import com.hbm.wiaj.actions.ActionSetBlock;
|
||||
import com.hbm.wiaj.actions.ActionUpdateActor;
|
||||
import com.hbm.wiaj.actions.ActionWait;
|
||||
import com.hbm.wiaj.actors.ActorTileEntity;
|
||||
import com.hbm.wiaj.actors.ISpecialActor;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
//krass
|
||||
public class GuiWorldInAJar extends GuiScreen {
|
||||
@ -63,11 +72,8 @@ public class GuiWorldInAJar extends GuiScreen {
|
||||
}
|
||||
|
||||
startingScene.add(new ActionWait(10));
|
||||
|
||||
startingScene.add(new ActionSetBlock(2, 1, 2, ModBlocks.fallout, 0));
|
||||
|
||||
startingScene.add(new ActionWait(10));
|
||||
|
||||
startingScene.add(new ActionSetBlock(4, 1, 4, ModBlocks.conveyor, 2));
|
||||
startingScene.add(new ActionSetBlock(4, 1, 5, ModBlocks.conveyor, 2));
|
||||
startingScene.add(new ActionSetBlock(4, 1, 6, ModBlocks.conveyor, 2));
|
||||
@ -77,9 +83,8 @@ public class GuiWorldInAJar extends GuiScreen {
|
||||
startingScene.add(new ActionSetBlock(4, 1, 10, ModBlocks.conveyor, 6));
|
||||
startingScene.add(new ActionSetBlock(5, 1, 10, ModBlocks.conveyor, 4));
|
||||
|
||||
startingScene.add(new ActionWait(10));
|
||||
|
||||
startingScene.add(new ActionRotate(90, 0, 50));
|
||||
startingScene.add(new ActionWait(5));
|
||||
startingScene.add(new ActionRotate(90, 0, 10));
|
||||
|
||||
JarScene brickScene = new JarScene(testScript);
|
||||
|
||||
@ -93,13 +98,32 @@ public class GuiWorldInAJar extends GuiScreen {
|
||||
}
|
||||
|
||||
brickScene.add(new ActionRotate(-90, 0, 10));
|
||||
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionRotate(45, 30, 10));
|
||||
brickScene.add(new ActionWait(40));
|
||||
brickScene.add(new ActionRotate(360, 0, 100));
|
||||
brickScene.add(new ActionWait(40));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionRotate(-45, -30, 10));
|
||||
brickScene.add(new ActionWait(20));
|
||||
|
||||
brickScene.add(new ActionCreateActor(0, new ActorTileEntity(new RenderStirling())));
|
||||
NBTTagCompound stirling = new NBTTagCompound();
|
||||
stirling.setDouble("x", 7);
|
||||
stirling.setDouble("y", 1);
|
||||
stirling.setDouble("z", 7);
|
||||
stirling.setInteger("rotation", 2);
|
||||
stirling.setBoolean("hasCog", true);
|
||||
brickScene.add(new ActionSetActorData(0, stirling));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionUpdateActor(0, "speed", 5F));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionUpdateActor(0, "speed", 10F));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionUpdateActor(0, "speed", 15F));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionUpdateActor(0, "speed", 2F));
|
||||
brickScene.add(new ActionUpdateActor(0, "hasCog", false));
|
||||
brickScene.add(new ActionWait(20));
|
||||
brickScene.add(new ActionRotate(360, 0, 20));
|
||||
brickScene.add(new ActionWait(100));
|
||||
|
||||
this.testScript.addScene(startingScene).addScene(brickScene);
|
||||
}
|
||||
@ -124,7 +148,7 @@ public class GuiWorldInAJar extends GuiScreen {
|
||||
double scale = -10;
|
||||
GL11.glTranslated(width / 2, height / 2 + 70, 100);
|
||||
GL11.glScaled(scale, scale, scale);
|
||||
GL11.glScaled(1, 1, 0.01); // increadible flattening power
|
||||
GL11.glScaled(1, 1, 0.01); //incredible flattening power
|
||||
|
||||
double pitch = testScript.lastRotationPitch + (testScript.rotationPitch - testScript.lastRotationPitch) * testScript.interp;
|
||||
double yaw = testScript.lastRotationYaw + (testScript.rotationYaw - testScript.lastRotationYaw) * testScript.interp;
|
||||
@ -150,9 +174,27 @@ public class GuiWorldInAJar extends GuiScreen {
|
||||
|
||||
Tessellator.instance.draw();
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glPopMatrix();
|
||||
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240F, 240F);
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
GL11.glPushMatrix();
|
||||
|
||||
GL11.glTranslated(width / 2, height / 2 + 70, 100);
|
||||
GL11.glScaled(scale, scale, scale);
|
||||
GL11.glScaled(1, 1, 0.01);
|
||||
GL11.glRotated(pitch, 1, 0, 0);
|
||||
GL11.glRotated(yaw, 0, 1, 0);
|
||||
GL11.glTranslated(-7, 0 , -7);
|
||||
GL11.glTranslated(world.sizeX / 2D, 0 , world.sizeZ / 2D);
|
||||
GL11.glTranslated(world.sizeX / -2D, 0 , world.sizeZ / -2D);
|
||||
|
||||
for(Entry<Integer, ISpecialActor> actor : this.testScript.actors.entrySet()) {
|
||||
GL11.glPushMatrix();
|
||||
actor.getValue().draw(this.testScript.ticksElapsed, this.testScript.interp);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
|
||||
@ -59,7 +59,11 @@ public class JarScript {
|
||||
nextTick = true;
|
||||
}
|
||||
|
||||
this.interp = MathHelper.clamp_float((float) (now - this.lastTick) / 50F, 0F, 1F);
|
||||
if(this.currentScene != null) {
|
||||
this.interp = MathHelper.clamp_float((float) (now - this.lastTick) / 50F, 0F, 1F);
|
||||
} else {
|
||||
this.interp = 0;
|
||||
}
|
||||
|
||||
if(nextTick) {
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ public class WorldInAJar implements IBlockAccess {
|
||||
if(x < 0 || x >= sizeX || y < 0 || y >= sizeY || z < 0 || z >= sizeZ)
|
||||
return null;
|
||||
|
||||
TileEntity tile = this.tiles[x][y][z];
|
||||
//TileEntity tile = this.tiles[x][y][z];
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -34,5 +34,6 @@ public class ActorTileEntity implements ISpecialActor {
|
||||
if(o instanceof Integer) this.data.setInteger(tag, (Integer) o);
|
||||
if(o instanceof Float) this.data.setFloat(tag, (Float) o);
|
||||
if(o instanceof Double) this.data.setDouble(tag, (Double) o);
|
||||
if(o instanceof Boolean) this.data.setBoolean(tag, (Boolean) o);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"modid": "hbm",
|
||||
"name": "Hbm's Nuclear Tech",
|
||||
"description": "A mod that adds weapons, nuclear themed stuff and machines",
|
||||
"version":"1.0.27_X4334",
|
||||
"version":"1.0.27_X4336",
|
||||
"mcversion": "1.7.10",
|
||||
"url": "",
|
||||
"updateUrl": "",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user