mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
NEEEEEAAAAR, FAAAAAAR, WHEREEEEEEEEEEEVER YOU AAAAAARE
I BELIIIIEEEEEVE THAT MY HEART WILL, GO OOOOOOO-OOOOOON
This commit is contained in:
parent
0128164deb
commit
c943eb62a3
@ -0,0 +1,6 @@
|
||||
## Changed
|
||||
* After three quarters of a decade, three separate models, countless rebalances and hours of senseless yapping, the industrial generator has finally met its end. Suddenly, yet not unsurprisingly, on this here day the industrial generator has closed its eyes for the final time. It was a long and eventful journey, but as with all things in life, it too had to come to an end.
|
||||
* And this is why we can't ever have anything nice
|
||||
|
||||
## Fixed
|
||||
* WarTec should now be compatible again
|
||||
@ -1,6 +1,10 @@
|
||||
package com.hbm.blocks.machine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.blocks.ILookOverlay;
|
||||
import com.hbm.main.MainRegistry;
|
||||
import com.hbm.tileentity.TileEntityProxyCombo;
|
||||
import com.hbm.tileentity.machine.TileEntityMachineIGenerator;
|
||||
@ -10,9 +14,10 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class MachineIGenerator extends BlockDummyable {
|
||||
public class MachineIGenerator extends BlockDummyable implements ILookOverlay {
|
||||
|
||||
public MachineIGenerator(Material p_i45386_1_) {
|
||||
super(p_i45386_1_);
|
||||
@ -59,8 +64,7 @@ public class MachineIGenerator extends BlockDummyable {
|
||||
|
||||
TileEntityMachineIGenerator gen = (TileEntityMachineIGenerator)world.getTileEntity(pos[0], pos[1], pos[2]);
|
||||
|
||||
if(gen != null)
|
||||
FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]);
|
||||
//if(gen != null) FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
@ -71,19 +75,28 @@ public class MachineIGenerator extends BlockDummyable {
|
||||
@Override
|
||||
public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
|
||||
super.fillSpace(world, x, y, z, dir, o);
|
||||
this.makeExtra(world, x + dir.offsetX * (o - 3), y, z + dir.offsetZ * (o - 3));
|
||||
/*this.makeExtra(world, x + dir.offsetX * (o - 3), y, z + dir.offsetZ * (o - 3));
|
||||
this.makeExtra(world, x + dir.offsetX * (o - 2), y, z + dir.offsetZ * (o - 2));
|
||||
this.makeExtra(world, x + dir.offsetX * (o - 1), y, z + dir.offsetZ * (o - 1));
|
||||
this.makeExtra(world, x + dir.offsetX * (o + 2), y, z + dir.offsetZ * (o + 2));
|
||||
this.makeExtra(world, x + dir.offsetX * (o + 2), y, z + dir.offsetZ * (o + 2));*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getDimensions() {
|
||||
return new int [] {2, 0, 3, 2, 1, 1};
|
||||
//return new int [] {2, 0, 3, 2, 1, 1};
|
||||
return new int [] {0, 0, 0, 0, 0, 0};
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getOffset() {
|
||||
return 2;
|
||||
//return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void printHook(Pre event, World world, int x, int y, int z) {
|
||||
List<String> text = new ArrayList();
|
||||
text.add("In memory of all that we have lost");
|
||||
ILookOverlay.printGeneric(event, "Industrial Generator Memorial", 0xff8000, 0x804000, text);
|
||||
}
|
||||
}
|
||||
|
||||
@ -394,7 +394,7 @@ public class AnvilRecipes {
|
||||
|
||||
pullFromAssembler(new ComparableStack(ModBlocks.machine_diesel), 2);
|
||||
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(
|
||||
/*constructionRecipes.add(new AnvilConstructionRecipe(
|
||||
new AStack[] {
|
||||
new OreDictStack(STEEL.ingot(), 6),
|
||||
new OreDictStack(IRON.plate528(), 8),
|
||||
@ -403,7 +403,7 @@ public class AnvilRecipes {
|
||||
new ComparableStack(ModItems.turbine_titanium, 1),
|
||||
new ComparableStack(ModItems.thermo_element, 3),
|
||||
new ComparableStack(ModItems.crt_display, 1)
|
||||
}, new AnvilOutput(new ItemStack(ModBlocks.machine_industrial_generator))).setTier(2));
|
||||
}, new AnvilOutput(new ItemStack(ModBlocks.machine_industrial_generator))).setTier(2));*/
|
||||
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(
|
||||
new AStack[] {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.hbm.render.tileentity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.main.ResourceManager;
|
||||
@ -30,6 +31,11 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
GL11.glTranslated(0, 0, 1);
|
||||
GL11.glScaled(1D/6D, 1D/6D, 1D/6D);
|
||||
GL11.glTranslated(0, 0, -1);
|
||||
|
||||
bindTexture(ResourceManager.igen_tex);
|
||||
ResourceManager.igen.renderPart("Body");
|
||||
@ -39,6 +45,8 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
|
||||
GL11.glRotatef(-rot, 0, 0, 1);
|
||||
GL11.glTranslated(0, -1.5D, 0);
|
||||
ResourceManager.igen.renderPart("Rotor");
|
||||
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
|
||||
if(!worldObj.isRemote) {
|
||||
/*if(!worldObj.isRemote) {
|
||||
|
||||
boolean con = GeneralConfig.enableLBSM && GeneralConfig.enableLBSMIGen;
|
||||
|
||||
@ -252,7 +252,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
|
||||
this.rotation -= 360;
|
||||
this.prevRotation -= 360;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 25 KiB |
Loading…
x
Reference in New Issue
Block a user