Merge pull request #1096 from HbmMods/pr1083

Pr1083
This commit is contained in:
HbmMods 2023-07-01 20:27:59 +02:00 committed by GitHub
commit 738e698d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 1510 additions and 766 deletions

View File

@ -603,6 +603,7 @@ public class ModBlocks {
public static Block vault_door; public static Block vault_door;
public static Block blast_door; public static Block blast_door;
public static Block sliding_blast_door;
public static Block fire_door; public static Block fire_door;
public static Block transition_seal; public static Block transition_seal;
@ -2067,6 +2068,9 @@ public class ModBlocks {
vault_door = new VaultDoor(Material.iron).setBlockName("vault_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vault_door"); vault_door = new VaultDoor(Material.iron).setBlockName("vault_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vault_door");
blast_door = new BlastDoor(Material.iron).setBlockName("blast_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":blast_door"); blast_door = new BlastDoor(Material.iron).setBlockName("blast_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":blast_door");
sliding_blast_door = new BlockDoorGeneric(Material.iron, DoorDecl.SLIDE_DOOR).setBlockName("sliding_blast_door").setHardness(150.0F).setResistance(7500.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":sliding_blast_door");
fire_door = new BlockDoorGeneric(Material.iron, DoorDecl.FIRE_DOOR).setBlockName("fire_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fire_door"); fire_door = new BlockDoorGeneric(Material.iron, DoorDecl.FIRE_DOOR).setBlockName("fire_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fire_door");
transition_seal = new BlockDoorGeneric(Material.iron, DoorDecl.TRANSITION_SEAL).setBlockName("transition_seal").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":transition_seal"); transition_seal = new BlockDoorGeneric(Material.iron, DoorDecl.TRANSITION_SEAL).setBlockName("transition_seal").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":transition_seal");
@ -2991,6 +2995,7 @@ public class ModBlocks {
GameRegistry.registerBlock(blast_door, blast_door.getUnlocalizedName()); GameRegistry.registerBlock(blast_door, blast_door.getUnlocalizedName());
GameRegistry.registerBlock(fire_door, fire_door.getUnlocalizedName()); GameRegistry.registerBlock(fire_door, fire_door.getUnlocalizedName());
GameRegistry.registerBlock(transition_seal, transition_seal.getUnlocalizedName()); GameRegistry.registerBlock(transition_seal, transition_seal.getUnlocalizedName());
GameRegistry.registerBlock(sliding_blast_door, sliding_blast_door.getUnlocalizedName());
//Doors //Doors
GameRegistry.registerBlock(door_metal, door_metal.getUnlocalizedName()); GameRegistry.registerBlock(door_metal, door_metal.getUnlocalizedName());

View File

@ -3,6 +3,7 @@ package com.hbm.blocks.generic;
import java.util.List; import java.util.List;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.items.special.ItemDoorSkin;
import com.hbm.tileentity.DoorDecl; import com.hbm.tileentity.DoorDecl;
import com.hbm.tileentity.TileEntityDoorGeneric; import com.hbm.tileentity.TileEntityDoorGeneric;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -54,12 +55,14 @@ public class BlockDoorGeneric extends BlockDummyable {
TileEntityDoorGeneric door = (TileEntityDoorGeneric) world.getTileEntity(pos1[0], pos1[1], pos1[2]); TileEntityDoorGeneric door = (TileEntityDoorGeneric) world.getTileEntity(pos1[0], pos1[1], pos1[2]);
if(door != null) { if(door != null) {
if(playerIn.getHeldItem() != null && playerIn.getHeldItem().getItem() instanceof ItemDoorSkin) {
return door.setSkinIndex((byte) playerIn.getHeldItem().getItemDamage());
} else {
return door.tryToggle(playerIn); return door.tryToggle(playerIn);
} }
} }
if(!playerIn.isSneaking()) }
return true; return !playerIn.isSneaking();
return false;
} }
@Override @Override

View File

@ -201,6 +201,7 @@ public class ConsumableRecipes {
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gas_tester, 1), new Object[] { "G", "C", "I", 'G', GOLD.plate(), 'C', ModItems.circuit_aluminium, 'I', IRON.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gas_tester, 1), new Object[] { "G", "C", "I", 'G', GOLD.plate(), 'C', ModItems.circuit_aluminium, 'I', IRON.plate() });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.defuser_gold, 1), new Object[] { "GPG", "PRP", "GPG", 'G', Items.gunpowder, 'P', GOLD.plate(), 'R', "record" }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.defuser_gold, 1), new Object[] { "GPG", "PRP", "GPG", 'G', Items.gunpowder, 'P', GOLD.plate(), 'R', "record" });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.ballistic_gauntlet, 1), new Object[] { " WS", "WRS", " RS", 'W', ModItems.wire_copper, 'R', ModItems.ring_starmetal, 'S', STEEL.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ballistic_gauntlet, 1), new Object[] { " WS", "WRS", " RS", 'W', ModItems.wire_copper, 'R', ModItems.ring_starmetal, 'S', STEEL.plate() });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.night_vision, 1), "P P", "GCG", 'P', ANY_PLASTIC.ingot(), 'G', KEY_ANYGLASS, 'C', ModItems.circuit_gold);
//Stealth boy //Stealth boy
CraftingManager.addRecipeAuto(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Blocks.stone_button, 'L', Items.leather, 'I', STEEL.ingot(), 'C', ModItems.circuit_red_copper }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Blocks.stone_button, 'L', Items.leather, 'I', STEEL.ingot(), 'C', ModItems.circuit_red_copper });

View File

