i worked all day and achieved nothing

This commit is contained in:
Bob 2021-07-30 20:43:05 +02:00
parent c626f58582
commit b86cdaf1e6
29 changed files with 2631 additions and 38 deletions

View File

@ -127,6 +127,7 @@ public class ModBlocks {
public static Block basalt;
public static Block basalt_sulfur;
public static Block basalt_fluorite;
public static Block basalt_asbestos;
public static Block basalt_smooth;
public static Block basalt_brick;
@ -956,6 +957,8 @@ public class ModBlocks {
public static final int guiID_maxwell = 120;
public static Block turret_fritz;
public static final int guiID_fritz = 122;
public static Block turret_brandon;
public static final int guiID_brandon = 122;
public static Block rbmk_rod;
public static Block rbmk_rod_mod;
@ -1040,7 +1043,19 @@ public class ModBlocks {
public static Block corium_block;
public static Fluid corium_fluid;
public static final Material fluidcorium = (new MaterialLiquid(MapColor.brownColor));
public static final Material fluidcorium = (new MaterialLiquid(MapColor.brownColor) {
@Override
public boolean blocksMovement() {
return true;
}
@Override
public Material setImmovableMobility() {
return super.setImmovableMobility();
}
}.setImmovableMobility());
public static Block volcanic_lava_block;
public static Fluid volcanic_lava_fluid;
@ -1194,22 +1209,23 @@ public class ModBlocks {
gneiss_chiseled = new BlockPillar(Material.rock, RefStrings.MODID + ":gneiss_tile").setBlockName("gneiss_chiseled").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":gneiss_chiseled");
stone_depth = new BlockDepth().setBlockName("stone_depth").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":stone_depth");
ore_depth_cinnebar = new BlockOre(Material.rock).setBlockName("ore_depth_cinnebar").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_cinnebar");
ore_depth_zirconium = new BlockOre(Material.rock).setBlockName("ore_depth_zirconium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_zirconium");
cluster_depth_iron = new BlockOre(Material.rock).setBlockName("cluster_depth_iron").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_iron");
cluster_depth_titanium = new BlockOre(Material.rock).setBlockName("cluster_depth_titanium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_titanium");
cluster_depth_tungsten = new BlockOre(Material.rock).setBlockName("cluster_depth_tungsten").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_tungsten");
ore_depth_cinnebar = new BlockDepthOre().setBlockName("ore_depth_cinnebar").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ore_depth_cinnebar");
ore_depth_zirconium = new BlockDepthOre().setBlockName("ore_depth_zirconium").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ore_depth_zirconium");
cluster_depth_iron = new BlockDepthOre().setBlockName("cluster_depth_iron").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":cluster_depth_iron");
cluster_depth_titanium = new BlockDepthOre().setBlockName("cluster_depth_titanium").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":cluster_depth_titanium");
cluster_depth_tungsten = new BlockDepthOre().setBlockName("cluster_depth_tungsten").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":cluster_depth_tungsten");
depth_brick = new BlockDepth().setBlockName("depth_brick").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":depth_brick");
depth_tiles = new BlockDepth().setBlockName("depth_tiles").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":depth_tiles");
depth_nether_brick = new BlockDepth().setBlockName("depth_nether_brick").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":depth_nether_brick");
depth_nether_tiles = new BlockDepth().setBlockName("depth_nether_tiles").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":depth_nether_tiles");
stone_depth_nether = new BlockDepth().setBlockName("stone_depth_nether").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":stone_depth_nether");
ore_depth_nether_neodymium = new BlockOre(Material.rock).setBlockName("ore_depth_nether_neodymium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_nether_neodymium");
stone_depth_nether = new BlockDepth().setBlockName("stone_depth_nether").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":stone_depth_nether");
ore_depth_nether_neodymium = new BlockDepthOre().setBlockName("ore_depth_nether_neodymium").setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ore_depth_nether_neodymium");
basalt = new BlockGeneric(Material.rock).setBlockName("basalt").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt");
basalt_sulfur = new BlockOre(Material.rock).setBlockName("basalt_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt_sulfur");
basalt_fluorite = new BlockOre(Material.rock).setBlockName("basalt_fluorite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt_fluorite");
basalt_asbestos = new BlockOutgas(Material.rock, true, 5, true).setBlockName("basalt_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt_asbestos");
basalt_smooth = new BlockGeneric(Material.rock).setBlockName("basalt_smooth").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt_smooth");
basalt_brick = new BlockGeneric(Material.rock).setBlockName("basalt_brick").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":basalt_brick");
@ -1807,6 +1823,7 @@ public class ModBlocks {
turret_howard = new TurretHoward(Material.iron).setBlockName("turret_howard").setHardness(5.0F).setResistance(600.0F).setCreativeTab(MainRegistry.weaponTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
turret_maxwell = new TurretMaxwell(Material.iron).setBlockName("turret_maxwell").setHardness(5.0F).setResistance(600.0F).setCreativeTab(MainRegistry.weaponTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
turret_fritz = new TurretFritz(Material.iron).setBlockName("turret_fritz").setHardness(5.0F).setResistance(600.0F).setCreativeTab(MainRegistry.weaponTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
turret_brandon = new TurretBrandon(Material.iron).setBlockName("turret_brandon").setHardness(5.0F).setResistance(600.0F).setCreativeTab(MainRegistry.weaponTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
rbmk_rod = new RBMKRod(false).setBlockName("rbmk_rod").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_element");
rbmk_rod_mod = new RBMKRod(true).setBlockName("rbmk_rod_mod").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_element_mod");
@ -2129,6 +2146,7 @@ public class ModBlocks {
//Basalt ores
GameRegistry.registerBlock(basalt_sulfur, basalt_sulfur.getUnlocalizedName());
GameRegistry.registerBlock(basalt_fluorite, basalt_fluorite.getUnlocalizedName());
GameRegistry.registerBlock(basalt_asbestos, basalt_asbestos.getUnlocalizedName());
//End Ores
@ -2447,6 +2465,7 @@ public class ModBlocks {
GameRegistry.registerBlock(turret_howard, turret_howard.getUnlocalizedName());
GameRegistry.registerBlock(turret_maxwell, turret_maxwell.getUnlocalizedName());
GameRegistry.registerBlock(turret_fritz, turret_fritz.getUnlocalizedName());
GameRegistry.registerBlock(turret_brandon, turret_brandon.getUnlocalizedName());
//Mines
GameRegistry.registerBlock(mine_ap, mine_ap.getUnlocalizedName());

View File

@ -88,7 +88,7 @@ public class VolcanicBlock extends BlockFluidClassic {
count++;
}
if(!world.isRemote && ((!this.isSourceBlock(world, x, y, z) && count < 2) || (rand.nextInt(5) == 0) && count < 5) && world.getBlock(x, y - 1, z).isNormalCube()) {
if(!world.isRemote && ((!this.isSourceBlock(world, x, y, z) && count < 2) || (rand.nextInt(5) == 0) && count < 5) && world.getBlock(x, y - 1, z) != this) {
int r = rand.nextInt(200);
@ -96,6 +96,8 @@ public class VolcanicBlock extends BlockFluidClassic {
world.setBlock(x, y, z, ModBlocks.basalt_sulfur);
else if(r == 2)
world.setBlock(x, y, z, ModBlocks.basalt_asbestos);
else if(r == 3)
world.setBlock(x, y, z, ModBlocks.basalt_fluorite);
else
world.setBlock(x, y, z, ModBlocks.basalt);
}

View File

@ -0,0 +1,52 @@
package com.hbm.blocks.generic;
import java.util.Random;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import net.minecraft.item.Item;
public class BlockDepthOre extends BlockDepth {
@Override
public Item getItemDropped(int metadata, Random rand, int fortune) {
if(this == ModBlocks.cluster_depth_iron) {
return ModItems.crystal_iron;
}
if(this == ModBlocks.cluster_depth_titanium) {
return ModItems.crystal_titanium;
}
if(this == ModBlocks.cluster_depth_tungsten) {
return ModItems.crystal_tungsten;
}
if(this == ModBlocks.ore_depth_cinnebar) {
return ModItems.cinnebar;
}
if(this == ModBlocks.ore_depth_zirconium) {
return ModItems.nugget_zirconium;
}
if(this == ModBlocks.ore_depth_nether_neodymium) {
return ModItems.fragment_neodymium;
}
return super.getItemDropped(metadata, rand, fortune);
}
@Override
public int quantityDropped(Random rand) {
if(this == ModBlocks.ore_depth_cinnebar) {
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_depth_zirconium) {
return 2 + rand.nextInt(2);
}
if(this == ModBlocks.ore_depth_nether_neodymium) {
return 2 + rand.nextInt(2);
}
return super.quantityDropped(rand);
}
}

View File

@ -43,7 +43,7 @@ public class BlockOre extends Block {
@Override
public Item getItemDropped(int i, Random rand, int j) {
if(this == ModBlocks.ore_fluorite) {
if(this == ModBlocks.ore_fluorite || this == ModBlocks.basalt_fluorite) {
return ModItems.fluorite;
}
if(this == ModBlocks.ore_niter) {
@ -198,37 +198,22 @@ public class BlockOre extends Block {
if(this == ModBlocks.ore_lignite) {
return ModItems.lignite;
}
if(this == ModBlocks.cluster_depth_iron) {
return ModItems.crystal_iron;
}
if(this == ModBlocks.cluster_depth_titanium) {
return ModItems.crystal_titanium;
}
if(this == ModBlocks.cluster_depth_tungsten) {
return ModItems.crystal_tungsten;
}
if(this == ModBlocks.ore_cinnebar || this == ModBlocks.ore_depth_cinnebar) {
if(this == ModBlocks.ore_cinnebar) {
return ModItems.cinnebar;
}
if(this == ModBlocks.ore_depth_zirconium) {
return ModItems.nugget_zirconium;
}
if(this == ModBlocks.ore_coltan) {
return ModItems.fragment_coltan;
}
if(this == ModBlocks.ore_cobalt || this == ModBlocks.ore_nether_cobalt) {
return ModItems.fragment_cobalt;
}
if(this == ModBlocks.ore_depth_nether_neodymium) {
return ModItems.fragment_neodymium;
}
return Item.getItemFromBlock(this);
}
@Override
public int quantityDropped(Random rand) {
if(this == ModBlocks.ore_fluorite) {
if(this == ModBlocks.ore_fluorite || this == ModBlocks.basalt_fluorite) {
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_niter) {
@ -246,21 +231,12 @@ public class BlockOre extends Block {
if(this == ModBlocks.block_meteor_treasure) {
return 1 + rand.nextInt(3);
}
if(this == ModBlocks.ore_depth_cinnebar) {
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_depth_zirconium) {
return 2 + rand.nextInt(2);
}
if(this == ModBlocks.ore_cobalt) {
return 4 + rand.nextInt(6);
}
if(this == ModBlocks.ore_nether_cobalt) {
return 5 + rand.nextInt(8);
}
if(this == ModBlocks.ore_depth_nether_neodymium) {
return 2 + rand.nextInt(2);
}
return 1;
}

View File

@ -0,0 +1,32 @@
package com.hbm.blocks.turret;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.turret.TileEntityTurretBrandon;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class TurretBrandon extends TurretBaseNT {
public TurretBrandon(Material mat) {
super(mat);
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
if(meta >= 12)
return new TileEntityTurretBrandon();
return new TileEntityProxyCombo(true, true, false);
}
@Override
public void openGUI(World world, EntityPlayer player, int x, int y, int z) {
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_brandon, world, x, y, z);
}
}

View File

@ -51,7 +51,7 @@ public class EntityMissileVolcano extends EntityMissileBaseAdvanced {
@Override
public ItemStack getDebrisRareDrop() {
return null;
return new ItemStack(ModItems.warhead_volcano);
}
@Override

View File

@ -181,6 +181,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModItems.warhead_nuclear, 1), new AStack[] {new ComparableStack(ModItems.boy_shielding, 1), new ComparableStack(ModItems.boy_target, 1), new ComparableStack(ModItems.boy_bullet, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 12), },300);
makeRecipe(new ComparableStack(ModItems.warhead_mirvlet, 1), new AStack[] {new OreDictStack("ingotSteel", 5), new OreDictStack("plateSteel", 18), new ComparableStack(ModItems.ingot_pu239, 1), new ComparableStack(Blocks.tnt, 2), },250);
makeRecipe(new ComparableStack(ModItems.warhead_mirv, 1), new AStack[] {new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.ingot_pu239, 1), new ComparableStack(Blocks.tnt, 8), new OreDictStack("plateDenseLead", 6), new ComparableStack(ModItems.lithium, 4), new ComparableStack(ModItems.cell_deuterium, 6), },500);
makeRecipe(new ComparableStack(ModItems.warhead_volcano, 1), new AStack[] {new OreDictStack("plateTitanium", 24), new OreDictStack("plateSteel", 16), new ComparableStack(ModBlocks.det_nuke, 3), new OreDictStack("blockUranium238", 24) }, 600);
makeRecipe(new ComparableStack(ModItems.warhead_thermo_endo, 1), new AStack[] {new ComparableStack(ModBlocks.therm_endo, 2), new OreDictStack("plateTitanium", 12), new OreDictStack("plateSteel", 6), },300);
makeRecipe(new ComparableStack(ModItems.warhead_thermo_exo, 1), new AStack[] {new ComparableStack(ModBlocks.therm_exo, 2), new OreDictStack("plateTitanium", 12), new OreDictStack("plateSteel", 6), },300);
makeRecipe(new ComparableStack(ModItems.fuel_tank_small, 1), new AStack[] {new ComparableStack(ModItems.canister_kerosene, 4), new OreDictStack("plateTitanium", 6), new OreDictStack("plateSteel", 2), },100);
@ -340,6 +341,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModItems.missile_drill, 1), new AStack[] {new ComparableStack(ModItems.warhead_buster_large, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier3, 1), },350);
makeRecipe(new ComparableStack(ModItems.missile_nuclear, 1), new AStack[] {new ComparableStack(ModItems.warhead_nuclear, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier4, 1), },500);
makeRecipe(new ComparableStack(ModItems.missile_nuclear_cluster, 1), new AStack[] {new ComparableStack(ModItems.warhead_mirv, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier5, 1), },600);
makeRecipe(new ComparableStack(ModItems.missile_volcano, 1), new AStack[] {new ComparableStack(ModItems.warhead_volcano, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 20), new OreDictStack("plateSteel", 24), new OreDictStack("plateAluminum", 16), new ComparableStack(ModItems.circuit_targeting_tier5, 1), },600);
makeRecipe(new ComparableStack(ModItems.missile_endo, 1), new AStack[] {new ComparableStack(ModItems.warhead_thermo_endo, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier4, 1), },350);
makeRecipe(new ComparableStack(ModItems.missile_exo, 1), new AStack[] {new ComparableStack(ModItems.warhead_thermo_exo, 1), new ComparableStack(ModItems.fuel_tank_large, 1), new ComparableStack(ModItems.thruster_large, 1), new OreDictStack("plateTitanium", 14), new OreDictStack("plateSteel", 20), new OreDictStack("plateAluminum", 12), new ComparableStack(ModItems.circuit_targeting_tier4, 1), },350);
makeRecipe(new ComparableStack(ModItems.gun_defabricator, 1), new AStack[] {new OreDictStack("ingotSteel", 2), new ComparableStack(ModItems.ingot_polymer, 8), new OreDictStack("plateIron", 5), new ComparableStack(ModItems.mechanism_special, 3), new ComparableStack(Items.diamond, 1), new ComparableStack(ModItems.plate_dalekanium, 3), },200);

View File

@ -568,6 +568,7 @@ public class ModItems {
public static Item warhead_nuclear;
public static Item warhead_mirvlet;
public static Item warhead_mirv;
public static Item warhead_volcano;
public static Item warhead_thermo_endo;
public static Item warhead_thermo_exo;
@ -2848,6 +2849,7 @@ public class ModItems {
warhead_nuclear = new Item().setUnlocalizedName("warhead_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_nuclear");
warhead_mirvlet = new Item().setUnlocalizedName("warhead_mirvlet").setCreativeTab(null).setTextureName(RefStrings.MODID + ":warhead_mirvlet");
warhead_mirv = new Item().setUnlocalizedName("warhead_mirv").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_mirv");
warhead_volcano = new Item().setUnlocalizedName("warhead_volcano").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_volcano");
warhead_thermo_endo = new Item().setUnlocalizedName("warhead_thermo_endo").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_thermo_endo");
warhead_thermo_exo = new Item().setUnlocalizedName("warhead_thermo_exo").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_thermo_exo");
@ -5729,6 +5731,7 @@ public class ModItems {
GameRegistry.registerItem(warhead_nuclear, warhead_nuclear.getUnlocalizedName());
GameRegistry.registerItem(warhead_mirvlet, warhead_mirvlet.getUnlocalizedName());
GameRegistry.registerItem(warhead_mirv, warhead_mirv.getUnlocalizedName());
GameRegistry.registerItem(warhead_volcano, warhead_volcano.getUnlocalizedName());
GameRegistry.registerItem(warhead_thermo_endo, warhead_thermo_endo.getUnlocalizedName());
GameRegistry.registerItem(warhead_thermo_exo, warhead_thermo_exo.getUnlocalizedName());
GameRegistry.registerItem(fuel_tank_small, fuel_tank_small.getUnlocalizedName());

View File

@ -134,6 +134,7 @@ public class ClientProxy extends ServerProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretHoward.class, new RenderTurretHoward());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretMaxwell.class, new RenderTurretMaxwell());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretFritz.class, new RenderTurretFritz());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretBrandon.class, new RenderTurretBrandon());
//mines
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLandmine.class, new RenderLandmine());
//cel prime

View File

@ -473,6 +473,7 @@ public class MainRegistry {
GameRegistry.registerTileEntity(TileEntityTurretHoward.class, "tileentity_turret_howard");
GameRegistry.registerTileEntity(TileEntityTurretMaxwell.class, "tileentity_turret_maxwell");
GameRegistry.registerTileEntity(TileEntityTurretFritz.class, "tileentity_turret_fritz");
GameRegistry.registerTileEntity(TileEntityTurretBrandon.class, "tileentity_turret_brandon");
GameRegistry.registerTileEntity(TileEntitySILEX.class, "tileentity_silex");
GameRegistry.registerTileEntity(TileEntityFEL.class, "tileentity_fel");
GameRegistry.registerTileEntity(TileEntityDemonLamp.class, "tileentity_demonlamp");

View File

@ -45,6 +45,7 @@ public class ResourceManager {
public static final IModelCustom turret_howard = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_howard.obj"));
public static final IModelCustom turret_maxwell = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_microwave.obj"));
public static final IModelCustom turret_fritz = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_fritz.obj"));
public static final IModelCustom turret_brandon = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_brandon.obj"));
//Landmines
public static final IModelCustom mine_ap = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/mine_ap.obj"));
@ -290,6 +291,9 @@ public class ResourceManager {
public static final ResourceLocation turret_howard_barrels_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/howard_barrels.png");
public static final ResourceLocation turret_maxwell_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/maxwell.png");
public static final ResourceLocation turret_fritz_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/fritz.png");
public static final ResourceLocation turret_brandon_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/brandon.png");
public static final ResourceLocation brandon_explosive = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/brandon_drum.png");
//Landmines
public static final ResourceLocation mine_ap_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_ap.png");

View File

@ -0,0 +1,43 @@
package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.turret.TileEntityTurretBrandon;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
public class RenderTurretBrandon extends RenderTurretBase {
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float interp) {
TileEntityTurretBrandon turret = (TileEntityTurretBrandon)te;
Vec3 pos = turret.getHorizontalOffset();
GL11.glPushMatrix();
GL11.glTranslated(x + pos.xCoord, y, z + pos.zCoord);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glShadeModel(GL11.GL_SMOOTH);
this.renderConnectors(turret, true, false, FluidType.NONE);
bindTexture(ResourceManager.turret_base_tex);
ResourceManager.turret_chekhov.renderPart("Base");
double pitch = Math.toDegrees(turret.lastRotationPitch + (turret.rotationPitch - turret.lastRotationPitch) * interp);
GL11.glTranslated(0, 1.5, 0);
GL11.glRotated(pitch, 0, 0, 1);
GL11.glTranslated(0, -1.5, 0);
bindTexture(ResourceManager.turret_brandon_tex);
ResourceManager.turret_brandon.renderPart("Launcher");
bindTexture(ResourceManager.brandon_explosive);
ResourceManager.turret_brandon.renderPart("Barrel");
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glPopMatrix();
}
}

View File

@ -0,0 +1,31 @@
package com.hbm.tileentity.turret;
import java.util.List;
public class TileEntityTurretBrandon extends TileEntityTurretBaseNT {
@Override
public long getMaxPower() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void updateFiringTick() {
// TODO Auto-generated method stub
}
@Override
protected List<Integer> getAmmoList() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
}

View File

@ -1611,6 +1611,7 @@ item.missile_soyuz.name=Soyuz-FG
item.missile_soyuz_lander.name=Orbitalmodul
item.missile_strong.name=Starke HE Rakete
item.missile_taint.name=Verdorbene Rakete
item.missile_volcano.name=Tectonic Missile
item.morning_glory.name=Zaunwinde
item.motor.name=Motor
item.motor_desh.name=Desh-Motor
@ -2024,8 +2025,10 @@ item.rbmk_fuel_balefire.name=Balefire-RBMK-Kernbrennstoff
item.rbmk_fuel_balefire_gold.name=Flammgold-RBMK-Kernbrennstoff
item.rbmk_fuel_drx.name=§cDigamma-RBMK-Kernbrennstoff
item.rbmk_fuel_empty.name=Leere RBMK Kernbrennstoffstäbe
item.rbmk_fuel_hea.name=HEA-242-RBMK-Kernbrennstoff
item.rbmk_fuel_hea241.name=HEA-241-RBMK-Kernbrennstoff
item.rbmk_fuel_hea242.name=HEA-242-RBMK-Kernbrennstoff
item.rbmk_fuel_heaus.name=HEAus-RBMK-Kernbrennstoff
item.rbmk_fuel_hen.name=HEN-RBMK-Kernbrennstoff
item.rbmk_fuel_hes.name=HES-RBMK-Kernbrennstoff
item.rbmk_fuel_hep.name=HEP-239-RBMK-Kernbrennstoff
item.rbmk_fuel_hep241.name=HEP-241-RBMK-Kernbrennstoff
@ -2046,11 +2049,15 @@ item.rbmk_fuel_pu238be.name=Pu238Be-RBMK-Neutronenquelle
item.rbmk_fuel_ra226be.name=Ra226Be-RBMK-Neutronenquelle
item.rbmk_fuel_thmeu.name=ThMEU-RBMK-Kernbrennstoff
item.rbmk_fuel_ueu.name=NU-RBMK-Kernbrennstoff
item.rbmk_lid.name=RBMK-Abdeckplatte
item.rbmk_lid_glass.name=RBMK-Glasabdeckplatte
item.rbmk_pellet_balefire.name=Balefire-Kernbrennstoffpellet
item.rbmk_pellet_balefire_gold.name=Flammgold-Kernbrennstoffpellet
item.rbmk_pellet_drx.name=§cDigamma-Kernbrennstoffpellet§r
item.rbmk_pellet_hea241.name=HEA-241-Kernbrennstoffpellet
item.rbmk_pellet_hea242.name=HEA-242-Kernbrennstoffpellet
item.rbmk_pellet_heaus.name=HEAus-Kernbrennstoffpellet
item.rbmk_pellet_hen.name=HEN-Kernbrennstoffpellet
item.rbmk_pellet_hep239.name=HEP-239-Kernbrennstoffpellet
item.rbmk_pellet_hep241.name=HEP-241-Kernbrennstoffpellet
item.rbmk_pellet_heu233.name=HEU-233-Kernbrennstoffpellet
@ -2446,6 +2453,7 @@ item.warhead_mirvlet.name=MIRV
item.warhead_nuclear.name=Atomsprengkopf
item.warhead_thermo_endo.name=Endothermischer Sprengkopf
item.warhead_thermo_exo.name=Exothermischer Sprengkopf
item.warhead_volcano.name=Tektonischer Sprengkopf
item.waste_mox.name=Erschöpfter MOX-Kernbrennstoff
item.waste_mox_hot.name=Erschöpfter MOX-Kernbrennstoff (Heiß)
item.waste_plutonium.name=Erschöpfter Plutoniumkernbrennstoff
@ -2565,6 +2573,7 @@ tile.barricade.name=Sandsäcke
tile.basalt.name=Basalt
tile.basalt_asbestos.name=Asbestreicher Basalt
tile.basalt_brick.name=Basaltziegel
tile.basalt_fluorite.name=Fluoritreicher Basalt
tile.basalt_polished.name=Polierter Basalt
tile.basalt_smooth.name=Glatter Basalt
tile.basalt_sulfur.name=Schwefelreicher Basalt
@ -2754,6 +2763,8 @@ tile.deco_titanium.name=Titan-Dekoblock
tile.deco_tungsten.name=Wolfram-Dekoblock
tile.decon.name=Spieler-Dekontaminierer
tile.depth_brick.name=Tiefenziegel
tile.depth_nether_brick.name=Nether-Tiefenziegel
tile.depth_nether_tiles.name=Nether-Tiefenfliesen
tile.depth_tiles.name=Tiefenfliesen
tile.det_charge.name=Sprengladung
tile.det_cord.name=Det Cord
@ -3190,6 +3201,7 @@ tile.vent_chlorine_seal.name=Chlorgassiegel
tile.vent_cloud.name=Wolken-Auslass
tile.vent_pink_cloud.name=Pinker Wolken-Auslass
tile.vitrified_barrel.name=Fass voll vitrifiziertem Atommüll
tile.volcano_core.name=Vulkankern
tile.waste_earth.name=Totes Gras
tile.waste_log.name=Verkohltes Holz
tile.waste_mycelium.name=Leuchtende Myzel

View File

@ -1679,6 +1679,7 @@ item.missile_soyuz.name=Soyuz-FG
item.missile_soyuz_lander.name=Orbital Module
item.missile_strong.name=Strong HE Missile
item.missile_taint.name=Taint-Tipped Missile
item.missile_volcano.name=Tectonic Missile
item.morning_glory.name=Morning Glory
item.motor.name=Motor
item.motor_desh.name=Desh Motor
@ -2092,8 +2093,10 @@ item.rbmk_fuel_balefire.name=Balefire RBMK Fuel Rod
item.rbmk_fuel_balefire_gold.name=Flashgold RBMK Fuel Rod
item.rbmk_fuel_drx.name=§cDigamma RBMK Fuel Rod§r
item.rbmk_fuel_empty.name=Empty RBMK Fuel Rod
item.rbmk_fuel_hea241.name=HEA-241 RBMK Fuel Rod
item.rbmk_fuel_hea242.name=HEA-242 RBMK Fuel Rod
item.rbmk_fuel_heaus.name=HEAus RBMK Fuel Rod
item.rbmk_fuel_hen.name=HEN RBMK Fuel Rod
item.rbmk_fuel_hes.name=HES RBMK Fuel Rod
item.rbmk_fuel_hep.name=HEP-239 RBMK Fuel Rod
item.rbmk_fuel_hep241.name=HEP-241 RBMK Fuel Rod
@ -2119,8 +2122,10 @@ item.rbmk_lid_glass.name=RBMK Glass Cover Panel
item.rbmk_pellet_balefire.name=Balefire Fuel Pellet
item.rbmk_pellet_balefire_gold.name=Flashgold Fuel Pellet
item.rbmk_pellet_drx.name=§cDigamma Fuel Pellet§r
item.rbmk_pellet_hea241.name=HEA-241 Fuel Pellet
item.rbmk_pellet_hea242.name=HEA-242 Fuel Pellet
item.rbmk_pellet_heaus.name=HEAus Fuel Pellet
item.rbmk_pellet_hen.name=HEN Fuel Pellet
item.rbmk_pellet_hep239.name=HEP-239 Fuel Pellet
item.rbmk_pellet_hep241.name=HEP-241 Fuel Pellet
item.rbmk_pellet_heu233.name=HEU-233 Fuel Pellet
@ -2514,6 +2519,7 @@ item.warhead_mirvlet.name=MIRV
item.warhead_nuclear.name=Nuclear Warhead
item.warhead_thermo_endo.name=Endothermic Warhead
item.warhead_thermo_exo.name=Exothermic Warhead
item.warhead_volcano.name=Tectonic Warhead
item.waste_mox.name=Depleted MOX Fuel
item.waste_mox_hot.name=Depleted MOX Fuel (Hot)
item.waste_plutonium.name=Depleted Plutonium Fuel
@ -2633,6 +2639,7 @@ tile.barricade.name=Sand Bags
tile.basalt.name=Basalt
tile.basalt_asbestos.name=Asbestos-Rich Basalt
tile.basalt_brick.name=Basalt Bricks
tile.basalt_fluorite.name=Fluorite-Rich Basalt
tile.basalt_polished.name=Polished Basalt
tile.basalt_smooth.name=Smooth Basalt
tile.basalt_sulfur.name=Sulfur-Rich Basalt
@ -2838,6 +2845,8 @@ tile.deco_titanium.name=Titanium Deco Block
tile.deco_tungsten.name=Tungsten Deco Block
tile.decon.name=Player Decontaminator
tile.depth_brick.name=Depth Brick
tile.depth_nether_brick.name=Nether Depth Brick
tile.depth_nether_tiles.name=Nether Depth Tiles
tile.depth_tiles.name=Depth Tiles
tile.det_charge.name=Explosive Charge
tile.det_cord.name=Det Cord
@ -3274,6 +3283,7 @@ tile.vent_chlorine_seal.name=Chlorine Seal
tile.vent_cloud.name=Cloud Vent
tile.vent_pink_cloud.name=Pink Cloud Vent
tile.vitrified_barrel.name=Vitrified Nuclear Waste Drum
tile.volcano_core.name=Volcano Core
tile.waste_earth.name=Dead Grass
tile.waste_log.name=Charred Log
tile.waste_mycelium.name=Glowing Mycelium

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 608 B