@ -2,6 +2,7 @@ package com.hbm.crafting;
import com.hbm.blocks.ModBlocks; import com.hbm.blocks.ModBlocks;
import com.hbm.inventory.OreDictManager; import com.hbm.inventory.OreDictManager;
import com.hbm.inventory.RecipesCommon;
import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.Fluids;
import static com.hbm.inventory.OreDictManager.*; import static com.hbm.inventory.OreDictManager.*;
@ -16,6 +17,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
/** /**
* For guns, ammo and the like * For guns, ammo and the like

View File

@ -10,11 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
public class EntityMinerRocket extends Entity { public class EntityMinerRocket extends Entity {
//0 landing, 1 unloading, 2 lifting //0 landing, 1 unloading, 2 lifting
public int timer = 0; public int timer = 0;
//0 asteroid, 1 moon
public String satelliteClassName = "com.hbm.saveddata.satellites.SatelliteMiner";
public EntityMinerRocket(World p_i1582_1_) { public EntityMinerRocket(World p_i1582_1_) {
super(p_i1582_1_); super(p_i1582_1_);
@ -24,13 +21,12 @@ public class EntityMinerRocket extends Entity {
@Override @Override
protected void entityInit() { protected void entityInit() {
this.dataWatcher.addObject(16, Integer.valueOf(0)); this.dataWatcher.addObject(16, 0);
this.dataWatcher.addObject(17, Integer.valueOf(0)); this.dataWatcher.addObject(17, 0);
} }
@Override @Override
public void onUpdate() { public void onUpdate() {
if(dataWatcher.getWatchableObjectInt(16) == 0) if(dataWatcher.getWatchableObjectInt(16) == 0)
motionY = -0.75; motionY = -0.75;
if(dataWatcher.getWatchableObjectInt(16) == 1) if(dataWatcher.getWatchableObjectInt(16) == 1)
@ -43,7 +39,6 @@ public class EntityMinerRocket extends Entity {
this.setPositionAndRotation(posX + motionX, posY + motionY, posZ + motionZ, 0.0F, 0.0F); this.setPositionAndRotation(posX + motionX, posY + motionY, posZ + motionZ, 0.0F, 0.0F);
if(dataWatcher.getWatchableObjectInt(16) == 0 && worldObj.getBlock((int)(posX - 0.5), (int)(posY - 0.5), (int)(posZ - 0.5)) == ModBlocks.sat_dock) { if(dataWatcher.getWatchableObjectInt(16) == 0 && worldObj.getBlock((int)(posX - 0.5), (int)(posY - 0.5), (int)(posZ - 0.5)) == ModBlocks.sat_dock) {
dataWatcher.updateObject(16, 1); dataWatcher.updateObject(16, 1);
motionY = 0; motionY = 0;
@ -55,7 +50,6 @@ public class EntityMinerRocket extends Entity {
} }
if(dataWatcher.getWatchableObjectInt(16) == 1) { if(dataWatcher.getWatchableObjectInt(16) == 1) {
if(!worldObj.isRemote && ticksExisted % 4 == 0) if(!worldObj.isRemote && ticksExisted % 4 == 0)
ExplosionLarge.spawnShock(worldObj, posX, posY, posZ, 1 + rand.nextInt(3), 1 + rand.nextGaussian()); ExplosionLarge.spawnShock(worldObj, posX, posY, posZ, 1 + rand.nextInt(3), 1 + rand.nextGaussian());
@ -79,7 +73,6 @@ public class EntityMinerRocket extends Entity {
dataWatcher.updateObject(16, nbt.getInteger("mode")); dataWatcher.updateObject(16, nbt.getInteger("mode"));
dataWatcher.updateObject(17, nbt.getInteger("sat")); dataWatcher.updateObject(17, nbt.getInteger("sat"));
timer = nbt.getInteger("timer"); timer = nbt.getInteger("timer");
satelliteClassName = nbt.getString("type");
} }
@Override @Override
@ -87,7 +80,5 @@ public class EntityMinerRocket extends Entity {
nbt.setInteger("mode", dataWatcher.getWatchableObjectInt(16)); nbt.setInteger("mode", dataWatcher.getWatchableObjectInt(16));
nbt.setInteger("sat", dataWatcher.getWatchableObjectInt(17)); nbt.setInteger("sat", dataWatcher.getWatchableObjectInt(17));
nbt.setInteger("timer", timer); nbt.setInteger("timer", timer);
nbt.setString("type", satelliteClassName);
} }
} }

View File

@ -2,19 +2,23 @@ package com.hbm.interfaces;
public interface IDoor { public interface IDoor {
public void open(); void open();
public void close(); void close();
public DoorState getState(); DoorState getState();
public void toggle(); void toggle();
public default boolean setTexture(String tex) { default boolean setTexture(String tex) {
return false; return false;
} }
public default void setTextureState(byte tex) { }; default void setTextureState(byte tex) { }
public enum DoorState { default boolean setSkinIndex(byte skinIndex) {
return false;
}
enum DoorState {
CLOSED, CLOSED,
OPEN, OPEN,
CLOSING, CLOSING,
OPENING; OPENING
} }
} }

View File

@ -1191,6 +1191,15 @@ public class AssemblerRecipes {
new OreDictStack(KEY_YELLOW, 4) new OreDictStack(KEY_YELLOW, 4)
}, 1200); }, 1200);
makeRecipe(new ComparableStack(ModBlocks.sliding_blast_door, 1), new AStack[] {
new OreDictStack(STEEL.plate(), 16),
new OreDictStack(W.ingot(), 8),
new ComparableStack(ModBlocks.reinforced_glass, 4),
new ComparableStack(ModItems.plate_polymer, 4),
new ComparableStack(ModItems.bolt_dura_steel, 8),
new ComparableStack(ModItems.motor, 2)
}, 200);
if(Loader.isModLoaded("Mekanism")) { if(Loader.isModLoaded("Mekanism")) {
Block mb = (Block) Block.blockRegistry.getObject("Mekanism:MachineBlock"); Block mb = (Block) Block.blockRegistry.getObject("Mekanism:MachineBlock");

View File

@ -2173,6 +2173,7 @@ public class ModItems {
public static Item gas_tester; public static Item gas_tester;
public static Item defuser_gold; public static Item defuser_gold;
public static Item ballistic_gauntlet; public static Item ballistic_gauntlet;
public static Item night_vision;
public static Item hazmat_helmet; public static Item hazmat_helmet;
public static Item hazmat_plate; public static Item hazmat_plate;
@ -2326,6 +2327,8 @@ public class ModItems {
public static Item door_office; public static Item door_office;
public static Item door_bunker; public static Item door_bunker;
public static Item sliding_blast_door_skin;
public static Item record_lc; public static Item record_lc;
public static Item record_ss; public static Item record_ss;
public static Item record_vc; public static Item record_vc;
@ -3405,6 +3408,7 @@ public class ModItems {
gas_tester = new ItemModSensor().setUnlocalizedName("gas_tester").setTextureName(RefStrings.MODID + ":gas_tester"); gas_tester = new ItemModSensor().setUnlocalizedName("gas_tester").setTextureName(RefStrings.MODID + ":gas_tester");
defuser_gold = new ItemModDefuser().setUnlocalizedName("defuser_gold").setTextureName(RefStrings.MODID + ":defuser_gold"); defuser_gold = new ItemModDefuser().setUnlocalizedName("defuser_gold").setTextureName(RefStrings.MODID + ":defuser_gold");
ballistic_gauntlet = new ItemModTwoKick().setUnlocalizedName("ballistic_gauntlet").setTextureName(RefStrings.MODID + ":ballistic_gauntlet"); ballistic_gauntlet = new ItemModTwoKick().setUnlocalizedName("ballistic_gauntlet").setTextureName(RefStrings.MODID + ":ballistic_gauntlet");
night_vision = new ItemModNightVision().setUnlocalizedName("night_vision").setTextureName(RefStrings.MODID + ":night_vision");
cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka");
cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum");
@ -5357,6 +5361,8 @@ public class ModItems {
door_office = new ItemModDoor().setUnlocalizedName("door_office").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_office"); door_office = new ItemModDoor().setUnlocalizedName("door_office").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_office");
door_bunker = new ItemModDoor().setUnlocalizedName("door_bunker").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_bunker"); door_bunker = new ItemModDoor().setUnlocalizedName("door_bunker").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_bunker");
sliding_blast_door_skin = new ItemSlidingBlastDoorSkin().setUnlocalizedName("sliding_blast_door_skin").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":sliding_blast_door_default");
record_lc = new ItemModRecord("lc").setUnlocalizedName("record_lc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_lc"); record_lc = new ItemModRecord("lc").setUnlocalizedName("record_lc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_lc");
record_ss = new ItemModRecord("ss").setUnlocalizedName("record_ss").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_ss"); record_ss = new ItemModRecord("ss").setUnlocalizedName("record_ss").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_ss");
record_vc = new ItemModRecord("vc").setUnlocalizedName("record_vc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_vc"); record_vc = new ItemModRecord("vc").setUnlocalizedName("record_vc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_vc");
@ -7623,6 +7629,7 @@ public class ModItems {
GameRegistry.registerItem(gas_tester, gas_tester.getUnlocalizedName()); GameRegistry.registerItem(gas_tester, gas_tester.getUnlocalizedName());
GameRegistry.registerItem(defuser_gold, defuser_gold.getUnlocalizedName()); GameRegistry.registerItem(defuser_gold, defuser_gold.getUnlocalizedName());
GameRegistry.registerItem(ballistic_gauntlet, ballistic_gauntlet.getUnlocalizedName()); GameRegistry.registerItem(ballistic_gauntlet, ballistic_gauntlet.getUnlocalizedName());
GameRegistry.registerItem(night_vision, night_vision.getUnlocalizedName());
//Chaos //Chaos
GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName());
@ -7974,6 +7981,7 @@ public class ModItems {
GameRegistry.registerItem(door_metal, door_metal.getUnlocalizedName()); GameRegistry.registerItem(door_metal, door_metal.getUnlocalizedName());
GameRegistry.registerItem(door_office, door_office.getUnlocalizedName()); GameRegistry.registerItem(door_office, door_office.getUnlocalizedName());
GameRegistry.registerItem(door_bunker, door_bunker.getUnlocalizedName()); GameRegistry.registerItem(door_bunker, door_bunker.getUnlocalizedName());
GameRegistry.registerItem(sliding_blast_door_skin, sliding_blast_door_skin.getUnlocalizedName());
//Records //Records
GameRegistry.registerItem(record_lc, record_lc.getUnlocalizedName()); GameRegistry.registerItem(record_lc, record_lc.getUnlocalizedName());

View File

@ -0,0 +1,41 @@
package com.hbm.items.armor;
import com.hbm.handler.ArmorModHandler;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumChatFormatting;
import java.util.List;
public class ItemModNightVision extends ItemArmorMod {
public ItemModNightVision() {
super(ArmorModHandler.helmet_only, true, false, false, false);
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
list.add(EnumChatFormatting.AQUA + I18n.format("item.night_vision.description.item"));
list.add("");
super.addInformation(itemstack, player, list, bool);
}
@Override
public void addDesc(List list, ItemStack stack, ItemStack armor) {
list.add(EnumChatFormatting.YELLOW + I18n.format("item.night_vision.description.in_armor", stack.getDisplayName()));
}
@Override
public void modUpdate(EntityLivingBase entity, ItemStack armor) {
if(!entity.worldObj.isRemote && entity instanceof EntityPlayer && armor.getItem() instanceof ArmorFSBPowered && ArmorFSBPowered.hasFSBArmor((EntityPlayer)entity)) {
entity.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0));
if(entity.getRNG().nextInt(50) == 0) {
armor.damageItem(1, entity);
}
}
}
}

View File

@ -0,0 +1,36 @@
package com.hbm.items.special;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
public class ItemDoorSkin extends Item {
protected final IIcon[] icons;
public ItemDoorSkin(int skinCount) {
setMaxStackSize(1);
icons = new IIcon[skinCount];
}
@Override
public boolean getHasSubtypes() {
return true;
}
@Override
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for(int i = 0; i < icons.length; i++) {
list.add(new ItemStack(item, 1, i));
}
}
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta) {
return icons[meta];
}
}

View File

@ -0,0 +1,28 @@
package com.hbm.items.special;
import com.hbm.lib.RefStrings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
public class ItemSlidingBlastDoorSkin extends ItemDoorSkin {
public ItemSlidingBlastDoorSkin() {
super(3);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister reg) {
this.itemIcon = reg.registerIcon(this.getIconString());
this.icons[0] = reg.registerIcon(RefStrings.MODID + ":sliding_blast_door_default");
this.icons[1] = reg.registerIcon(RefStrings.MODID + ":sliding_blast_door_variant1");
this.icons[2] = reg.registerIcon(RefStrings.MODID + ":sliding_blast_door_variant2");
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName(stack) + "." + stack.getItemDamage();
}
}

View File

@ -2,49 +2,7 @@ package com.hbm.items.weapon;
import java.util.List; import java.util.List;
import com.hbm.entity.grenade.EntityGrenadeASchrab; import com.hbm.entity.grenade.*;
import com.hbm.entity.grenade.EntityGrenadeBlackHole;
import com.hbm.entity.grenade.EntityGrenadeBreach;
import com.hbm.entity.grenade.EntityGrenadeBurst;
import com.hbm.entity.grenade.EntityGrenadeCloud;
import com.hbm.entity.grenade.EntityGrenadeCluster;
import com.hbm.entity.grenade.EntityGrenadeDynamite;
import com.hbm.entity.grenade.EntityGrenadeElectric;
import com.hbm.entity.grenade.EntityGrenadeFire;
import com.hbm.entity.grenade.EntityGrenadeFlare;
import com.hbm.entity.grenade.EntityGrenadeFrag;
import com.hbm.entity.grenade.EntityGrenadeGas;
import com.hbm.entity.grenade.EntityGrenadeGascan;
import com.hbm.entity.grenade.EntityGrenadeGeneric;
import com.hbm.entity.grenade.EntityGrenadeIFBouncy;
import com.hbm.entity.grenade.EntityGrenadeIFBrimstone;
import com.hbm.entity.grenade.EntityGrenadeIFConcussion;
import com.hbm.entity.grenade.EntityGrenadeIFGeneric;
import com.hbm.entity.grenade.EntityGrenadeIFHE;
import com.hbm.entity.grenade.EntityGrenadeIFHopwire;
import com.hbm.entity.grenade.EntityGrenadeIFImpact;
import com.hbm.entity.grenade.EntityGrenadeIFIncendiary;
import com.hbm.entity.grenade.EntityGrenadeIFMystery;
import com.hbm.entity.grenade.EntityGrenadeIFNull;
import com.hbm.entity.grenade.EntityGrenadeIFSpark;
import com.hbm.entity.grenade.EntityGrenadeIFSticky;
import com.hbm.entity.grenade.EntityGrenadeIFToxic;
import com.hbm.entity.grenade.EntityGrenadeLemon;
import com.hbm.entity.grenade.EntityGrenadeMIRV;
import com.hbm.entity.grenade.EntityGrenadeMk2;
import com.hbm.entity.grenade.EntityGrenadeNuclear;
import com.hbm.entity.grenade.EntityGrenadeNuke;
import com.hbm.entity.grenade.EntityGrenadePC;
import com.hbm.entity.grenade.EntityGrenadePlasma;
import com.hbm.entity.grenade.EntityGrenadePoison;
import com.hbm.entity.grenade.EntityGrenadePulse;
import com.hbm.entity.grenade.EntityGrenadeSchrabidium;
import com.hbm.entity.grenade.EntityGrenadeShrapnel;
import com.hbm.entity.grenade.EntityGrenadeSmart;
import com.hbm.entity.grenade.EntityGrenadeStrong;
import com.hbm.entity.grenade.EntityGrenadeTau;
import com.hbm.entity.grenade.EntityGrenadeZOMG;
import com.hbm.entity.grenade.EntityWastePearl;
import com.hbm.items.ModItems; import com.hbm.items.ModItems;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

View File

@ -1087,6 +1087,11 @@ public class CraftingManager {
ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_TRANSISTOR), ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_TRANSISTOR),
ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_BLANK) ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_BLANK)
}); });
addRecipeAuto(new ItemStack(ModItems.sliding_blast_door_skin), "SPS", "DPD", "SPS", 'P', Items.paper, 'D', "dye", 'S', STEEL.plate());
addShapelessAuto(new ItemStack(ModItems.sliding_blast_door_skin, 1, 1), new ItemStack(ModItems.sliding_blast_door_skin, 1, 0));
addShapelessAuto(new ItemStack(ModItems.sliding_blast_door_skin, 1, 2), new ItemStack(ModItems.sliding_blast_door_skin, 1, 1));
addShapelessAuto(new ItemStack(ModItems.sliding_blast_door_skin), new ItemStack(ModItems.sliding_blast_door_skin, 1, 2));
} }
public static void crumple() { public static void crumple() {

View File

@ -932,6 +932,7 @@ public class MainRegistry {
if(GeneralConfig.enableStatReRegistering) { if(GeneralConfig.enableStatReRegistering) {
logger.info("Attempting to re-register item stats..."); logger.info("Attempting to re-register item stats...");
StatHelper.resetStatShitFuck(); //shit yourself StatHelper.resetStatShitFuck(); //shit yourself
logger.info("Item stats re-registered");
} }
} }

View File

@ -292,6 +292,14 @@ public class ResourceManager {
public static final IModelCustom blast_door_slider = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_slider.obj")); public static final IModelCustom blast_door_slider = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_slider.obj"));
public static final IModelCustom blast_door_block = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_block.obj")); public static final IModelCustom blast_door_block = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_block.obj"));
//Sliding Blast Door
public static final ResourceLocation sliding_blast_door_tex = new ResourceLocation(RefStrings.MODID, "textures/models/doors/sliding_blast_door.png");
public static final ResourceLocation sliding_blast_door_variant1_tex = new ResourceLocation(RefStrings.MODID, "textures/models/doors/sliding_blast_door_variant1.png");
public static final ResourceLocation sliding_blast_door_variant2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/doors/sliding_blast_door_variant2.png");
public static AnimatedModel sliding_blast_door;
public static Animation sliding_blast_door_anim;
//Doors //Doors
public static AnimatedModel transition_seal; public static AnimatedModel transition_seal;
public static Animation transition_seal_anim; public static Animation transition_seal_anim;
@ -1369,5 +1377,8 @@ public class ResourceManager {
public static void loadAnimatedModels(){ public static void loadAnimatedModels(){
transition_seal = ColladaLoader.load(new ResourceLocation(RefStrings.MODID, "models/doors/seal.dae"), true); transition_seal = ColladaLoader.load(new ResourceLocation(RefStrings.MODID, "models/doors/seal.dae"), true);
transition_seal_anim = ColladaLoader.loadAnim(24040, new ResourceLocation(RefStrings.MODID, "models/doors/seal.dae")); transition_seal_anim = ColladaLoader.loadAnim(24040, new ResourceLocation(RefStrings.MODID, "models/doors/seal.dae"));
sliding_blast_door = ColladaLoader.load(new ResourceLocation(RefStrings.MODID, "models/doors/sliding_blast_door.dae"));
sliding_blast_door_anim = ColladaLoader.loadAnim(1200, new ResourceLocation(RefStrings.MODID, "models/doors/sliding_blast_door.dae"));
} }
} }

View File

@ -15,20 +15,22 @@ public class TEDoorAnimationPacket implements IMessage {
public int x, y, z; public int x, y, z;
public byte state; public byte state;
public byte skinIndex;
public byte texture; public byte texture;
public TEDoorAnimationPacket() { public TEDoorAnimationPacket() {
} }
public TEDoorAnimationPacket(int x, int y, int z, byte state) { public TEDoorAnimationPacket(int x, int y, int z, byte state) {
this(x, y, z, state, (byte) -1); this(x, y, z, state, (byte) 0, (byte) -1);
} }
public TEDoorAnimationPacket(int x, int y, int z, byte state, byte tex) { public TEDoorAnimationPacket(int x, int y, int z, byte state, byte skinIndex, byte tex) {
this.x = x; this.x = x;
this.y = y; this.y = y;
this.z = z; this.z = z;
this.state = state; this.state = state;
this.skinIndex = skinIndex;
this.texture = tex; this.texture = tex;
} }
@ -38,6 +40,7 @@ public class TEDoorAnimationPacket implements IMessage {
y = buf.readInt(); y = buf.readInt();
z = buf.readInt(); z = buf.readInt();
state = buf.readByte(); state = buf.readByte();
skinIndex = buf.readByte();
if(buf.readableBytes() == 1){ if(buf.readableBytes() == 1){
texture = buf.readByte(); texture = buf.readByte();
} }
@ -49,6 +52,7 @@ public class TEDoorAnimationPacket implements IMessage {
buf.writeInt(y); buf.writeInt(y);
buf.writeInt(z); buf.writeInt(z);
buf.writeByte(state); buf.writeByte(state);
buf.writeByte(skinIndex);
if(texture != -1){ if(texture != -1){
buf.writeByte(texture); buf.writeByte(texture);
} }
@ -63,6 +67,7 @@ public class TEDoorAnimationPacket implements IMessage {
TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z); TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z);
if(te instanceof IAnimatedDoor){ if(te instanceof IAnimatedDoor){
((IAnimatedDoor) te).handleNewState(m.state); ((IAnimatedDoor) te).handleNewState(m.state);
((IAnimatedDoor) te).setSkinIndex(m.skinIndex);
((IAnimatedDoor) te).setTextureState(m.texture); ((IAnimatedDoor) te).setTextureState(m.texture);
} }

View File

@ -65,7 +65,7 @@ public class RenderDoorGeneric extends TileEntitySpecialRenderer {
AnimatedModel animModel = door.getAnimatedModel(); AnimatedModel animModel = door.getAnimatedModel();
if(animModel != null){ if(animModel != null){
Animation anim = door.getAnim(); Animation anim = door.getAnim();
bindTexture(door.getTextureForPart("")); bindTexture(door.getTextureForPart(te.getSkinIndex(), ""));
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
long startTime = te.state > 1 ? te.animStartTime : time; long startTime = te.state > 1 ? te.animStartTime : time;
boolean reverse = te.state == 1 || te.state == 2; boolean reverse = te.state == 1 || te.state == 2;
@ -83,14 +83,14 @@ public class RenderDoorGeneric extends TileEntitySpecialRenderer {
if(!door.doesRender(p.getLeft(), false)) if(!door.doesRender(p.getLeft(), false))
continue; continue;
GL11.glPushMatrix(); GL11.glPushMatrix();
bindTexture(door.getTextureForPart(p.getLeft())); bindTexture(door.getTextureForPart(te.getSkinIndex(), p.getLeft()));
doPartTransform(door, p.getLeft(), openTicks, false); doPartTransform(door, p.getLeft(), openTicks, false);
GL11.glCallList(p.getRight()); GL11.glCallList(p.getRight());
for(String name : door.getChildren(p.getLeft())){ for(String name : door.getChildren(p.getLeft())){
if(!door.doesRender(name, true)) if(!door.doesRender(name, true))
continue; continue;
GL11.glPushMatrix(); GL11.glPushMatrix();
bindTexture(door.getTextureForPart(name)); bindTexture(door.getTextureForPart(te.getSkinIndex(), name));
doPartTransform(door, name, openTicks, true); doPartTransform(door, name, openTicks, true);
model.renderPart(name); model.renderPart(name);
GL11.glPopMatrix(); GL11.glPopMatrix();

View File

@ -1,3 +1,20 @@
package com.hbm.saveddata.satellites; package com.hbm.saveddata.satellites;
public class SatelliteLunarMiner extends SatelliteMiner { } import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.util.WeightedRandomObject;
import net.minecraft.item.ItemStack;
public class SatelliteLunarMiner extends SatelliteMiner {
static {
registerCargo(new WeightedRandomObject[] {
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 48), 5),
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 32), 7),
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 16), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_lithium, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_iron, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 1), 1)
});
}
}

View File

@ -1,8 +1,45 @@
package com.hbm.saveddata.satellites; package com.hbm.saveddata.satellites;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.util.WeightedRandomObject;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public class SatelliteMiner extends Satellite { public class SatelliteMiner extends Satellite {
/**
* {@link WeightedRandomObject} array with loot the satellite will deliver.
*/
private static WeightedRandomObject[] CARGO = new WeightedRandomObject[] {
new WeightedRandomObject(new ItemStack(ModItems.powder_aluminium, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_titanium, 2), 8),
new WeightedRandomObject(new ItemStack(ModItems.crystal_tungsten, 2), 7),
new WeightedRandomObject(new ItemStack(ModItems.powder_coal, 4), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_uranium, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_plutonium, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_thorium, 2), 7),
new WeightedRandomObject(new ItemStack(ModItems.powder_desh_mix, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_diamond, 2), 7),
new WeightedRandomObject(new ItemStack(Items.redstone, 5), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_nitan_mix, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_power, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_copper, 5), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_lead, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.fluorite, 4), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_lapis, 4), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_combine_steel, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_aluminium, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_gold, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_phosphorus, 1), 10),
new WeightedRandomObject(new ItemStack(ModBlocks.gravel_diamond, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_uranium, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_plutonium, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_trixite, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_starmetal, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 2), 4)
};
public long lastOp; public long lastOp;
@ -17,4 +54,20 @@ public class SatelliteMiner extends Satellite {
public void readFromNBT(NBTTagCompound nbt) { public void readFromNBT(NBTTagCompound nbt) {
lastOp = nbt.getLong("lastOp"); lastOp = nbt.getLong("lastOp");
} }
/**
* Replaces cargo of the satellite.
* @param cargo - Array of {@link WeightedRandomObject} representing the loot that will be delivered.
*/
public static void registerCargo(WeightedRandomObject[] cargo) {
CARGO = cargo;
}
/**
* Gets items the satellite can deliver.
* @return - Array of {@link WeightedRandomObject} of satellite loot.
*/
public WeightedRandomObject[] getCargo() {
return CARGO;
}
} }

View File

@ -1,82 +0,0 @@
package com.hbm.saveddata.satellites;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.util.WeightedRandomObject;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import java.util.HashMap;
public class SatelliteMinerCargoRegistry {
private static final HashMap<String, WeightedRandomObject[]> cargo = new HashMap<String, WeightedRandomObject[]>() {{
put(SatelliteMiner.class.getName(), new WeightedRandomObject[] {
new WeightedRandomObject(new ItemStack(ModItems.powder_aluminium, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_titanium, 2), 8),
new WeightedRandomObject(new ItemStack(ModItems.crystal_tungsten, 2), 7),
new WeightedRandomObject(new ItemStack(ModItems.powder_coal, 4), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_uranium, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_plutonium, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_thorium, 2), 7),
new WeightedRandomObject(new ItemStack(ModItems.powder_desh_mix, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_diamond, 2), 7),
new WeightedRandomObject(new ItemStack(Items.redstone, 5), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_nitan_mix, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_power, 2), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_copper, 5), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_lead, 3), 10),
new WeightedRandomObject(new ItemStack(ModItems.fluorite, 4), 15),
new WeightedRandomObject(new ItemStack(ModItems.powder_lapis, 4), 10),
new WeightedRandomObject(new ItemStack(ModItems.powder_combine_steel, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_aluminium, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_gold, 1), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_phosphorus, 1), 10),
new WeightedRandomObject(new ItemStack(ModBlocks.gravel_diamond, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_uranium, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_plutonium, 1), 3),
new WeightedRandomObject(new ItemStack(ModItems.crystal_trixite, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_starmetal, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 2), 4)
});
put(SatelliteLunarMiner.class.getName(), new WeightedRandomObject[] {
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 48), 5),
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 32), 7),
new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 16), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_lithium, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 5),
new WeightedRandomObject(new ItemStack(ModItems.crystal_iron, 1), 1),
new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 1), 1),
});
}};
/**
* Register cargo for specified satellite object
* @param o - Satellite object
* @param cargo - WeightedRandomObject array with loot
*/
public static void register(Object o, WeightedRandomObject[] cargo) {
SatelliteMinerCargoRegistry.cargo.put(o.getClass().getName(), cargo);
}
/**
* Register cargo for specified satellite class
* @param c - Satellite class
* @param cargo - WeightedRandomObject array with loot
*/
public static void register(Class<?> c, WeightedRandomObject[] cargo) {
SatelliteMinerCargoRegistry.cargo.put(c.getName(), cargo);
}
/**
* Get loot by satellite class name
* @param satelliteName - Satellite class name, like com.hbm.saveddata.satellites.SatelliteMiner
* @return - WeightedRandomObject array with loot
*/
public static WeightedRandomObject[] getCargo(String satelliteName) {
if(cargo.containsKey(satelliteName)) {
return cargo.get(satelliteName);
}
return new WeightedRandomObject[0];
}
}

View File

@ -1,17 +1,15 @@
package com.hbm.tileentity; package com.hbm.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.animloader.AnimatedModel; import com.hbm.animloader.AnimatedModel;
import com.hbm.animloader.Animation; import com.hbm.animloader.Animation;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.WavefrontObjDisplayList; import com.hbm.render.loader.WavefrontObjDisplayList;
import com.hbm.util.BobMathUtil; import com.hbm.util.BobMathUtil;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
public abstract class DoorDecl { public abstract class DoorDecl {
@ -20,7 +18,7 @@ public static final DoorDecl TRANSITION_SEAL = new DoorDecl(){
@Override @Override
public String getOpenSoundStart() { public String getOpenSoundStart() {
return "hbm:door.TransitionSealOpen"; return "hbm:door.TransitionSealOpen";
}; }
@Override @Override
public float getSoundVolume() { public float getSoundVolume() {
@ -35,24 +33,24 @@ public static final DoorDecl TRANSITION_SEAL = new DoorDecl(){
} else { } else {
super.getTranslation(partName, openTicks, child, trans); super.getTranslation(partName, openTicks, child, trans);
} }
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void doOffsetTransform() { public void doOffsetTransform() {
GL11.glTranslated(0, 0, 0.5); GL11.glTranslated(0, 0, 0.5);
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public double[][] getClippingPlanes() { public double[][] getClippingPlanes() {
return super.getClippingPlanes(); return super.getClippingPlanes();
}; }
@Override @Override
public int timeToOpen() { public int timeToOpen() {
return 480; return 480;
}; }
@Override @Override
public int[][] getDoorOpenRanges() { public int[][] getDoorOpenRanges() {
@ -69,11 +67,11 @@ public static final DoorDecl TRANSITION_SEAL = new DoorDecl(){
@Override @Override
public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) {
return super.getBlockBound(x, y, z, open); return super.getBlockBound(x, y, z, open);
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public ResourceLocation getTextureForPart(String partName){ public ResourceLocation getTextureForPart(int skinIndex, String partName) {
return ResourceManager.transition_seal_tex; return ResourceManager.transition_seal_tex;
} }
@ -81,13 +79,13 @@ public static final DoorDecl TRANSITION_SEAL = new DoorDecl(){
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Animation getAnim() { public Animation getAnim() {
return ResourceManager.transition_seal_anim; return ResourceManager.transition_seal_anim;
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public AnimatedModel getAnimatedModel() { public AnimatedModel getAnimatedModel() {
return ResourceManager.transition_seal; return ResourceManager.transition_seal;
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@ -101,15 +99,17 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
@Override @Override
public String getOpenSoundEnd() { public String getOpenSoundEnd() {
return "hbm:door.wghStop"; return "hbm:door.wghStop";
}; }
@Override @Override
public String getOpenSoundLoop() { public String getOpenSoundLoop() {
return "hbm:door.wghStart"; return "hbm:door.wghStart";
}; }
@Override @Override
public String getSoundLoop2() { public String getSoundLoop2() {
return "hbm:door.alarm6"; return "hbm:door.alarm6";
}; }
@Override @Override
public float getSoundVolume() { public float getSoundVolume() {
@ -124,24 +124,24 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
} else { } else {
super.getTranslation(partName, openTicks, child, trans); super.getTranslation(partName, openTicks, child, trans);
} }
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void doOffsetTransform() { public void doOffsetTransform() {
GL11.glTranslated(0, 0, 0.5); GL11.glTranslated(0, 0, 0.5);
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public double[][] getClippingPlanes() { public double[][] getClippingPlanes() {
return new double[][]{{0, -1, 0, 3.0001}}; return new double[][]{{0, -1, 0, 3.0001}};
}; }
@Override @Override
public int timeToOpen() { public int timeToOpen() {
return 160; return 160;
}; }
@Override @Override
public int[][] getDoorOpenRanges() { public int[][] getDoorOpenRanges() {
@ -168,11 +168,11 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
} else { } else {
return super.getBlockBound(x, y, z, open); return super.getBlockBound(x, y, z, open);
} }
}; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public ResourceLocation getTextureForPart(String partName){ public ResourceLocation getTextureForPart(int skinIndex, String partName) {
return ResourceManager.fire_door_tex; return ResourceManager.fire_door_tex;
} }
@ -183,6 +183,110 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
} }
}; };
public static final DoorDecl SLIDE_DOOR = new DoorDecl() {
@Override
public String getOpenSoundEnd() {
return "hbm:door.sliding_door_opened";
}
@Override
public String getCloseSoundEnd() {
return "hbm:door.sliding_door_shut";
}
@Override
public String getOpenSoundLoop() {
return "hbm:door.sliding_door_opening";
}
@Override
public String getSoundLoop2() {
return "hbm:door.sliding_door_opening";
}
@Override
public float getSoundVolume() {
return 2;
}
@Override
@SideOnly(Side.CLIENT)
public void doOffsetTransform() {
GL11.glRotated(-90, 0, 1, 0);
}
@Override
@SideOnly(Side.CLIENT)
public double[][] getClippingPlanes() {
return new double[][]{
{-1, 0, 0, 3.50001},
{1, 0, 0, 3.50001}
};
}
@Override
public int timeToOpen() {
return 24;
}
@Override
public int[][] getDoorOpenRanges() {
return new int[][]{{-2, 0, 0, 4, 5, 1}};
}
@Override
public int[] getDimensions() {
return new int[]{3, 0, 0, 0, 3, 3};
}
@Override
public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) {
if (open) {
if (y == 3) {
return AxisAlignedBB.getBoundingBox(0, 0.5, 0, 1, 1, 1);
} else if (y == 0) {
return AxisAlignedBB.getBoundingBox(0, 0, 0, 1, 0.08, 1);
}
}
return super.getBlockBound(x, y, z, open);
}
@Override
public boolean hasSkins() {
return true;
}
@Override
public int getSkinCount() {
return 3;
}
@Override
@SideOnly(Side.CLIENT)
public ResourceLocation getTextureForPart(int skinIndex, String partName) {
return new ResourceLocation[] {
ResourceManager.sliding_blast_door_tex,
ResourceManager.sliding_blast_door_variant1_tex,
ResourceManager.sliding_blast_door_variant2_tex
}[skinIndex];
}
@Override
public WavefrontObjDisplayList getModel() {
return null;
}
@Override
public Animation getAnim() {
return ResourceManager.sliding_blast_door_anim;
}
@Override
public AnimatedModel getAnimatedModel() {
return ResourceManager.sliding_blast_door;
}
};
//Format: x, y, z, tangent amount 1 (how long the door would be if it moved up), tangent amount 2 (door places blocks in this direction), axis (0-x, 1-y, 2-z) //Format: x, y, z, tangent amount 1 (how long the door would be if it moved up), tangent amount 2 (door places blocks in this direction), axis (0-x, 1-y, 2-z)
public abstract int[][] getDoorOpenRanges(); public abstract int[][] getDoorOpenRanges();
@ -204,8 +308,21 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
return BobMathUtil.remap01_clamp(time, min, max); return BobMathUtil.remap01_clamp(time, min, max);
} }
public boolean hasSkins() {
return false;
}
public int getSkinCount() {
return 0;
}
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public abstract ResourceLocation getTextureForPart(String partName); public ResourceLocation getTextureForPart(String partName) {
return getTextureForPart(0, partName);
}
@SideOnly(Side.CLIENT)
public abstract ResourceLocation getTextureForPart(int skinIndex, String partName);
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public abstract WavefrontObjDisplayList getModel(); public abstract WavefrontObjDisplayList getModel();
@ -302,5 +419,5 @@ public static final DoorDecl FIRE_DOOR = new DoorDecl(){
f[1] = y; f[1] = y;
f[2] = z; f[2] = z;
return f; return f;
}; }
} }

View File

@ -33,6 +33,8 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
public long animStartTime = 0; public long animStartTime = 0;
public int redstonePower; public int redstonePower;
public boolean shouldUseBB = false; public boolean shouldUseBB = false;
private byte skinIndex = 0;
public Set<BlockPos> activatedBlocks = new HashSet<>(4); public Set<BlockPos> activatedBlocks = new HashSet<>(4);
private AudioWrapper audio; private AudioWrapper audio;
@ -52,9 +54,7 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
} }
} }
if(worldObj.isRemote) { if(!worldObj.isRemote) {
} else {
BlockPos pos = new BlockPos(this); BlockPos pos = new BlockPos(this);
@ -140,7 +140,7 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
if(state == 2 && openTicks == 0) { if(state == 2 && openTicks == 0) {
state = 0; state = 0;
} }
PacketDispatcher.wrapper.sendToAllAround(new TEDoorAnimationPacket(xCoord, yCoord, zCoord, state, (byte)(shouldUseBB ? 1 : 0)), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 100)); PacketDispatcher.wrapper.sendToAllAround(new TEDoorAnimationPacket(xCoord, yCoord, zCoord, state, skinIndex, (byte)(shouldUseBB ? 1 : 0)), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 100));
if(redstonePower == -1 && state == 0){ if(redstonePower == -1 && state == 0){
tryToggle(-1); tryToggle(-1);
@ -282,10 +282,22 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
//Ah yes piggy backing on this packet //Ah yes piggy backing on this packet
@Override @Override
public void setTextureState(byte tex){ public void setTextureState(byte tex){
if(tex > 0) shouldUseBB = tex > 0;
shouldUseBB = true; }
else
shouldUseBB = false; public int getSkinIndex() {
return skinIndex;
}
@Override
public boolean setSkinIndex(byte skinIndex) {
if(!getDoorType().hasSkins())
return false;
if(getDoorType().getSkinCount() < skinIndex) {
return false;
}
this.skinIndex = skinIndex;
return true;
} }
@Override @Override
@ -305,6 +317,7 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
this.animStartTime = tag.getInteger("animStartTime"); this.animStartTime = tag.getInteger("animStartTime");
this.redstonePower = tag.getInteger("redstoned"); this.redstonePower = tag.getInteger("redstoned");
this.shouldUseBB = tag.getBoolean("shouldUseBB"); this.shouldUseBB = tag.getBoolean("shouldUseBB");
this.skinIndex = tag.getByte("skin");
NBTTagCompound activatedBlocks = tag.getCompoundTag("activatedBlocks"); NBTTagCompound activatedBlocks = tag.getCompoundTag("activatedBlocks");
this.activatedBlocks.clear(); this.activatedBlocks.clear();
for(int i = 0; i < activatedBlocks.func_150296_c().size()/3; i ++){ for(int i = 0; i < activatedBlocks.func_150296_c().size()/3; i ++){
@ -322,6 +335,8 @@ public class TileEntityDoorGeneric extends TileEntityLockableBase implements IAn
tag.setLong("animStartTime", animStartTime); tag.setLong("animStartTime", animStartTime);
tag.setInteger("redstoned", redstonePower); tag.setInteger("redstoned", redstonePower);
tag.setBoolean("shouldUseBB", shouldUseBB); tag.setBoolean("shouldUseBB", shouldUseBB);
if(getDoorType().hasSkins())
tag.setByte("skin", skinIndex);
NBTTagCompound activatedBlocks = new NBTTagCompound(); NBTTagCompound activatedBlocks = new NBTTagCompound();
int i = 0; int i = 0;
for(BlockPos p : this.activatedBlocks){ for(BlockPos p : this.activatedBlocks){

View File

@ -1,8 +1,5 @@
package com.hbm.tileentity.machine; package com.hbm.tileentity.machine;
import java.util.List;
import java.util.Random;
import com.hbm.entity.missile.EntityMinerRocket; import com.hbm.entity.missile.EntityMinerRocket;
import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.explosion.ExplosionNukeSmall;
import com.hbm.inventory.container.ContainerSatDock; import com.hbm.inventory.container.ContainerSatDock;
@ -11,10 +8,8 @@ import com.hbm.items.ISatChip;
import com.hbm.saveddata.SatelliteSavedData; import com.hbm.saveddata.SatelliteSavedData;
import com.hbm.saveddata.satellites.Satellite; import com.hbm.saveddata.satellites.Satellite;
import com.hbm.saveddata.satellites.SatelliteMiner; import com.hbm.saveddata.satellites.SatelliteMiner;
import com.hbm.saveddata.satellites.SatelliteMinerCargoRegistry;
import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.IGUIProvider;
import com.hbm.util.WeightedRandomObject; import com.hbm.util.WeightedRandomObject;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
@ -31,8 +26,10 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandom;
import net.minecraft.world.World; import net.minecraft.world.World;
public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider { import java.util.List;
import java.util.Random;
public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider {
private ItemStack[] slots; private ItemStack[] slots;
private static final int[] access = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}; private static final int[] access = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
@ -102,17 +99,16 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
//You scrubs aren't needed for anything (right now) //You scrubs aren't needed for anything (right now)
@Override @Override
public void openInventory() {} public void openInventory() {
}
@Override @Override
public void closeInventory() {} public void closeInventory() {
}
@Override @Override
public boolean isItemValidForSlot(int i, ItemStack itemStack) { public boolean isItemValidForSlot(int i, ItemStack itemStack) {
if(i == 2 || i == 3 || i == 4 || i == 5) { return i != 2 && i != 3 && i != 4 && i != 5;
return false;
}
return true;
} }
@Override @Override
@ -185,9 +181,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
@Override @Override
public void updateEntity() { public void updateEntity() {
if (!worldObj.isRemote) { if (!worldObj.isRemote) {
if (data == null) if (data == null)
data = (SatelliteSavedData) worldObj.perWorldStorage.loadData(SatelliteSavedData.class, "satellites"); data = (SatelliteSavedData) worldObj.perWorldStorage.loadData(SatelliteSavedData.class, "satellites");
@ -205,18 +199,14 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
int delay = 10 * 60 * 1000; int delay = 10 * 60 * 1000;
if (sat instanceof SatelliteMiner) { if (sat instanceof SatelliteMiner) {
SatelliteMiner miner = (SatelliteMiner) sat; SatelliteMiner miner = (SatelliteMiner) sat;
if (miner.lastOp + delay < System.currentTimeMillis()) { if (miner.lastOp + delay < System.currentTimeMillis()) {
EntityMinerRocket rocket = new EntityMinerRocket(worldObj); EntityMinerRocket rocket = new EntityMinerRocket(worldObj);
rocket.posX = xCoord + 0.5; rocket.posX = xCoord + 0.5;
rocket.posY = 300; rocket.posY = 300;
rocket.posZ = zCoord + 0.5; rocket.posZ = zCoord + 0.5;
rocket.satelliteClassName = miner.getClass().getName();
rocket.getDataWatcher().updateObject(17, freq); rocket.getDataWatcher().updateObject(17, freq);
worldObj.spawnEntityInWorld(rocket); worldObj.spawnEntityInWorld(rocket);
miner.lastOp = System.currentTimeMillis(); miner.lastOp = System.currentTimeMillis();
@ -228,9 +218,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
List<Entity> list = worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(xCoord - 0.25 + 0.5, yCoord + 0.75, zCoord - 0.25 + 0.5, xCoord + 0.25 + 0.5, yCoord + 2, zCoord + 0.25 + 0.5)); List<Entity> list = worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(xCoord - 0.25 + 0.5, yCoord + 0.75, zCoord - 0.25 + 0.5, xCoord + 0.25 + 0.5, yCoord + 2, zCoord + 0.25 + 0.5));
for (Entity e : list) { for (Entity e : list) {
if (e instanceof EntityMinerRocket) { if (e instanceof EntityMinerRocket) {
EntityMinerRocket rocket = (EntityMinerRocket) e; EntityMinerRocket rocket = (EntityMinerRocket) e;
if (slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) { if (slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) {
@ -240,7 +228,8 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
if (rocket.getDataWatcher().getWatchableObjectInt(16) == 1 && rocket.timer == 50) { if (rocket.getDataWatcher().getWatchableObjectInt(16) == 1 && rocket.timer == 50) {
unloadCargo(rocket.satelliteClassName); Satellite sat = data.getSatFromFreq(ISatChip.getFreqS(slots[15]));
unloadCargo((SatelliteMiner) sat);
} }
} }
} }
@ -252,26 +241,22 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
} }
static Random rand = new Random(); static final Random rand = new Random();
private void unloadCargo(String satelliteClassName) { private void unloadCargo(SatelliteMiner satellite) {
int items = rand.nextInt(6) + 10; int items = rand.nextInt(6) + 10;
WeightedRandomObject[] cargo = SatelliteMinerCargoRegistry.getCargo(satelliteClassName); WeightedRandomObject[] cargo = satellite.getCargo();
for (int i = 0; i < items; i++) { for (int i = 0; i < items; i++) {
ItemStack stack = ((WeightedRandomObject) WeightedRandom.getRandomItem(rand, cargo)).asStack(); ItemStack stack = ((WeightedRandomObject) WeightedRandom.getRandomItem(rand, cargo)).asStack();
addToInv(stack.copy()); addToInv(stack.copy());
} }
} }
private void addToInv(ItemStack stack) { private void addToInv(ItemStack stack) {
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
if (slots[i] != null && slots[i].getItem() == stack.getItem() && slots[i].getItemDamage() == stack.getItemDamage() && slots[i].stackSize < slots[i].getMaxStackSize()) { if (slots[i] != null && slots[i].getItem() == stack.getItem() && slots[i].getItemDamage() == stack.getItemDamage() && slots[i].stackSize < slots[i].getMaxStackSize()) {
int toAdd = Math.min(slots[i].getMaxStackSize() - slots[i].stackSize, stack.stackSize); int toAdd = Math.min(slots[i].getMaxStackSize() - slots[i].stackSize, stack.stackSize);
slots[i].stackSize += toAdd; slots[i].stackSize += toAdd;
@ -282,7 +267,6 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
if (slots[i] == null) { if (slots[i] == null) {
slots[i] = new ItemStack(stack.getItem(), 1, stack.getItemDamage()); slots[i] = new ItemStack(stack.getItem(), 1, stack.getItemDamage());
return; return;
@ -291,19 +275,14 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
private void ejectInto(int x, int y, int z) { private void ejectInto(int x, int y, int z) {
TileEntity te = worldObj.getTileEntity(x, y, z); TileEntity te = worldObj.getTileEntity(x, y, z);
if (te instanceof IInventory) { if (te instanceof IInventory) {
IInventory chest = (IInventory) te; IInventory chest = (IInventory) te;
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
if (slots[i] != null) { if (slots[i] != null) {
for (int j = 0; j < chest.getSizeInventory(); j++) { for (int j = 0; j < chest.getSizeInventory(); j++) {
ItemStack sta = slots[i].copy(); ItemStack sta = slots[i].copy();
sta.stackSize = 1; sta.stackSize = 1;
@ -323,16 +302,12 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
if (slots[i] != null) { if (slots[i] != null) {
for (int j = 0; j < chest.getSizeInventory(); j++) { for (int j = 0; j < chest.getSizeInventory(); j++) {
ItemStack sta = slots[i].copy(); ItemStack sta = slots[i].copy();
sta.stackSize = 1; sta.stackSize = 1;
if (chest.getStackInSlot(j) == null && chest.isItemValidForSlot(j, sta)) { if (chest.getStackInSlot(j) == null && chest.isItemValidForSlot(j, sta)) {
slots[i].stackSize--; slots[i].stackSize--;
if (slots[i].stackSize <= 0) if (slots[i].stackSize <= 0)
@ -351,7 +326,6 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
@Override @Override
public AxisAlignedBB getRenderBoundingBox() { public AxisAlignedBB getRenderBoundingBox() {
if (bb == null) { if (bb == null) {
bb = AxisAlignedBB.getBoundingBox( bb = AxisAlignedBB.getBoundingBox(
xCoord - 1, xCoord - 1,

View File

@ -2497,6 +2497,7 @@ item.grenade_aschrab.name=Tossable Antischrabidium Cell
item.grenade_black_hole.name=Black Hole Grenade item.grenade_black_hole.name=Black Hole Grenade
item.grenade_breach.name=Breaching Grenade item.grenade_breach.name=Breaching Grenade
item.grenade_burst.name=Digger Grenade item.grenade_burst.name=Digger Grenade
item.grenate_cats.name=Grenade of Cats
item.grenade_cloud.name=Jar of Cloud item.grenade_cloud.name=Jar of Cloud
item.grenade_cluster.name=Cluster Bomb item.grenade_cluster.name=Cluster Bomb
item.grenade_electric.name=Lightning Bomb item.grenade_electric.name=Lightning Bomb
@ -3128,6 +3129,9 @@ item.mysteryshovel.name=Brittle Spade
item.n2_charge.name=Large Explosive Charge item.n2_charge.name=Large Explosive Charge
item.neutrino_lens.name=Neutrino Lens item.neutrino_lens.name=Neutrino Lens
item.neutron_reflector.name=Neutron Reflector item.neutron_reflector.name=Neutron Reflector
item.night_vision.name=Night Vision Goggles
item.night_vision.description.item=Grants you night vision (requires full electric set)
item.night_vision.description.in_armor=%s (grants night vision)
item.niter.name=Niter item.niter.name=Niter
item.no9.name=Mining Helmet item.no9.name=Mining Helmet
item.nossy_hat.name=Fabulous Hat item.nossy_hat.name=Fabulous Hat
@ -3900,6 +3904,9 @@ item.singularity_super_heated.name=Superheated Resonating Singularity
item.siox.name=SiOX Cancer Medication item.siox.name=SiOX Cancer Medication
item.siox.desc=Reverses mesothelioma with the power of Asbestos! item.siox.desc=Reverses mesothelioma with the power of Asbestos!
item.siren_track.name=Siren Track item.siren_track.name=Siren Track
item.sliding_blast_door_skin.0.name=Sliding Blast Door Skin: Default
item.sliding_blast_door_skin.1.name=Sliding Blast Door Skin: Variant 1
item.sliding_blast_door_skin.2.name=Sliding Blast Door Skin: Variant 2
item.smashing_hammer.name=Smashing Hammer item.smashing_hammer.name=Smashing Hammer
item.solid_fuel.name=Solid Fuel item.solid_fuel.name=Solid Fuel
item.solid_fuel_bf.name=Solid Fuel (Balefire) item.solid_fuel_bf.name=Solid Fuel (Balefire)
@ -5153,6 +5160,7 @@ tile.sellafield.4.name=Infernal Sellafite
tile.sellafield.5.name=Sellafite-Corium tile.sellafield.5.name=Sellafite-Corium
tile.sellafield_slaked.name=Slaked Sellafite tile.sellafield_slaked.name=Slaked Sellafite
tile.semtex.name=Semtex tile.semtex.name=Semtex
tile.sliding_blast_door.name=Sliding Blast Door
tile.solar_mirror.name=Heliostat Mirror tile.solar_mirror.name=Heliostat Mirror
tile.soyuz_capsule.name=Cargo Landing Capsule tile.soyuz_capsule.name=Cargo Landing Capsule
tile.soyuz_launcher.name=Soyuz Launch Platform tile.soyuz_launcher.name=Soyuz Launch Platform

View File

@ -477,6 +477,9 @@ item.plate_titanium.name=Plaque en titane
item.plate_aluminium.name=Plaque d'aluminium item.plate_aluminium.name=Plaque d'aluminium
item.wire_red_copper.name=Fil de cuivre rouge item.wire_red_copper.name=Fil de cuivre rouge
item.neutron_reflector.name=Reflecteur neutronique item.neutron_reflector.name=Reflecteur neutronique
item.night_vision.name=Lunettes de vision nocturne
item.night_vision.description.item=Donne la vision nocturne (nécessite un set électrique complet)
item.night_vision.description.in_armor=%s (donne la vision nocturne)
item.nugget_beryllium.name=Pépite de béryllium item.nugget_beryllium.name=Pépite de béryllium
item.wire_aluminium.name=Fil d'aluminium item.wire_aluminium.name=Fil d'aluminium
@ -913,6 +916,7 @@ item.grenade_strong.name=Grenade ameliorée
item.grenade_frag.name=Grenade Frag item.grenade_frag.name=Grenade Frag
item.grenade_fire.name=Grenade Frag incendiaire item.grenade_fire.name=Grenade Frag incendiaire
item.grenade_shrapnel.name=Grenade à fragmentation item.grenade_shrapnel.name=Grenade à fragmentation
item.grenate_cats.name=Grenade à chats
item.grenade_cluster.name=Grenade à fragmentation item.grenade_cluster.name=Grenade à fragmentation
item.grenade_flare.name=Flare item.grenade_flare.name=Flare
item.grenade_electric.name=Grenade à éclairs item.grenade_electric.name=Grenade à éclairs

View File

@ -2623,6 +2623,9 @@ item.plate_titanium.name=Титановая пластина
item.plate_aluminium.name=Алюминиевая пластина item.plate_aluminium.name=Алюминиевая пластина
item.wire_red_copper.name=Провод из красной меди item.wire_red_copper.name=Провод из красной меди
item.neutron_reflector.name=Отражатель нейтронов item.neutron_reflector.name=Отражатель нейтронов
item.night_vision.name=Очки ночного зрения
item.night_vision.description.item=Даёт ночное зрение (нуждается в полном электрическом сете)
item.night_vision.description.in_armor=%s (даёт ночное зрение)
item.nugget_beryllium.name=Бериллиевый самородок item.nugget_beryllium.name=Бериллиевый самородок
item.nugget_bismuth.name=Самородок висмута item.nugget_bismuth.name=Самородок висмута
item.nugget_tantalium.name=Самородок тантала item.nugget_tantalium.name=Самородок тантала
@ -3876,6 +3879,7 @@ item.grenade_strong.name=Усовершенствованная граната
item.grenade_frag.name=Осколочная граната item.grenade_frag.name=Осколочная граната
item.grenade_fire.name=Огненная осколочная граната item.grenade_fire.name=Огненная осколочная граната
item.grenade_shrapnel.name=Граната со шрапнелью item.grenade_shrapnel.name=Граната со шрапнелью
item.grenate_cats.name=Граната с котами
item.grenade_cluster.name=Кластерная бомба item.grenade_cluster.name=Кластерная бомба
item.grenade_flare.name=Сигнальная ракета item.grenade_flare.name=Сигнальная ракета
item.grenade_electric.name=Электрограната item.grenade_electric.name=Электрограната

File diff suppressed because one or more lines are too long

View File

@ -59,6 +59,9 @@
"door.wghStart": {"category": "block", "sounds": [{"name": "block/door/wgh_start", "stream": true}]}, "door.wghStart": {"category": "block", "sounds": [{"name": "block/door/wgh_start", "stream": true}]},
"door.wghStop": {"category": "block", "sounds": [{"name": "block/door/wgh_stop", "stream": true}]}, "door.wghStop": {"category": "block", "sounds": [{"name": "block/door/wgh_stop", "stream": true}]},
"door.alarm6": {"category": "block", "sounds": [{"name": "block/door/alarm6", "stream": true}]}, "door.alarm6": {"category": "block", "sounds": [{"name": "block/door/alarm6", "stream": true}]},
"door.sliding_door_shut": {"category": "block", "sounds": [{"name": "block/door/sliding_door_shut", "stream": false}]},
"door.sliding_door_opened": {"category": "block", "sounds": [{"name": "block/door/sliding_door_opened", "stream": false}]},
"door.sliding_door_opening": {"category": "block", "sounds": [{"name": "block/door/sliding_door_opening", "stream": false}]},
"item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]},
"item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]},

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 764 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB