mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-08-10 17:55:44 +00:00
Merge branch 'HbmMods:master' into ru_RU-lang-1
This commit is contained in:
Raaaaaaaaaay
GitHub
commit
3e4a9cf34c
83
changelog
83
changelog
@ -1,67 +1,22 @@
|
|||||||
|
## Added
|
||||||
|
* Freight elevator
|
||||||
|
* A 3x3 hydraulic platform
|
||||||
|
* Can be stacked
|
||||||
|
* Only supports two floors, the top and the bottom
|
||||||
|
* Hopefully not terribly janky
|
||||||
|
|
||||||
## Changed
|
## Changed
|
||||||
* Updated russian and chinese localization
|
* Reduced steam demand of the rotary furnace's hotter fuels by a bit
|
||||||
* Oil bubbles are now 3x more common in deserts (biomes with a temperature value of 2 and rainfall of 0)
|
* The acidizer now has a sound loop (chemplant sound at 75% pitch)
|
||||||
* Oil bubbles now have a 50% chance of spawning a surface indicator (similar to bedrock oil but still distinct)
|
* Updated some bomb part recipes, mainly to make use of the new neutron reflectors and some more modern materials (why did ivy mike coolers still use iron?)
|
||||||
* Oil deposits will never drop themselves, they always produce tar when mined
|
* Updated the fat man igniter and gadget wiring icons
|
||||||
* Any tar type can now be turned into bitumen in a mixer (with worse efficiency compared to a liquefactor)
|
* The cape items, which haven't actually been used by anyone ever, are now deprecated. Existing capes will still work, but the items are now unobtainable
|
||||||
* RoR levers and indicator lights now have OpenComputers integration
|
* Some long deprecated melee weapons have now been properly removed
|
||||||
* Alexandrite dropped with fortune is now capped at 2 gems per ore
|
|
||||||
* Added a config option for decreasing the soot requirement for skeleton guns (or rather, for the calculation, this number is added to the actual soot value, simulating a higher value)
|
|
||||||
* Radioisotope cells and PT cells are now deprecated, and can no longer be crafted
|
|
||||||
* Existing cells will continue to work for now
|
|
||||||
* If two pipe anchors are connected, one having a type set and one still being "none", instead of erroring, the "none" pipe will assume the other one's type
|
|
||||||
* Self-chargers in battery sockets now produce unreliable power output which constantly fluctuates
|
|
||||||
* Self-chargers in battery sockets now cause static discharges in regular intervals
|
|
||||||
* Added more RoR functionality to the boilers, industrial combustion engine, heat exchangers, fluid burners, CCGT and ZIRNOX
|
|
||||||
* Turrets can now be toggled and configured with RoR
|
|
||||||
* Artillery turrets can now have targets enqueued with RoR
|
|
||||||
* The RBMK numeric displays can now be controlled via OpenComputers, and come with built-in settings for shortening numbers and displaying leading zeroes
|
|
||||||
* The industrial steam turbine now has OpenComputers integration
|
|
||||||
* The RBMK fuel crane can now report stats for the loaded fuel rod to OpenComputers
|
|
||||||
* The RBMK console can now detect and send all stored RBMK fuel rods in storage columns via OpenComputers
|
|
||||||
* Crates now open when right-clicked by default, holding shift is required to place them down
|
|
||||||
* The automatic buzzsaw can now burn coal tar creosote
|
|
||||||
* The old cluster type effect used by MPBs and cluster missiles now use the new generic projectile system with actual bomblet models
|
|
||||||
* Removed the legacy fusion reactor entirely
|
|
||||||
* Changed neutron reflectors
|
|
||||||
* Reflectors can no longer be made in the blast furnace
|
|
||||||
* Rather, they are welded from HSS and tungsten carbide
|
|
||||||
* Tungsten carbide is made in the pyrolysis oven using syngas and tungsten powder
|
|
||||||
* Many recipes that used to use neutron reflectors now use alternative materials like HSS plates or weapon steel
|
|
||||||
* This effectively means that neutron reflectors are post oil 3
|
|
||||||
* PWR neutron reflectors have an alternate recipe allowing them to be made with weaponsteel
|
|
||||||
* Removed legacy battery items and selfchargers
|
|
||||||
* Added more QMAW pages
|
|
||||||
* Expensive mode plastic sheets now only use rubber instead of rubber or latex
|
|
||||||
* Updated the texture on the fop thing
|
|
||||||
* RoR info on tanks now displays the (0-3) value range of the mode setting
|
|
||||||
* Spike, tesla and microwave damage have now been categorized as physical, energy and energy respectively, making armors resistant against them
|
|
||||||
* Fau and DNT armor now have explicit physical resistances, making them harder to pierce
|
|
||||||
* The rubber recipe now yields two rubber per sulfur used
|
|
||||||
* Foundry scraps now show their material in the name instead of the description
|
|
||||||
* Bedrock ore minimum tier and bore fluid is no longer fixed at (1/NONE), rather it scales with the quality of the bedrock ore at that spot
|
|
||||||
* The bedrock ore density scanner will try to predict the required tier and bore fluid at the current spot, and show it as part of the HUD
|
|
||||||
* This only applies to newly generated bedrock ore patches
|
|
||||||
* Reduced industrial turbine cost from 3 titanium steam turbine blades to 2
|
|
||||||
* Motors now have yet another alternate recipe in the arc welder, using steel plates but substituting the coils with a dense red copper wires
|
|
||||||
* Dense red copper wires can now be welded
|
|
||||||
* The old factory hull blocks have been deprecated
|
|
||||||
* The singularity screwdriver, being with no purpose ever since the fwatz got removed, has been removed as well
|
|
||||||
* Desh motors now use dense golden wires instead of golden ring coils
|
|
||||||
* Added "desh from cracked oil" recipe
|
|
||||||
* Default recipe, doesn't need a blueprint
|
|
||||||
* Uses cracked light oil instead of regular light oil (500mB at 1 PU, or 2.5x more than the standard recipe, plus one compressor)
|
|
||||||
* Uses 100mB of mercury instead of 200mB
|
|
||||||
* All standard coils now have alternate recipes, using a steel core instead of an iron one
|
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
* Fixed uncrafting of the nickel RTG pellet not respecting item metadata
|
* Fixed an issue where 40mm grenades that impact entities within three ticks of spawning would never detonate
|
||||||
* Tile entities that use fluids should now force the chunk they are in to be written to disk when unloaded
|
* Fixed broken foundry scrap name and tooltip
|
||||||
* This should fix the issue where systems that constantly move fluids around may not properly save to disk
|
* Finally fixed the rotary furnace's steam going into the negatives because 70k was too bald to do it
|
||||||
* Fixed dispensed dynamites being considered impact grenades for some reason
|
* Fixed magnet and HUD toggle popups being incorrect half the time
|
||||||
* Fixed RBMK flux detection with RoR and OC not working
|
* Fixed crash caused by connecting NONE type pipe anchors
|
||||||
* Moved the soyuz launcher core component recipe to the assembler, fixing an issue where the component recipe is not available in 528 mode
|
* Fixed color inconsistency with the bedrock ore density scanner
|
||||||
* Fixed crash caused by using the copy tool on uncolored RBMK control rods
|
|
||||||
* Fixed turbine blade smelting in the crucible only yielding 2 ingots worth of material
|
|
||||||
* Fixed cluster missiles never properly splitting before impact
|
|
||||||
* The final splitting height depends on the trajectory's arc, cluster missiles are therefore not suitable for very long distances
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
mod_version=1.0.27
|
mod_version=1.0.27
|
||||||
# Empty build number makes a release type
|
# Empty build number makes a release type
|
||||||
mod_build_number=5685
|
mod_build_number=5687
|
||||||
|
|
||||||
credits=HbMinecraft,\
|
credits=HbMinecraft,\
|
||||||
\ rodolphito (explosion algorithms),\
|
\ rodolphito (explosion algorithms),\
|
||||||
|
|||||||
@ -579,6 +579,8 @@ public class ModBlocks {
|
|||||||
public static Block seal_controller;
|
public static Block seal_controller;
|
||||||
public static Block seal_hatch;
|
public static Block seal_hatch;
|
||||||
|
|
||||||
|
public static Block cargo_elevator;
|
||||||
|
|
||||||
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 sliding_blast_door;
|
||||||
@ -2032,6 +2034,8 @@ public class ModBlocks {
|
|||||||
seal_controller = new BlockSeal(Material.iron).setBlockName("seal_controller").setHardness(10.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab);
|
seal_controller = new BlockSeal(Material.iron).setBlockName("seal_controller").setHardness(10.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab);
|
||||||
seal_hatch = new BlockHatch(Material.iron).setBlockName("seal_hatch").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":seal_hatch_3");
|
seal_hatch = new BlockHatch(Material.iron).setBlockName("seal_hatch").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":seal_hatch_3");
|
||||||
|
|
||||||
|
cargo_elevator = new BlockCargoElevator().setBlockName("cargo_elevator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
|
||||||
|
|
||||||
vault_door = new BlockDoorGeneric(Material.iron, DoorDecl.VAULT_DOOR).setBlockName("vault_door").setHardness(10.0F).setResistance(1_000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":concrete");
|
vault_door = new BlockDoorGeneric(Material.iron, DoorDecl.VAULT_DOOR).setBlockName("vault_door").setHardness(10.0F).setResistance(1_000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":concrete");
|
||||||
blast_door = new BlastDoor(Material.iron).setBlockName("blast_door").setHardness(10.0F).setResistance(1_000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":blast_door");
|
blast_door = new BlastDoor(Material.iron).setBlockName("blast_door").setHardness(10.0F).setResistance(1_000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":blast_door");
|
||||||
|
|
||||||
@ -2953,6 +2957,9 @@ public class ModBlocks {
|
|||||||
GameRegistry.registerBlock(seal_controller, seal_controller.getUnlocalizedName());
|
GameRegistry.registerBlock(seal_controller, seal_controller.getUnlocalizedName());
|
||||||
GameRegistry.registerBlock(seal_hatch, seal_hatch.getUnlocalizedName());
|
GameRegistry.registerBlock(seal_hatch, seal_hatch.getUnlocalizedName());
|
||||||
|
|
||||||
|
//Hooh
|
||||||
|
GameRegistry.registerBlock(cargo_elevator, cargo_elevator.getUnlocalizedName());
|
||||||
|
|
||||||
//Vault Door
|
//Vault Door
|
||||||
GameRegistry.registerBlock(vault_door, vault_door.getUnlocalizedName());
|
GameRegistry.registerBlock(vault_door, vault_door.getUnlocalizedName());
|
||||||
GameRegistry.registerBlock(blast_door, blast_door.getUnlocalizedName());
|
GameRegistry.registerBlock(blast_door, blast_door.getUnlocalizedName());
|
||||||
|
|||||||
180
src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java
Normal file
180
src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
package com.hbm.blocks.machine;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.hbm.blocks.BlockDummyable;
|
||||||
|
import com.hbm.blocks.ICustomBlockHighlight;
|
||||||
|
import com.hbm.blocks.ModBlocks;
|
||||||
|
import com.hbm.tileentity.machine.TileEntityCargoElevator;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
import net.minecraft.block.material.Material;
|
||||||
|
import net.minecraft.client.renderer.RenderGlobal;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.util.AxisAlignedBB;
|
||||||
|
import net.minecraft.util.MovingObjectPosition;
|
||||||
|
import net.minecraft.util.Vec3;
|
||||||
|
import net.minecraft.world.IBlockAccess;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
||||||
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|
||||||
|
public class BlockCargoElevator extends BlockDummyable {
|
||||||
|
|
||||||
|
public BlockCargoElevator() {
|
||||||
|
super(Material.iron);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TileEntity createNewTileEntity(World world, int meta) {
|
||||||
|
if(meta >= 12) return new TileEntityCargoElevator();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int[] getDimensions() {
|
||||||
|
return new int[] {0, 0, 1, 1, 1, 1};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getOffset() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
|
||||||
|
if(world.isRemote) return true;
|
||||||
|
if(player.isSneaking()) return false;
|
||||||
|
int[] pos = ((BlockDummyable) ModBlocks.cargo_elevator).findCore(world, x, y, z);
|
||||||
|
if(pos != null) {
|
||||||
|
TileEntityCargoElevator elevator = (TileEntityCargoElevator) world.getTileEntity(pos[0], pos[1], pos[2]);
|
||||||
|
|
||||||
|
x = pos[0];
|
||||||
|
y = pos[1];
|
||||||
|
z = pos[2];
|
||||||
|
|
||||||
|
// due to the collisions being really fucking weird, we have to add custom elevator extension too
|
||||||
|
if(player.getHeldItem() != null && player.getHeldItem().getItem() == Item.getItemFromBlock(this)) {
|
||||||
|
boolean replacable = true;
|
||||||
|
for(int i = x - 1; i < x + 2; i++) for(int j = z - 1; j < z + 2; j++) {
|
||||||
|
if(!world.getBlock(i, y + elevator.height + 1, j).isReplaceable(world, i, y + elevator.height + 1, j)) {
|
||||||
|
replacable = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(replacable) {
|
||||||
|
for(int i = x - 1; i < x + 2; i++) for(int j = z - 1; j < z + 2; j++) {
|
||||||
|
world.setBlock(i, y + elevator.height + 1, j, ModBlocks.cargo_elevator, 1, 3);
|
||||||
|
}
|
||||||
|
elevator.height++;
|
||||||
|
elevator.markDirty();
|
||||||
|
if(!player.capabilities.isCreativeMode) player.getHeldItem().stackSize--;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
elevator.toggleElevator();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
|
||||||
|
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.999F, 1.0F); //for some fucking reason setting maxY to something that isn't 1 magically fixes item collisions
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB entityBounding, List list, Entity entity) {
|
||||||
|
|
||||||
|
int[] pos = this.findCore(world, x, y, z);
|
||||||
|
if(pos == null) return;
|
||||||
|
|
||||||
|
x = pos[0];
|
||||||
|
y = pos[1];
|
||||||
|
z = pos[2];
|
||||||
|
|
||||||
|
TileEntityCargoElevator elevator = (TileEntityCargoElevator) world.getTileEntity(x, y, z);
|
||||||
|
if(elevator == null) return;
|
||||||
|
|
||||||
|
for(AxisAlignedBB aabb : getAABBs(elevator, x, y, z)) {
|
||||||
|
if(entityBounding.intersectsWith(aabb)) list.add(aabb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec) {
|
||||||
|
int[] pos = this.findCore(world, x, y, z);
|
||||||
|
if(pos == null) return null;
|
||||||
|
|
||||||
|
TileEntityCargoElevator elevator = (TileEntityCargoElevator) world.getTileEntity(pos[0], pos[1], pos[2]);
|
||||||
|
if(elevator == null) return null;
|
||||||
|
|
||||||
|
for(AxisAlignedBB aabb : getAABBs(elevator, pos[0], pos[1], pos[2])) {
|
||||||
|
|
||||||
|
MovingObjectPosition intercept = aabb.calculateIntercept(startVec, endVec);
|
||||||
|
if(intercept != null) {
|
||||||
|
return new MovingObjectPosition(x, y, z, intercept.sideHit, intercept.hitVec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public void drawHighlight(DrawBlockHighlightEvent event, World world, int x, int y, int z) {
|
||||||
|
|
||||||
|
int[] pos = this.findCore(world, x, y, z);
|
||||||
|
if(pos == null) return;
|
||||||
|
|
||||||
|
x = pos[0];
|
||||||
|
y = pos[1];
|
||||||
|
z = pos[2];
|
||||||
|
|
||||||
|
TileEntityCargoElevator elevator = (TileEntityCargoElevator) world.getTileEntity(x, y, z);
|
||||||
|
if(elevator == null) return;
|
||||||
|
|
||||||
|
EntityPlayer player = event.player;
|
||||||
|
float interp = event.partialTicks;
|
||||||
|
double dX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) interp;
|
||||||
|
double dY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) interp;
|
||||||
|
double dZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)interp;
|
||||||
|
float exp = 0.002F;
|
||||||
|
|
||||||
|
ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP);
|
||||||
|
|
||||||
|
ICustomBlockHighlight.setup();
|
||||||
|
for(AxisAlignedBB aabb : getAABBs(elevator, x, y, z)) RenderGlobal.drawOutlinedBoundingBox(aabb.expand(exp, exp, exp).getOffsetBoundingBox(-dX, -dY, -dZ), -1);
|
||||||
|
ICustomBlockHighlight.cleanup();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public boolean shouldDrawHighlight(World world, int x, int y, int z) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public AxisAlignedBB[] getGuideAABBs(int x, int y, int z, int height) {
|
||||||
|
return new AxisAlignedBB[] {
|
||||||
|
AxisAlignedBB.getBoundingBox(x - 1, y, z - 1, x - 0.75, y + height, z - 0.75),
|
||||||
|
AxisAlignedBB.getBoundingBox(x - 1, y, z + 1.75, x - 0.75, y + height, z + 2),
|
||||||
|
AxisAlignedBB.getBoundingBox(x + 1.75, y, z - 1, x + 2, y + height, z - 0.75),
|
||||||
|
AxisAlignedBB.getBoundingBox(x + 1.75, y, z + 1.75, x + 2, y + height, z + 2),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public AxisAlignedBB[] getAABBs(TileEntityCargoElevator elevator, int x, int y, int z) {
|
||||||
|
int height = elevator.height + 1;
|
||||||
|
return new AxisAlignedBB[] {
|
||||||
|
AxisAlignedBB.getBoundingBox(x - 1, y, z - 1, x - 0.75, y + height, z - 0.75),
|
||||||
|
AxisAlignedBB.getBoundingBox(x - 1, y, z + 1.75, x - 0.75, y + height, z + 2),
|
||||||
|
AxisAlignedBB.getBoundingBox(x + 1.75, y, z - 1, x + 2, y + height, z - 0.75),
|
||||||
|
AxisAlignedBB.getBoundingBox(x + 1.75, y, z + 1.75, x + 2, y + height, z + 2),
|
||||||
|
AxisAlignedBB.getBoundingBox(x - 1, y + 0.75 + elevator.extension, z - 1, x + 2, y + 1 + elevator.extension, z + 2),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -169,11 +169,6 @@ public class ArmorRecipes {
|
|||||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.mask_rag, 1), new Object[] { "RRR", 'R', ModItems.rag_damp });
|
CraftingManager.addRecipeAuto(new ItemStack(ModItems.mask_rag, 1), new Object[] { "RRR", 'R', ModItems.rag_damp });
|
||||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.mask_piss, 1), new Object[] { "RRR", 'R', ModItems.rag_piss });
|
CraftingManager.addRecipeAuto(new ItemStack(ModItems.mask_piss, 1), new Object[] { "RRR", 'R', ModItems.rag_piss });
|
||||||
|
|
||||||
//Capes
|
|
||||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Blocks.wool, 1, 11), 'D', KEY_YELLOW, 'I', ModItems.nuclear_waste });
|
|
||||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Blocks.wool, 1, 4), 'D', KEY_BLACK, 'I', ModItems.gas_mask });
|
|
||||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.cape_schrabidium, 1), new Object[] { "W W", "WIW", "WDW", 'W', SA326.ingot(), 'D', KEY_BLACK, 'I', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP) });
|
|
||||||
|
|
||||||
//Configged
|
//Configged
|
||||||
if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleArmorRecipes) {
|
if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleArmorRecipes) {
|
||||||
addHelmet( STAR.ingot(), ModItems.starmetal_helmet);
|
addHelmet( STAR.ingot(), ModItems.starmetal_helmet);
|
||||||
|
|||||||
@ -103,7 +103,7 @@ public class HbmPlayerProps implements IExtendedEntityProperties {
|
|||||||
if(this.enableMagnet)
|
if(this.enableMagnet)
|
||||||
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "Magnet ON", MainRegistry.proxy.ID_MAGNET, 1000), (EntityPlayerMP) player);
|
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "Magnet ON", MainRegistry.proxy.ID_MAGNET, 1000), (EntityPlayerMP) player);
|
||||||
else
|
else
|
||||||
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "Magnet ON", MainRegistry.proxy.ID_MAGNET, 1000), (EntityPlayerMP) player);
|
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.RED + "Magnet OFF", MainRegistry.proxy.ID_MAGNET, 1000), (EntityPlayerMP) player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(key == EnumKeybind.TOGGLE_HEAD) {
|
if(key == EnumKeybind.TOGGLE_HEAD) {
|
||||||
@ -114,7 +114,7 @@ public class HbmPlayerProps implements IExtendedEntityProperties {
|
|||||||
if(this.enableHUD)
|
if(this.enableHUD)
|
||||||
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "HUD ON", MainRegistry.proxy.ID_HUD, 1000), (EntityPlayerMP) player);
|
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "HUD ON", MainRegistry.proxy.ID_HUD, 1000), (EntityPlayerMP) player);
|
||||||
else
|
else
|
||||||
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.GREEN + "HUD ON", MainRegistry.proxy.ID_HUD, 1000), (EntityPlayerMP) player);
|
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(EnumChatFormatting.RED + "HUD OFF", MainRegistry.proxy.ID_HUD, 1000), (EntityPlayerMP) player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -645,11 +645,11 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
|||||||
|
|
||||||
// bomb parts
|
// bomb parts
|
||||||
this.register(new GenericRecipe("ass.explosivelenses1").setup(400, 100).outputItems(new ItemStack(ModItems.early_explosive_lenses, 1))
|
this.register(new GenericRecipe("ass.explosivelenses1").setup(400, 100).outputItems(new ItemStack(ModItems.early_explosive_lenses, 1))
|
||||||
.inputItems(new OreDictStack(AL.plate(), 8), new OreDictStack(GOLD.wireFine(), 16), new ComparableStack(ModBlocks.det_cord, 8), new OreDictStack(CU.plate(), 2), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 20), new OreDictStack(ANY_PLASTIC.ingot(), 4)));
|
.inputItems(new OreDictStack(AL.plate(), 8), new ComparableStack(ModBlocks.det_cord, 8), new OreDictStack(BIGMT.plate(), 2), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 20), new OreDictStack(ANY_PLASTIC.ingot(), 4)));
|
||||||
this.register(new GenericRecipe("ass.explosivelenses2").setup(400, 100).outputItems(new ItemStack(ModItems.explosive_lenses, 1))
|
this.register(new GenericRecipe("ass.explosivelenses2").setup(400, 100).outputItems(new ItemStack(ModItems.explosive_lenses, 1))
|
||||||
.inputItems(new OreDictStack(AL.plate(), 8), new OreDictStack(MINGRADE.wireFine(), 16), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 4), new OreDictStack(CU.plate(), 2), new ComparableStack(ModItems.ball_tatb, 16), new OreDictStack(RUBBER.ingot(), 2)));
|
.inputItems(new OreDictStack(AL.plate(), 8), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 4), new ComparableStack(ModItems.neutron_reflector, 2), new ComparableStack(ModItems.ball_tatb, 16), new OreDictStack(RUBBER.ingot(), 2)));
|
||||||
this.register(new GenericRecipe("ass.wiring").setup(200, 100).outputItems(new ItemStack(ModItems.gadget_wireing, 1))
|
this.register(new GenericRecipe("ass.wiring").setup(200, 100).outputItems(new ItemStack(ModItems.gadget_wireing, 1))
|
||||||
.inputItems(new OreDictStack(IRON.plate(), 1), new OreDictStack(GOLD.wireFine(), 12)));
|
.inputItems(new OreDictStack(GOLD.wireFine(), 24)));
|
||||||
this.register(new GenericRecipe("ass.core1").setup(1_200, 100).outputItems(new ItemStack(ModItems.gadget_core, 1))
|
this.register(new GenericRecipe("ass.core1").setup(1_200, 100).outputItems(new ItemStack(ModItems.gadget_core, 1))
|
||||||
.inputItems(new OreDictStack(PU239.nugget(), 7), new OreDictStack(U238.nugget(), 3)));
|
.inputItems(new OreDictStack(PU239.nugget(), 7), new OreDictStack(U238.nugget(), 3)));
|
||||||
this.register(new GenericRecipe("ass.boyshield").setup(200, 100).outputItems(new ItemStack(ModItems.boy_shielding, 1))
|
this.register(new GenericRecipe("ass.boyshield").setup(200, 100).outputItems(new ItemStack(ModItems.boy_shielding, 1))
|
||||||
@ -663,16 +663,16 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
|||||||
this.register(new GenericRecipe("ass.boyigniter").setup(200, 100).outputItems(new ItemStack(ModItems.boy_igniter, 1))
|
this.register(new GenericRecipe("ass.boyigniter").setup(200, 100).outputItems(new ItemStack(ModItems.boy_igniter, 1))
|
||||||
.inputItems(new OreDictStack(AL.shell(), 3), new OreDictStack(DURA.plateCast(), 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 16)));
|
.inputItems(new OreDictStack(AL.shell(), 3), new OreDictStack(DURA.plateCast(), 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 16)));
|
||||||
this.register(new GenericRecipe("ass.manigniter").setup(200, 100).outputItems(new ItemStack(ModItems.man_igniter, 1))
|
this.register(new GenericRecipe("ass.manigniter").setup(200, 100).outputItems(new ItemStack(ModItems.man_igniter, 1))
|
||||||
.inputItems(new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 9)));
|
.inputItems(new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(GOLD.wireFine(), 24)));
|
||||||
this.register(new GenericRecipe("ass.mancore").setup(1_200, 100).outputItems(new ItemStack(ModItems.man_core, 1))
|
this.register(new GenericRecipe("ass.mancore").setup(1_200, 100).outputItems(new ItemStack(ModItems.man_core, 1))
|
||||||
.inputItems(new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2)));
|
.inputItems(new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2)));
|
||||||
this.register(new GenericRecipe("ass.mikecore").setup(1_200, 100).outputItems(new ItemStack(ModItems.mike_core, 1))
|
this.register(new GenericRecipe("ass.mikecore").setup(1_200, 100).outputItems(new ItemStack(ModItems.mike_core, 1))
|
||||||
.inputItems(new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.ingot(), 6)));
|
.inputItems(new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.plate(), 6)));
|
||||||
this.register(new GenericRecipe("ass.mikedeut").setup(600, 100).outputItems(new ItemStack(ModItems.mike_deut, 1))
|
this.register(new GenericRecipe("ass.mikedeut").setup(600, 100).outputItems(new ItemStack(ModItems.mike_deut, 1))
|
||||||
.inputItems(new OreDictStack(IRON.plate(), 12), new OreDictStack(STEEL.plate(), 16))
|
.inputItems(new OreDictStack(WEAPONSTEEL.plate(), 16), new OreDictStack(TI.plate(), 16))
|
||||||
.inputFluids(new FluidStack(Fluids.DEUTERIUM, 10_000)));
|
.inputFluids(new FluidStack(Fluids.DEUTERIUM, 10_000)));
|
||||||
this.register(new GenericRecipe("ass.mikecooler").setup(300, 100).outputItems(new ItemStack(ModItems.mike_cooling_unit, 1))
|
this.register(new GenericRecipe("ass.mikecooler").setup(300, 100).outputItems(new ItemStack(ModItems.mike_cooling_unit, 1))
|
||||||
.inputItems(new OreDictStack(IRON.plate(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2)));
|
.inputItems(new OreDictStack(DURA.plate(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2)));
|
||||||
this.register(new GenericRecipe("ass.fleijaigniter").setup(200, 100).outputItems(new ItemStack(ModItems.fleija_igniter, 1))
|
this.register(new GenericRecipe("ass.fleijaigniter").setup(200, 100).outputItems(new ItemStack(ModItems.fleija_igniter, 1))
|
||||||
.inputItems(new OreDictStack(TI.plate(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal())));
|
.inputItems(new OreDictStack(TI.plate(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal())));
|
||||||
this.register(new GenericRecipe("ass.fleijacore").setup(600, 100).outputItems(new ItemStack(ModItems.fleija_core, 1))
|
this.register(new GenericRecipe("ass.fleijacore").setup(600, 100).outputItems(new ItemStack(ModItems.fleija_core, 1))
|
||||||
|
|||||||
@ -1844,11 +1844,6 @@ public class ModItems {
|
|||||||
public static Item wrench_flipped;
|
public static Item wrench_flipped;
|
||||||
public static Item memespoon;
|
public static Item memespoon;
|
||||||
|
|
||||||
public static Item saw;
|
|
||||||
public static Item bat;
|
|
||||||
public static Item bat_nail;
|
|
||||||
public static Item golf_club;
|
|
||||||
public static Item pipe_rusty;
|
|
||||||
public static Item pipe_lead;
|
public static Item pipe_lead;
|
||||||
public static Item reer_graar;
|
public static Item reer_graar;
|
||||||
public static Item stopsign;
|
public static Item stopsign;
|
||||||
@ -1960,10 +1955,10 @@ public class ModItems {
|
|||||||
|
|
||||||
public static Item rod_of_discord;
|
public static Item rod_of_discord;
|
||||||
|
|
||||||
public static Item cape_radiation;
|
@Deprecated public static Item cape_radiation;
|
||||||
public static Item cape_gasmask;
|
@Deprecated public static Item cape_gasmask;
|
||||||
public static Item cape_schrabidium;
|
@Deprecated public static Item cape_schrabidium;
|
||||||
public static Item cape_hidden;
|
@Deprecated public static Item cape_hidden;
|
||||||
|
|
||||||
public static Item nuke_starter_kit;
|
public static Item nuke_starter_kit;
|
||||||
public static Item nuke_advanced_kit;
|
public static Item nuke_advanced_kit;
|
||||||
@ -3708,7 +3703,7 @@ public class ModItems {
|
|||||||
battery_spark = new Item().setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_spark");
|
battery_spark = new Item().setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_spark");
|
||||||
battery_trixite = new Item().setUnlocalizedName("battery_trixite").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_trixite");
|
battery_trixite = new Item().setUnlocalizedName("battery_trixite").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_trixite");
|
||||||
|
|
||||||
battery_pack = new ItemBatteryPack().setUnlocalizedName("battery_pack").setTextureName(RefStrings.MODID + ":battery_generic_new");
|
battery_pack = new ItemBatteryPack().setUnlocalizedName("battery_pack").setTextureName(RefStrings.MODID + ":battery_creative_new");
|
||||||
battery_creative = new ItemBatteryCreative().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new");
|
battery_creative = new ItemBatteryCreative().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new");
|
||||||
cube_power = new ItemBattery(1000000000000000000L, 1000000000000000L, 1000000000000000L).setUnlocalizedName("cube_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cube_power");
|
cube_power = new ItemBattery(1000000000000000000L, 1000000000000000L, 1000000000000000L).setUnlocalizedName("cube_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cube_power");
|
||||||
|
|
||||||
@ -4319,10 +4314,10 @@ public class ModItems {
|
|||||||
wings_murk = new WingsMurk().setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
|
wings_murk = new WingsMurk().setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
|
||||||
wings_limp = new WingsMurk().setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
|
wings_limp = new WingsMurk().setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
|
||||||
|
|
||||||
cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
|
cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_radiation").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
|
||||||
cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask");
|
cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask");
|
||||||
cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium");
|
cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium");
|
||||||
cape_hidden = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_hidden").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown");
|
cape_hidden = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_hidden").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown");
|
||||||
|
|
||||||
schrabidium_hammer = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
|
schrabidium_hammer = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
|
||||||
shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original");
|
shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original");
|
||||||
@ -4345,11 +4340,6 @@ public class ModItems {
|
|||||||
.addAbility(IWeaponAbility.VAMPIRE, 4)
|
.addAbility(IWeaponAbility.VAMPIRE, 4)
|
||||||
.addAbility(IWeaponAbility.BEHEADER, 0).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
|
.addAbility(IWeaponAbility.BEHEADER, 0).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
|
||||||
|
|
||||||
saw = new ModSword(MainRegistry.enumToolMaterialSaw).setUnlocalizedName("weapon_saw").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":saw");
|
|
||||||
bat = new ModSword(MainRegistry.enumToolMaterialBat).setUnlocalizedName("weapon_bat").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":bat");
|
|
||||||
bat_nail = new ModSword(MainRegistry.enumToolMaterialBatNail).setUnlocalizedName("weapon_bat_nail").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":bat_nail");
|
|
||||||
golf_club = new ModSword(MainRegistry.enumToolMaterialGolfClub).setUnlocalizedName("weapon_golf_club").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":golf_club");
|
|
||||||
pipe_rusty = new ModSword(MainRegistry.enumToolMaterialPipeRusty).setUnlocalizedName("weapon_pipe_rusty").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":pipe_rusty");
|
|
||||||
pipe_lead = new ModSword(MainRegistry.enumToolMaterialPipeLead).setUnlocalizedName("weapon_pipe_lead").setFull3D().setTextureName(RefStrings.MODID + ":pipe_lead");
|
pipe_lead = new ModSword(MainRegistry.enumToolMaterialPipeLead).setUnlocalizedName("weapon_pipe_lead").setFull3D().setTextureName(RefStrings.MODID + ":pipe_lead");
|
||||||
reer_graar = new ModSword(MainRegistry.tMatTitan).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd");
|
reer_graar = new ModSword(MainRegistry.tMatTitan).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd");
|
||||||
stopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign");
|
stopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign");
|
||||||
@ -4986,7 +4976,6 @@ public class ModItems {
|
|||||||
GameRegistry.registerItem(plant_item, plant_item.getUnlocalizedName());
|
GameRegistry.registerItem(plant_item, plant_item.getUnlocalizedName());
|
||||||
|
|
||||||
//Teleporter Parts
|
//Teleporter Parts
|
||||||
//GameRegistry.registerItem(telepad, telepad.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(entanglement_kit, entanglement_kit.getUnlocalizedName());
|
GameRegistry.registerItem(entanglement_kit, entanglement_kit.getUnlocalizedName());
|
||||||
|
|
||||||
//Bomb Parts
|
//Bomb Parts
|
||||||
@ -5955,11 +5944,6 @@ public class ModItems {
|
|||||||
GameRegistry.registerItem(wrench_archineer, wrench_archineer.getUnlocalizedName());
|
GameRegistry.registerItem(wrench_archineer, wrench_archineer.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(wrench_flipped, wrench_flipped.getUnlocalizedName());
|
GameRegistry.registerItem(wrench_flipped, wrench_flipped.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(memespoon, memespoon.getUnlocalizedName());
|
GameRegistry.registerItem(memespoon, memespoon.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(saw, saw.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(bat, bat.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(bat_nail, bat_nail.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(golf_club, golf_club.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(pipe_rusty, pipe_rusty.getUnlocalizedName());
|
|
||||||
GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName());
|
GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName());
|
GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName());
|
||||||
GameRegistry.registerItem(stopsign, stopsign.getUnlocalizedName());
|
GameRegistry.registerItem(stopsign, stopsign.getUnlocalizedName());
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
package com.hbm.items.armor;
|
package com.hbm.items.armor;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.IntStream;
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
@ -90,8 +89,7 @@ public class ArmorModel extends ItemArmor {
|
|||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY) {
|
public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY) {
|
||||||
|
|
||||||
if(this != ModItems.goggles && this != ModItems.hazmat_helmet_red && this != ModItems.hazmat_helmet_grey)
|
if(this != ModItems.goggles && this != ModItems.hazmat_helmet_red && this != ModItems.hazmat_helmet_grey) return;
|
||||||
return;
|
|
||||||
|
|
||||||
if(gogglesBlurs == null) gogglesBlurs = IntStream.range(0, 6)
|
if(gogglesBlurs == null) gogglesBlurs = IntStream.range(0, 6)
|
||||||
.mapToObj(i -> new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_" + i + ".png"))
|
.mapToObj(i -> new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_" + i + ".png"))
|
||||||
@ -123,11 +121,4 @@ public class ArmorModel extends ItemArmor {
|
|||||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
|
|
||||||
if(this == ModItems.cape_radiation) list.add("Avalible for everyone");
|
|
||||||
if(this == ModItems.cape_gasmask) list.add("Avalible for everyone");
|
|
||||||
if(this == ModItems.cape_schrabidium) list.add("Avalible for everyone");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,7 +94,7 @@ public class ItemScraps extends ItemAutogen {
|
|||||||
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("liquid")) {
|
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("liquid")) {
|
||||||
return I18nUtil.resolveKey(matName);
|
return I18nUtil.resolveKey(matName);
|
||||||
} else {
|
} else {
|
||||||
return ("" + StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".name", matName)).trim();
|
return ("" + StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".name", StatCollector.translateToLocal(matName))).trim();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,6 @@ public class ItemScraps extends ItemAutogen {
|
|||||||
list.add(Mats.formatAmount(contents.amount, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
|
list.add(Mats.formatAmount(contents.amount, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
|
||||||
|
|
||||||
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("liquid")) {
|
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("liquid")) {
|
||||||
list.add(Mats.formatAmount(contents.amount, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
|
|
||||||
if(contents.material.smeltable == contents.material.smeltable.ADDITIVE) list.add(EnumChatFormatting.DARK_RED + "Additive, not castable!");
|
if(contents.material.smeltable == contents.material.smeltable.ADDITIVE) list.add(EnumChatFormatting.DARK_RED + "Additive, not castable!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,12 +41,11 @@ public class ItemOreDensityScanner extends Item {
|
|||||||
int tier = BedrockOre.getTier(totalLevel);
|
int tier = BedrockOre.getTier(totalLevel);
|
||||||
FluidStack boreFluid = BedrockOre.getBoreFluid(totalLevel);
|
FluidStack boreFluid = BedrockOre.getBoreFluid(totalLevel);
|
||||||
|
|
||||||
ChatBuilder builder = ChatBuilder.start("Tier " + tier);
|
ChatBuilder builder = ChatBuilder.start("Tier " + tier).color(EnumChatFormatting.YELLOW);
|
||||||
if(boreFluid != null) {
|
if(boreFluid != null) {
|
||||||
builder.next(" - " + boreFluid.fill + "mB ")
|
builder.next(" - " + boreFluid.fill + "mB ")
|
||||||
.nextTranslation(boreFluid.type.getUnlocalizedName());
|
.nextTranslation(boreFluid.type.getUnlocalizedName());
|
||||||
}
|
}
|
||||||
builder.color(EnumChatFormatting.YELLOW);
|
|
||||||
|
|
||||||
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(builder.flush(), 777 + BedrockOreType.values().length, 4000), player);
|
PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(builder.flush(), 777 + BedrockOreType.values().length, 4000), player);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,26 +10,15 @@ import net.minecraft.item.ItemSword;
|
|||||||
|
|
||||||
public class ModSword extends ItemSword {
|
public class ModSword extends ItemSword {
|
||||||
|
|
||||||
public ModSword(ToolMaterial p_i45356_1_) {
|
public ModSword(ToolMaterial mat) {
|
||||||
super(p_i45356_1_);
|
super(mat);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
|
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
|
||||||
{
|
|
||||||
if(this == ModItems.saw)
|
|
||||||
list.add("Prepare for your examination!");
|
|
||||||
if(this == ModItems.bat)
|
|
||||||
list.add("Do you like hurting other people?");
|
|
||||||
if(this == ModItems.bat_nail)
|
|
||||||
list.add("Or is it a classic?");
|
|
||||||
if(this == ModItems.golf_club)
|
|
||||||
list.add("Property of Miami Beach Golf Club.");
|
|
||||||
if(this == ModItems.pipe_rusty)
|
|
||||||
list.add("Ouch! Ouch! Ouch!");
|
|
||||||
if(this == ModItems.pipe_lead)
|
if(this == ModItems.pipe_lead)
|
||||||
list.add("Manually override anything by smashing it with this pipe.");
|
list.add("I'm going to attempt a manual override on this wall.");
|
||||||
//list.add("I'm going to attempt a manual override on this wall.");
|
|
||||||
if(this == ModItems.reer_graar) {
|
if(this == ModItems.reer_graar) {
|
||||||
list.add("Call now!");
|
list.add("Call now!");
|
||||||
list.add("555-10-3728-ZX7-INFINITE");
|
list.add("555-10-3728-ZX7-INFINITE");
|
||||||
|
|||||||
@ -72,7 +72,7 @@ public class XFactory40mm {
|
|||||||
Lego.standardExplode(bullet, mop, 5F); bullet.setDead();
|
Lego.standardExplode(bullet, mop, 5F); bullet.setDead();
|
||||||
};
|
};
|
||||||
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE_HEAT = (bullet, mop) -> {
|
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE_HEAT = (bullet, mop) -> {
|
||||||
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3) return;
|
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return;
|
||||||
Lego.standardExplode(bullet, mop, 3.5F); bullet.setDead();
|
Lego.standardExplode(bullet, mop, 3.5F); bullet.setDead();
|
||||||
if(mop.typeOfHit == mop.typeOfHit.ENTITY && mop.entityHit instanceof EntityLivingBase) {
|
if(mop.typeOfHit == mop.typeOfHit.ENTITY && mop.entityHit instanceof EntityLivingBase) {
|
||||||
EntityLivingBase living = (EntityLivingBase) mop.entityHit;
|
EntityLivingBase living = (EntityLivingBase) mop.entityHit;
|
||||||
@ -82,7 +82,7 @@ public class XFactory40mm {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE_DEMO = (bullet, mop) -> {
|
public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE_DEMO = (bullet, mop) -> {
|
||||||
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3) return;
|
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return;
|
||||||
ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F, bullet.getThrower());
|
ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F, bullet.getThrower());
|
||||||
vnt.setBlockAllocator(new BlockAllocatorStandard());
|
vnt.setBlockAllocator(new BlockAllocatorStandard());
|
||||||
vnt.setBlockProcessor(new BlockProcessorStandard());
|
vnt.setBlockProcessor(new BlockProcessorStandard());
|
||||||
@ -100,7 +100,7 @@ public class XFactory40mm {
|
|||||||
};
|
};
|
||||||
|
|
||||||
public static void spawnFire(EntityBulletBaseMK4 bullet, MovingObjectPosition mop, boolean phosphorus, int duration) {
|
public static void spawnFire(EntityBulletBaseMK4 bullet, MovingObjectPosition mop, boolean phosphorus, int duration) {
|
||||||
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3) return;
|
if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return;
|
||||||
World world = bullet.worldObj;
|
World world = bullet.worldObj;
|
||||||
Lego.standardExplode(bullet, mop, 3F);
|
Lego.standardExplode(bullet, mop, 3F);
|
||||||
EntityFireLingering fire = new EntityFireLingering(world).setArea(5, 2).setDuration(duration).setType(phosphorus ? EntityFireLingering.TYPE_PHOSPHORUS : EntityFireLingering.TYPE_DIESEL);
|
EntityFireLingering fire = new EntityFireLingering(world).setArea(5, 2).setDuration(duration).setType(phosphorus ? EntityFireLingering.TYPE_PHOSPHORUS : EntityFireLingering.TYPE_DIESEL);
|
||||||
|
|||||||
@ -3,7 +3,7 @@ package com.hbm.lib;
|
|||||||
public class RefStrings {
|
public class RefStrings {
|
||||||
public static final String MODID = "hbm";
|
public static final String MODID = "hbm";
|
||||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
||||||
public static final String VERSION = "1.0.27 BETA (5685)";
|
public static final String VERSION = "1.0.27 BETA (5687)";
|
||||||
//HBM's Beta Naming Convention:
|
//HBM's Beta Naming Convention:
|
||||||
//V T (X)
|
//V T (X)
|
||||||
//V -> next release version
|
//V -> next release version
|
||||||
|
|||||||
@ -436,6 +436,8 @@ public class ClientProxy extends ServerProxy {
|
|||||||
//Watz
|
//Watz
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatz.class, new RenderWatz());
|
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatz.class, new RenderWatz());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatzPump.class, new RenderWatzPump());
|
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatzPump.class, new RenderWatzPump());
|
||||||
|
//Elevator
|
||||||
|
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCargoElevator.class, new RenderCargoElevator());
|
||||||
//doors
|
//doors
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBlastDoor.class, new RenderBlastDoor());
|
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBlastDoor.class, new RenderBlastDoor());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDoorGeneric.class, new RenderDoorGeneric());
|
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDoorGeneric.class, new RenderDoorGeneric());
|
||||||
|
|||||||
@ -647,6 +647,8 @@ public class CraftingManager {
|
|||||||
addRecipeAuto(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks });
|
addRecipeAuto(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks });
|
||||||
addRecipeAuto(new ItemStack(ModBlocks.pink_stairs, 6), new Object[] { "W ", "WW ", "WWW", 'W', ModBlocks.pink_planks });
|
addRecipeAuto(new ItemStack(ModBlocks.pink_stairs, 6), new Object[] { "W ", "WW ", "WWW", 'W', ModBlocks.pink_planks });
|
||||||
|
|
||||||
|
addRecipeAuto(new ItemStack(ModBlocks.cargo_elevator, 3), new Object[] { "GGG", "SPS", 'G', ModBlocks.steel_grate, 'S', STEEL.ingot(), 'P', new ItemStack(ModItems.part_generic, 1, EnumPartType.PISTON_HYDRAULIC.ordinal()) });
|
||||||
|
|
||||||
addRecipeAuto(new ItemStack(ModItems.door_metal, 1), new Object[] { "II", "SS", "II", 'I', IRON.plate(), 'S', STEEL.plate() });
|
addRecipeAuto(new ItemStack(ModItems.door_metal, 1), new Object[] { "II", "SS", "II", 'I', IRON.plate(), 'S', STEEL.plate() });
|
||||||
addRecipeAuto(new ItemStack(ModItems.door_office, 1), new Object[] { "II", "SS", "II", 'I', KEY_PLANKS, 'S', IRON.plate() });
|
addRecipeAuto(new ItemStack(ModItems.door_office, 1), new Object[] { "II", "SS", "II", 'I', KEY_PLANKS, 'S', IRON.plate() });
|
||||||
addRecipeAuto(new ItemStack(ModItems.door_bunker, 1), new Object[] { "II", "SS", "II", 'I', STEEL.plate(), 'S', PB.plate() });
|
addRecipeAuto(new ItemStack(ModItems.door_bunker, 1), new Object[] { "II", "SS", "II", 'I', STEEL.plate(), 'S', PB.plate() });
|
||||||
|
|||||||
@ -115,11 +115,6 @@ public class MainRegistry {
|
|||||||
public static ToolMaterial tMatDesh = EnumHelper.addToolMaterial("HBM_DESH", 2, 0, 7.5F, 2.0F, 10);
|
public static ToolMaterial tMatDesh = EnumHelper.addToolMaterial("HBM_DESH", 2, 0, 7.5F, 2.0F, 10);
|
||||||
public static ToolMaterial tMatCobalt = EnumHelper.addToolMaterial("HBM_COBALT", 3, 750, 9.0F, 2.5F, 60);
|
public static ToolMaterial tMatCobalt = EnumHelper.addToolMaterial("HBM_COBALT", 3, 750, 9.0F, 2.5F, 60);
|
||||||
|
|
||||||
public static ToolMaterial enumToolMaterialSaw = EnumHelper.addToolMaterial("SAW", 2, 750, 2.0F, 3.5F, 25);
|
|
||||||
public static ToolMaterial enumToolMaterialBat = EnumHelper.addToolMaterial("BAT", 0, 500, 1.5F, 3F, 25);
|
|
||||||
public static ToolMaterial enumToolMaterialBatNail = EnumHelper.addToolMaterial("BATNAIL", 0, 450, 1.0F, 4F, 25);
|
|
||||||
public static ToolMaterial enumToolMaterialGolfClub = EnumHelper.addToolMaterial("GOLFCLUB", 1, 1000, 2.0F, 5F, 25);
|
|
||||||
public static ToolMaterial enumToolMaterialPipeRusty = EnumHelper.addToolMaterial("PIPERUSTY", 1, 350, 1.5F, 4.5F, 25);
|
|
||||||
public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 3F, 25);
|
public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 3F, 25);
|
||||||
|
|
||||||
public static ToolMaterial enumToolMaterialBottleOpener = EnumHelper.addToolMaterial("OPENER", 1, 250, 1.5F, 0.5F, 200);
|
public static ToolMaterial enumToolMaterialBottleOpener = EnumHelper.addToolMaterial("OPENER", 1, 250, 1.5F, 0.5F, 200);
|
||||||
@ -1605,6 +1600,11 @@ public class MainRegistry {
|
|||||||
ignoreMappings.add("hbm:item.battery_sc_lead");
|
ignoreMappings.add("hbm:item.battery_sc_lead");
|
||||||
ignoreMappings.add("hbm:item.battery_sc_americium");
|
ignoreMappings.add("hbm:item.battery_sc_americium");
|
||||||
ignoreMappings.add("hbm:item.overfuse");
|
ignoreMappings.add("hbm:item.overfuse");
|
||||||
|
ignoreMappings.add("hbm:item.weapon_saw");
|
||||||
|
ignoreMappings.add("hbm:item.weapon_bat");
|
||||||
|
ignoreMappings.add("hbm:item.weapon_bat_nail");
|
||||||
|
ignoreMappings.add("hbm:item.weapon_golf_club");
|
||||||
|
ignoreMappings.add("hbm:item.weapon_pipe_rusty");
|
||||||
|
|
||||||
/// REMAP ///
|
/// REMAP ///
|
||||||
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);
|
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);
|
||||||
|
|||||||
@ -305,11 +305,8 @@ public class ResourceManager {
|
|||||||
//Drain
|
//Drain
|
||||||
public static final IModelCustom drain = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drain.obj"));
|
public static final IModelCustom drain = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drain.obj"));
|
||||||
|
|
||||||
//Vault Door
|
//Elevator
|
||||||
public static final IModelCustom vault_cog = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/vault_cog.obj"));
|
public static final IModelCustom cargo_elevator = new HFRWavefrontObject("models/machines/elevator.obj").asVBO();
|
||||||
public static final IModelCustom vault_frame = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/vault_frame.obj"));
|
|
||||||
public static final IModelCustom vault_teeth = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/vault_teeth.obj"));
|
|
||||||
public static final IModelCustom vault_label = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/vault_label.obj"));
|
|
||||||
|
|
||||||
//Blast Door
|
//Blast Door
|
||||||
public static final IModelCustom blast_door_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_base.obj"));
|
public static final IModelCustom blast_door_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blast_door_base.obj"));
|
||||||
@ -776,6 +773,9 @@ public class ResourceManager {
|
|||||||
//SatDock
|
//SatDock
|
||||||
public static final ResourceLocation satdock_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_dock.png");
|
public static final ResourceLocation satdock_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_dock.png");
|
||||||
|
|
||||||
|
//Elevator
|
||||||
|
public static final ResourceLocation cargo_elevator_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/elevator.png");
|
||||||
|
|
||||||
//Vault Door
|
//Vault Door
|
||||||
public static final ResourceLocation vault_cog_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_cog.png");
|
public static final ResourceLocation vault_cog_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_cog.png");
|
||||||
public static final ResourceLocation vault_frame_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_frame.png");
|
public static final ResourceLocation vault_frame_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_frame.png");
|
||||||
|
|||||||
@ -0,0 +1,78 @@
|
|||||||
|
package com.hbm.render.tileentity;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import com.hbm.blocks.ModBlocks;
|
||||||
|
import com.hbm.main.ResourceManager;
|
||||||
|
import com.hbm.render.item.ItemRenderBase;
|
||||||
|
import com.hbm.tileentity.machine.TileEntityCargoElevator;
|
||||||
|
|
||||||
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
|
|
||||||
|
public class RenderCargoElevator extends TileEntitySpecialRenderer implements IItemRendererProvider {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float interp) {
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslated(x + 0.5, y, z + 0.5);
|
||||||
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||||
|
|
||||||
|
bindTexture(ResourceManager.cargo_elevator_tex);
|
||||||
|
TileEntityCargoElevator elevator = (TileEntityCargoElevator) tile;
|
||||||
|
|
||||||
|
if(elevator.renderPlatform) {
|
||||||
|
double extension = elevator.prevExtension + (elevator.extension - elevator.prevExtension) * interp;
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Base");
|
||||||
|
|
||||||
|
GL11.glPushMatrix(); {
|
||||||
|
GL11.glTranslated(0, extension, 0);
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Platform");
|
||||||
|
for(int i = 0; i < extension + 1; i++) {
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Piston");
|
||||||
|
GL11.glTranslated(0, -1, 0);
|
||||||
|
}
|
||||||
|
} GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPushMatrix(); {
|
||||||
|
for(int i = 0; i <= elevator.height; i++) {
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Guides");
|
||||||
|
GL11.glTranslated(0, 1, 0);
|
||||||
|
}
|
||||||
|
} GL11.glPopMatrix();
|
||||||
|
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Item getItemForRenderer() {
|
||||||
|
return Item.getItemFromBlock(ModBlocks.cargo_elevator);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IItemRenderer getRenderer() {
|
||||||
|
return new ItemRenderBase() {
|
||||||
|
public void renderInventory() {
|
||||||
|
GL11.glTranslated(0, -2.75, 0);
|
||||||
|
GL11.glScaled(3.25, 3.25, 3.25);
|
||||||
|
}
|
||||||
|
public void renderCommon() {
|
||||||
|
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||||
|
bindTexture(ResourceManager.cargo_elevator_tex);
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Base");
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Piston");
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Guides");
|
||||||
|
GL11.glTranslated(0, 1, 0);
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Piston");
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Guides");
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Platform");
|
||||||
|
GL11.glTranslated(0, 1, 0);
|
||||||
|
ResourceManager.cargo_elevator.renderPart("Guides");
|
||||||
|
GL11.glShadeModel(GL11.GL_FLAT);
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -221,8 +221,9 @@ public class TileMappings {
|
|||||||
put(TileEntityPlushie.class, "tileentity_ntm_plushie");
|
put(TileEntityPlushie.class, "tileentity_ntm_plushie");
|
||||||
put(TileEntityEmitter.class, "tileentity_ntm_emitter");
|
put(TileEntityEmitter.class, "tileentity_ntm_emitter");
|
||||||
|
|
||||||
|
put(TileEntityCargoElevator.class, "tileentity_cargo_elevator");
|
||||||
put(TileEntityDoorGeneric.class, "tileentity_ntm_door");
|
put(TileEntityDoorGeneric.class, "tileentity_ntm_door");
|
||||||
|
|
||||||
put(TileEntityCharger.class, "tileentity_ntm_charger");
|
put(TileEntityCharger.class, "tileentity_ntm_charger");
|
||||||
put(TileEntityRefueler.class, "tileentity_ntm_refueler");
|
put(TileEntityRefueler.class, "tileentity_ntm_refueler");
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,159 @@
|
|||||||
|
package com.hbm.tileentity.machine;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.hbm.blocks.BlockDummyable;
|
||||||
|
import com.hbm.blocks.ModBlocks;
|
||||||
|
import com.hbm.tileentity.TileEntityLoadedBase;
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.util.AxisAlignedBB;
|
||||||
|
import net.minecraft.util.MathHelper;
|
||||||
|
|
||||||
|
public class TileEntityCargoElevator extends TileEntityLoadedBase {
|
||||||
|
|
||||||
|
public int height = 0;
|
||||||
|
|
||||||
|
public double extension;
|
||||||
|
public double prevExtension;
|
||||||
|
public double syncExtension;
|
||||||
|
private int sync;
|
||||||
|
|
||||||
|
public boolean isExtending;
|
||||||
|
public static final double speed = 2D / 20D; // 2 blocks per second
|
||||||
|
public boolean renderPlatform = false;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateEntity() {
|
||||||
|
|
||||||
|
this.prevExtension = this.extension;
|
||||||
|
|
||||||
|
if(!worldObj.isRemote) {
|
||||||
|
|
||||||
|
// connect to lower elevator
|
||||||
|
if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.cargo_elevator) {
|
||||||
|
int[] pos = ((BlockDummyable) ModBlocks.cargo_elevator).findCore(worldObj, xCoord, yCoord - 1, zCoord);
|
||||||
|
if(pos != null && pos[0] == xCoord && pos[2] == zCoord) {
|
||||||
|
TileEntityCargoElevator lower = (TileEntityCargoElevator) worldObj.getTileEntity(pos[0], pos[1], pos[2]);
|
||||||
|
lower.height += this.height + 1;
|
||||||
|
for(int x = xCoord -1; x < xCoord + 2; x++) for(int z = zCoord -1; z < zCoord + 2; z++) {
|
||||||
|
for(int y = yCoord; y <= yCoord + this.height; y++) worldObj.setBlock(x, y, z, ModBlocks.cargo_elevator, 1, 3);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(this.isExtending && this.extension < this.height) {
|
||||||
|
this.extension += this.speed;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!this.isExtending && this.extension > 0) {
|
||||||
|
this.extension -= this.speed;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.extension = MathHelper.clamp_double(this.extension, 0, this.height);
|
||||||
|
|
||||||
|
// exist for at least one tick before the main portion gets rendered, fixes the short flickering platform that instantly despawns
|
||||||
|
renderPlatform = true;
|
||||||
|
|
||||||
|
this.networkPackNT(100);
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if(this.sync > 0) {
|
||||||
|
this.extension = this.extension + ((this.syncExtension - this.extension) / (float) this.sync);
|
||||||
|
--this.sync;
|
||||||
|
} else {
|
||||||
|
this.extension = this.syncExtension;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(this.extension != this.prevExtension) {
|
||||||
|
double liftUpper = this.yCoord + 1 + Math.max(this.extension, this.prevExtension);
|
||||||
|
double liftLower = this.yCoord + 1 + Math.min(this.extension, this.prevExtension);
|
||||||
|
List<Entity> toLift = worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(xCoord - 0.99, liftLower, zCoord - 0.99, xCoord + 1.99, liftUpper, zCoord + 1.99));
|
||||||
|
|
||||||
|
for(Entity e : toLift) {
|
||||||
|
if(e instanceof EntityPlayer && !worldObj.isRemote) continue;
|
||||||
|
if(e.boundingBox.minY >= liftLower && e.boundingBox.minY <= liftUpper) {
|
||||||
|
double delta = e.boundingBox.minY - (this.yCoord + 1 + this.extension);
|
||||||
|
e.moveEntity(0, -delta, 0);
|
||||||
|
e.onGround = true;
|
||||||
|
e.moveEntity(0, -0.125, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void toggleElevator() {
|
||||||
|
|
||||||
|
if(this.extension >= this.height) {
|
||||||
|
this.isExtending = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(this.extension <= 0) {
|
||||||
|
this.isExtending = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void serialize(ByteBuf buf) {
|
||||||
|
super.serialize(buf);
|
||||||
|
buf.writeBoolean(renderPlatform);
|
||||||
|
buf.writeShort((short) height);
|
||||||
|
buf.writeDouble(extension);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deserialize(ByteBuf buf) {
|
||||||
|
super.deserialize(buf);
|
||||||
|
this.renderPlatform = buf.readBoolean();
|
||||||
|
this.height = buf.readShort();
|
||||||
|
this.syncExtension = buf.readDouble();
|
||||||
|
|
||||||
|
if(this.syncExtension > 0 && this.syncExtension < this.height) {
|
||||||
|
this.sync = 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void readFromNBT(NBTTagCompound nbt) {
|
||||||
|
super.readFromNBT(nbt);
|
||||||
|
|
||||||
|
this.extension = nbt.getDouble("extension");
|
||||||
|
this.isExtending = nbt.getBoolean("isExtending");
|
||||||
|
this.height = nbt.getInteger("height");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeToNBT(NBTTagCompound nbt) {
|
||||||
|
super.writeToNBT(nbt);
|
||||||
|
|
||||||
|
nbt.setDouble("extension", extension);
|
||||||
|
nbt.setBoolean("isExtending", isExtending);
|
||||||
|
nbt.setInteger("height", height);
|
||||||
|
}
|
||||||
|
|
||||||
|
AxisAlignedBB bb = null;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AxisAlignedBB getRenderBoundingBox() {
|
||||||
|
|
||||||
|
int h = 1 + this.height;
|
||||||
|
|
||||||
|
if(bb == null || bb.maxY - bb.minY < h) {
|
||||||
|
bb = AxisAlignedBB.getBoundingBox(
|
||||||
|
xCoord - 1,
|
||||||
|
yCoord,
|
||||||
|
zCoord - 1,
|
||||||
|
xCoord + 2,
|
||||||
|
yCoord + h,
|
||||||
|
zCoord + 2
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return bb;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -139,7 +139,7 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem
|
|||||||
frame = !worldObj.getBlock(xCoord, yCoord + 3, zCoord).isAir(worldObj, xCoord, yCoord + 3, zCoord);
|
frame = !worldObj.getBlock(xCoord, yCoord + 3, zCoord).isAir(worldObj, xCoord, yCoord + 3, zCoord);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.didProcess && MainRegistry.proxy.me().getDistance(xCoord , yCoord, zCoord) < 50) {
|
if(this.didProcess && MainRegistry.proxy.me().getDistance(xCoord , yCoord, zCoord) < 30) {
|
||||||
if(audio == null) {
|
if(audio == null) {
|
||||||
audio = createAudioLoop();
|
audio = createAudioLoop();
|
||||||
audio.startSound();
|
audio.startSound();
|
||||||
|
|||||||
@ -16,6 +16,8 @@ import com.hbm.items.machine.ItemMachineUpgrade;
|
|||||||
import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
|
import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
|
||||||
import com.hbm.lib.Library;
|
import com.hbm.lib.Library;
|
||||||
import com.hbm.main.MainRegistry;
|
import com.hbm.main.MainRegistry;
|
||||||
|
import com.hbm.main.NTMSounds;
|
||||||
|
import com.hbm.sound.AudioWrapper;
|
||||||
import com.hbm.tileentity.*;
|
import com.hbm.tileentity.*;
|
||||||
import com.hbm.util.BobMathUtil;
|
import com.hbm.util.BobMathUtil;
|
||||||
import com.hbm.util.fauxpointtwelve.DirPos;
|
import com.hbm.util.fauxpointtwelve.DirPos;
|
||||||
@ -47,6 +49,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
|
|||||||
|
|
||||||
public float angle;
|
public float angle;
|
||||||
public float prevAngle;
|
public float prevAngle;
|
||||||
|
private AudioWrapper audio;
|
||||||
|
|
||||||
public FluidTank tank;
|
public FluidTank tank;
|
||||||
|
|
||||||
@ -113,6 +116,29 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
|
|||||||
if(worldObj.rand.nextInt(20) == 0 && MainRegistry.proxy.me().getDistance(xCoord + 0.5, yCoord + 6, zCoord + 0.5) < 50) {
|
if(worldObj.rand.nextInt(20) == 0 && MainRegistry.proxy.me().getDistance(xCoord + 0.5, yCoord + 6, zCoord + 0.5) < 50) {
|
||||||
worldObj.spawnParticle("cloud", xCoord + worldObj.rand.nextDouble(), yCoord + 6.5D, zCoord + worldObj.rand.nextDouble(), 0.0, 0.1, 0.0);
|
worldObj.spawnParticle("cloud", xCoord + worldObj.rand.nextDouble(), yCoord + 6.5D, zCoord + worldObj.rand.nextDouble(), 0.0, 0.1, 0.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(MainRegistry.proxy.me().getDistance(xCoord , yCoord, zCoord) < 25) {
|
||||||
|
if(audio == null) {
|
||||||
|
audio = createAudioLoop();
|
||||||
|
audio.startSound();
|
||||||
|
} else if(!audio.isPlaying()) {
|
||||||
|
audio = rebootAudio(audio);
|
||||||
|
}
|
||||||
|
audio.keepAlive();
|
||||||
|
audio.updateVolume(this.getVolume(1F));
|
||||||
|
audio.updatePitch(0.75F);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
if(audio != null) {
|
||||||
|
audio.stopSound();
|
||||||
|
audio = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if(audio != null) {
|
||||||
|
audio.stopSound();
|
||||||
|
audio = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,6 +160,19 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override public AudioWrapper createAudioLoop() {
|
||||||
|
return MainRegistry.proxy.getLoopedSound(NTMSounds.CHEMPLANT_LOOP, xCoord, yCoord, zCoord, 1F, 15F, 0.75F, 15);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void onChunkUnload() {
|
||||||
|
if(audio != null) { audio.stopSound(); audio = null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void invalidate() {
|
||||||
|
super.invalidate();
|
||||||
|
if(audio != null) { audio.stopSound(); audio = null; }
|
||||||
|
}
|
||||||
|
|
||||||
protected DirPos[] getConPos() {
|
protected DirPos[] getConPos() {
|
||||||
|
|
||||||
return new DirPos[] {
|
return new DirPos[] {
|
||||||
|
|||||||
@ -28,7 +28,7 @@ import com.hbm.util.CrucibleUtil;
|
|||||||
import com.hbm.util.fauxpointtwelve.BlockPos;
|
import com.hbm.util.fauxpointtwelve.BlockPos;
|
||||||
import com.hbm.util.fauxpointtwelve.DirPos;
|
import com.hbm.util.fauxpointtwelve.DirPos;
|
||||||
|
|
||||||
import api.hbm.fluid.IFluidStandardTransceiver;
|
import api.hbm.fluidmk2.IFluidStandardTransceiverMK2;
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
|
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
@ -43,7 +43,7 @@ import net.minecraft.util.Vec3;
|
|||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|
||||||
public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting implements IFluidStandardTransceiver, IGUIProvider, IFluidCopiable, IConditionalInvAccess, IConfigurableMachine {
|
public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting implements IFluidStandardTransceiverMK2, IGUIProvider, IFluidCopiable, IConditionalInvAccess, IConfigurableMachine {
|
||||||
|
|
||||||
public FluidTank[] tanks;
|
public FluidTank[] tanks;
|
||||||
public boolean isProgressing;
|
public boolean isProgressing;
|
||||||
@ -95,13 +95,13 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
|
|||||||
|
|
||||||
for(DirPos pos : getSteamPos()) {
|
for(DirPos pos : getSteamPos()) {
|
||||||
this.trySubscribe(tanks[1].getTankType(), worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
this.trySubscribe(tanks[1].getTankType(), worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
||||||
if(tanks[2].getFill() > 0) this.sendFluid(tanks[2], worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
if(tanks[2].getFill() > 0) this.tryProvide(tanks[2], worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
||||||
}
|
}
|
||||||
if(tanks[0].getTankType() != Fluids.NONE) for(DirPos pos : getFluidPos()) {
|
if(tanks[0].getTankType() != Fluids.NONE) for(DirPos pos : getFluidPos()) {
|
||||||
this.trySubscribe(tanks[0].getTankType(), worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
this.trySubscribe(tanks[0].getTankType(), worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(smoke.getFill() > 0) this.sendFluid(smoke, worldObj, xCoord + rot.offsetX, yCoord + 5, zCoord + rot.offsetZ, Library.POS_Y);
|
if(smoke.getFill() > 0) this.tryProvide(smoke, worldObj, xCoord + rot.offsetX, yCoord + 5, zCoord + rot.offsetZ, Library.POS_Y);
|
||||||
|
|
||||||
if(this.output != null) {
|
if(this.output != null) {
|
||||||
|
|
||||||
@ -137,13 +137,14 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
|
|||||||
this.markChanged();
|
this.markChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.canProcess(recipe)) {
|
float processSpeed = Math.max((float) burnHeat, 1);
|
||||||
float speed = Math.max((float) burnHeat, 1);
|
float steamUseMult = (float)(10 * Math.log10(processSpeed) + 1);
|
||||||
this.progress += speed / recipe.duration;
|
|
||||||
|
if(this.canProcess(recipe, steamUseMult)) {
|
||||||
|
this.progress += processSpeed / recipe.duration;
|
||||||
|
|
||||||
speed = (float)(13 * Math.log10(speed) + 1);
|
tanks[1].setFill((int) (tanks[1].getFill() - recipe.steam * steamUseMult));
|
||||||
tanks[1].setFill((int) (tanks[1].getFill() - recipe.steam * speed));
|
steamUsed += recipe.steam * steamUseMult;
|
||||||
steamUsed += recipe.steam * speed;
|
|
||||||
this.isProgressing = true;
|
this.isProgressing = true;
|
||||||
|
|
||||||
if(this.progress >= 1F) {
|
if(this.progress >= 1F) {
|
||||||
@ -301,7 +302,7 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canProcess(RotaryFurnaceRecipe recipe) {
|
public boolean canProcess(RotaryFurnaceRecipe recipe, float steamUseMult) {
|
||||||
|
|
||||||
if(this.burnTime <= 0) return false;
|
if(this.burnTime <= 0) return false;
|
||||||
|
|
||||||
@ -310,10 +311,8 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
|
|||||||
if(this.tanks[0].getFill() < recipe.fluid.fill) return false;
|
if(this.tanks[0].getFill() < recipe.fluid.fill) return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
float speed = Math.max((float) burnHeat, 1);
|
if(tanks[1].getFill() < recipe.steam * steamUseMult) return false;
|
||||||
|
if(tanks[2].getMaxFill() - tanks[2].getFill() < recipe.steam * steamUseMult / 100) return false;
|
||||||
if(tanks[1].getFill() < recipe.steam * speed) return false;
|
|
||||||
if(tanks[2].getMaxFill() - tanks[2].getFill() < recipe.steam * speed / 100) return false;
|
|
||||||
if(this.steamUsed > 100) return false;
|
if(this.steamUsed > 100) return false;
|
||||||
|
|
||||||
if(this.output != null) {
|
if(this.output != null) {
|
||||||
|
|||||||
@ -154,8 +154,34 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidSt
|
|||||||
@Callback(direct = true)
|
@Callback(direct = true)
|
||||||
@Optional.Method(modid = "OpenComputers")
|
@Optional.Method(modid = "OpenComputers")
|
||||||
public Object[] getHeat(Context context, Arguments args) {
|
public Object[] getHeat(Context context, Arguments args) {
|
||||||
return new Object[]{heat};
|
return new Object[] {heat};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Callback(direct = true)
|
||||||
|
@Optional.Method(modid = "OpenComputers")
|
||||||
|
public Object[] getCoolant(Context context, Arguments args) {
|
||||||
|
return new Object[] {
|
||||||
|
tanks[0].getFill(), tanks[0].getMaxFill(),
|
||||||
|
tanks[1].getFill(), tanks[1].getMaxFill()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Callback(direct = true)
|
||||||
|
@Optional.Method(modid = "OpenComputers")
|
||||||
|
public Object[] getCoordinates(Context context, Arguments args) {
|
||||||
|
return new Object[] {xCoord, yCoord, zCoord};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Callback(direct = true)
|
||||||
|
@Optional.Method(modid = "OpenComputers")
|
||||||
|
public Object[] getInfo(Context context, Arguments args) {
|
||||||
|
return new Object[] {
|
||||||
|
heat,
|
||||||
|
|
||||||
|
tanks[0].getFill(), tanks[0].getMaxFill(),
|
||||||
|
tanks[1].getFill(), tanks[1].getMaxFill(),
|
||||||
|
|
||||||
|
xCoord, yCoord, zCoord
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't know shit about OC - someone else has to add those back
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,9 +39,18 @@ public abstract class TileEntityPipelineBase extends TileEntityPipeBaseNT {
|
|||||||
|
|
||||||
connected.add(new int[] {x, y, z});
|
connected.add(new int[] {x, y, z});
|
||||||
|
|
||||||
FluidNode node = (FluidNode) UniNodespace.getNode(worldObj, xCoord, yCoord, zCoord, this.type.getNetworkProvider());
|
if(this.node == null || this.node.expired) {
|
||||||
node.recentlyChanged = true;
|
if(this.shouldCreateNode()) {
|
||||||
node.addConnection(new DirPos(x, y, z, ForgeDirection.UNKNOWN));
|
this.node = (FluidNode) UniNodespace.getNode(worldObj, xCoord, yCoord, zCoord, type.getNetworkProvider());
|
||||||
|
if(this.node == null || this.node.expired) {
|
||||||
|
this.node = this.createNode(type);
|
||||||
|
UniNodespace.createNode(worldObj, this.node);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.node.recentlyChanged = true;
|
||||||
|
this.node.addConnection(new DirPos(x, y, z, ForgeDirection.UNKNOWN));
|
||||||
|
|
||||||
this.markDirty();
|
this.markDirty();
|
||||||
|
|
||||||
|
|||||||
@ -3997,6 +3997,7 @@ tile.capacitor_niobium.name=Niobkondensator (LEGACY)
|
|||||||
tile.capacitor_schrabidate.name=Schrabidatkondensator (LEGACY)
|
tile.capacitor_schrabidate.name=Schrabidatkondensator (LEGACY)
|
||||||
tile.capacitor_tantalium.name=Tantalkondensator (LEGACY)
|
tile.capacitor_tantalium.name=Tantalkondensator (LEGACY)
|
||||||
tile.capacitor.desc=Input: Oben$Output: Unten, über Kondensator-Bus
|
tile.capacitor.desc=Input: Oben$Output: Unten, über Kondensator-Bus
|
||||||
|
tile.cargo_elevator.name=Frachtenaufzug
|
||||||
tile.charge_c4.name=Abrissladung
|
tile.charge_c4.name=Abrissladung
|
||||||
tile.charge_dynamite.name=Zeitbombe
|
tile.charge_dynamite.name=Zeitbombe
|
||||||
tile.charge_miner.name=Bergbauladung mit Zeitzünder
|
tile.charge_miner.name=Bergbauladung mit Zeitzünder
|
||||||
|
|||||||
@ -5196,6 +5196,7 @@ tile.capacitor_niobium.name=Niobium Capacitor (LEGACY)
|
|||||||
tile.capacitor_schrabidate.name=Schrabidate Capacitor (LEGACY)
|
tile.capacitor_schrabidate.name=Schrabidate Capacitor (LEGACY)
|
||||||
tile.capacitor_tantalium.name=Tantalum Capacitor (LEGACY)
|
tile.capacitor_tantalium.name=Tantalum Capacitor (LEGACY)
|
||||||
tile.capacitor.desc=Input: Top$Output: Bottom, via Capacitor Bus
|
tile.capacitor.desc=Input: Top$Output: Bottom, via Capacitor Bus
|
||||||
|
tile.cargo_elevator.name=Cargo Elevator
|
||||||
tile.charge_c4.name=Demolition Charge
|
tile.charge_c4.name=Demolition Charge
|
||||||
tile.charge_dynamite.name=Time Bomb
|
tile.charge_dynamite.name=Time Bomb
|
||||||
tile.charge_miner.name=Timed Mining Charge
|
tile.charge_miner.name=Timed Mining Charge
|
||||||
|
|||||||
584
src/main/resources/assets/hbm/models/machines/elevator.obj
Normal file
584
src/main/resources/assets/hbm/models/machines/elevator.obj
Normal file
@ -0,0 +1,584 @@
|
|||||||
|
# Blender v2.79 (sub 0) OBJ File: 'elevator.blend'
|
||||||
|
# www.blender.org
|
||||||
|
o Piston
|
||||||
|
v 0.250000 0.750000 0.250000
|
||||||
|
v 0.250000 0.750000 -0.250000
|
||||||
|
v -0.250000 0.750000 0.250000
|
||||||
|
v -0.250000 0.750000 -0.250000
|
||||||
|
v 0.250000 -0.250000 0.250000
|
||||||
|
v 0.250000 -0.250000 -0.250000
|
||||||
|
v -0.250000 -0.250000 0.250000
|
||||||
|
v -0.250000 -0.250000 -0.250000
|
||||||
|
vt 0.126984 0.677419
|
||||||
|
vt 0.190476 0.548387
|
||||||
|
vt 0.190476 0.677419
|
||||||
|
vt 0.317460 0.677419
|
||||||
|
vt 0.380952 0.548387
|
||||||
|
vt 0.380952 0.677419
|
||||||
|
vt 0.253968 0.677419
|
||||||
|
vt 0.317460 0.548387
|
||||||
|
vt 0.253968 0.548387
|
||||||
|
vt 0.126984 0.548387
|
||||||
|
vn 0.0000 0.0000 1.0000
|
||||||
|
vn -1.0000 0.0000 -0.0000
|
||||||
|
vn 0.0000 0.0000 -1.0000
|
||||||
|
vn 1.0000 0.0000 0.0000
|
||||||
|
s off
|
||||||
|
f 3/1/1 5/2/1 1/3/1
|
||||||
|
f 4/4/2 7/5/2 3/6/2
|
||||||
|
f 2/7/3 8/8/3 4/4/3
|
||||||
|
f 1/3/4 6/9/4 2/7/4
|
||||||
|
f 3/1/1 7/10/1 5/2/1
|
||||||
|
f 4/4/2 8/8/2 7/5/2
|
||||||
|
f 2/7/3 6/9/3 8/8/3
|
||||||
|
f 1/3/4 5/2/4 6/9/4
|
||||||
|
o Base
|
||||||
|
v -1.000000 0.000000 -1.000000
|
||||||
|
v -1.000000 0.000000 1.000000
|
||||||
|
v 1.000000 0.000000 -1.000000
|
||||||
|
v 1.000000 0.000000 1.000000
|
||||||
|
v 0.500000 0.125000 -0.500000
|
||||||
|
v -0.500000 0.125000 -0.500000
|
||||||
|
v -0.500000 0.125000 0.500000
|
||||||
|
v 0.500000 0.125000 0.500000
|
||||||
|
v 1.000000 0.125000 -1.000000
|
||||||
|
v -1.000000 0.125000 -1.000000
|
||||||
|
v -1.000000 0.125000 1.000000
|
||||||
|
v 1.000000 0.125000 1.000000
|
||||||
|
v 0.500000 0.250000 -0.500000
|
||||||
|
v -0.500000 0.250000 -0.500000
|
||||||
|
v -0.500000 0.250000 0.500000
|
||||||
|
v 0.500000 0.250000 0.500000
|
||||||
|
vt 0.380952 0.258065
|
||||||
|
vt 0.126984 0.000000
|
||||||
|
vt 0.380952 0.000000
|
||||||
|
vt 0.380952 0.016129
|
||||||
|
vt 0.396825 0.145161
|
||||||
|
vt 0.380952 0.145161
|
||||||
|
vt 0.111111 0.274194
|
||||||
|
vt 0.126984 0.532258
|
||||||
|
vt 0.111111 0.532258
|
||||||
|
vt 0.396825 0.532258
|
||||||
|
vt 0.380952 0.274194
|
||||||
|
vt 0.396825 0.274194
|
||||||
|
vt 0.126984 0.274194
|
||||||
|
vt 0.126984 0.258065
|
||||||
|
vt 0.126984 0.548387
|
||||||
|
vt 0.380952 0.532258
|
||||||
|
vt 0.380952 0.548387
|
||||||
|
vt 0.317460 0.338710
|
||||||
|
vt 0.317460 0.467742
|
||||||
|
vt 0.190476 0.467742
|
||||||
|
vt 0.190476 0.338710
|
||||||
|
vt 0.523810 0.016129
|
||||||
|
vt 0.523810 0.145161
|
||||||
|
vt 0.539683 0.145161
|
||||||
|
vt 0.539683 0.016129
|
||||||
|
vt 0.523810 -0.000000
|
||||||
|
vt 0.396825 0.016129
|
||||||
|
vt 0.396825 -0.000000
|
||||||
|
vt 0.396825 0.161290
|
||||||
|
vt 0.523810 0.161290
|
||||||
|
vn 0.0000 -1.0000 0.0000
|
||||||
|
vn -0.0000 0.0000 1.0000
|
||||||
|
vn 0.0000 0.0000 -1.0000
|
||||||
|
vn 1.0000 0.0000 0.0000
|
||||||
|
vn -1.0000 0.0000 -0.0000
|
||||||
|
vn 0.0000 1.0000 0.0000
|
||||||
|
s off
|
||||||
|
f 11/11/5 10/12/5 9/13/5
|
||||||
|
f 16/14/6 23/15/6 15/16/6
|
||||||
|
f 12/17/6 19/18/6 10/19/6
|
||||||
|
f 9/20/7 17/21/7 11/22/7
|
||||||
|
f 11/11/8 20/23/8 12/24/8
|
||||||
|
f 10/25/9 18/26/9 9/27/9
|
||||||
|
f 13/28/10 18/26/10 14/29/10
|
||||||
|
f 14/29/10 19/18/10 15/30/10
|
||||||
|
f 15/30/10 20/23/10 16/31/10
|
||||||
|
f 16/31/10 17/21/10 13/28/10
|
||||||
|
f 23/15/10 21/32/10 22/33/10
|
||||||
|
f 14/34/7 21/32/7 13/35/7
|
||||||
|
f 13/36/8 24/37/8 16/38/8
|
||||||
|
f 15/39/9 22/33/9 14/40/9
|
||||||
|
f 11/11/5 12/24/5 10/12/5
|
||||||
|
f 16/14/6 24/37/6 23/15/6
|
||||||
|
f 12/17/6 20/23/6 19/18/6
|
||||||
|
f 9/20/7 18/26/7 17/21/7
|
||||||
|
f 11/11/8 17/21/8 20/23/8
|
||||||
|
f 10/25/9 19/18/9 18/26/9
|
||||||
|
f 13/28/10 17/21/10 18/26/10
|
||||||
|
f 14/29/10 18/26/10 19/18/10
|
||||||
|
f 15/30/10 19/18/10 20/23/10
|
||||||
|
f 16/31/10 20/23/10 17/21/10
|
||||||
|
f 23/15/10 24/37/10 21/32/10
|
||||||
|
f 14/34/7 22/33/7 21/32/7
|
||||||
|
f 13/36/8 21/32/8 24/37/8
|
||||||
|
f 15/39/9 23/15/9 22/33/9
|
||||||
|
o Guides
|
||||||
|
v -1.500000 1.000000 1.250000
|
||||||
|
v -1.500000 1.000000 1.500000
|
||||||
|
v -1.250000 1.000000 1.250000
|
||||||
|
v -1.250000 1.000000 1.500000
|
||||||
|
v -1.250000 0.000000 1.500000
|
||||||
|
v -1.250000 0.000000 1.250000
|
||||||
|
v -1.500000 0.000000 1.500000
|
||||||
|
v -1.500000 0.000000 1.250000
|
||||||
|
v 1.500000 0.000000 1.500000
|
||||||
|
v 1.500000 0.000000 1.250000
|
||||||
|
v 1.250000 0.000000 1.500000
|
||||||
|
v 1.250000 0.000000 1.250000
|
||||||
|
v -1.250000 0.000000 -1.250000
|
||||||
|
v -1.250000 0.000000 -1.500000
|
||||||
|
v -1.500000 0.000000 -1.250000
|
||||||
|
v -1.500000 0.000000 -1.500000
|
||||||
|
v 1.500000 0.000000 -1.250000
|
||||||
|
v 1.500000 0.000000 -1.500000
|
||||||
|
v 1.250000 0.000000 -1.250000
|
||||||
|
v 1.250000 0.000000 -1.500000
|
||||||
|
v 1.500000 1.000000 1.500000
|
||||||
|
v 1.500000 1.000000 1.250000
|
||||||
|
v 1.250000 1.000000 1.500000
|
||||||
|
v 1.250000 1.000000 1.250000
|
||||||
|
v -1.250000 1.000000 -1.250000
|
||||||
|
v -1.250000 1.000000 -1.500000
|
||||||
|
v -1.500000 1.000000 -1.250000
|
||||||
|
v -1.500000 1.000000 -1.500000
|
||||||
|
v 1.500000 1.000000 -1.250000
|
||||||
|
v 1.500000 1.000000 -1.500000
|
||||||
|
v 1.250000 1.000000 -1.250000
|
||||||
|
v 1.250000 1.000000 -1.500000
|
||||||
|
vt 0.031746 0.161290
|
||||||
|
vt 0.000000 0.193548
|
||||||
|
vt 0.000000 0.161290
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 0.031746 0.032258
|
||||||
|
vt 0.000000 0.032258
|
||||||
|
vt 0.000000 0.032258
|
||||||
|
vt 0.031746 0.000000
|
||||||
|
vt 0.031746 0.032258
|
||||||
|
vt 0.000000 0.032258
|
||||||
|
vt 0.031746 0.000000
|
||||||
|
vt 0.031746 0.032258
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 0.031746 0.032258
|
||||||
|
vt 0.000000 0.032258
|
||||||
|
vt 0.000000 0.161290
|
||||||
|
vt 0.031746 0.193548
|
||||||
|
vt 0.000000 0.193548
|
||||||
|
vt 0.000000 0.161290
|
||||||
|
vt 0.031746 0.193548
|
||||||
|
vt 0.000000 0.193548
|
||||||
|
vt 0.031746 0.161290
|
||||||
|
vt 0.000000 0.193548
|
||||||
|
vt 0.000000 0.161290
|
||||||
|
vt 0.095238 0.032258
|
||||||
|
vt 0.063492 0.161290
|
||||||
|
vt 0.063492 0.032258
|
||||||
|
vt 0.095238 0.032258
|
||||||
|
vt 0.063492 0.161290
|
||||||
|
vt 0.063492 0.032258
|
||||||
|
vt 0.031746 0.161290
|
||||||
|
vt 0.126984 0.032258
|
||||||
|
vt 0.095238 0.161290
|
||||||
|
vt 0.126984 0.032258
|
||||||
|
vt 0.095238 0.161290
|
||||||
|
vt 0.095238 0.032258
|
||||||
|
vt 0.063492 0.161290
|
||||||
|
vt 0.063492 0.032258
|
||||||
|
vt 0.095238 0.032258
|
||||||
|
vt 0.063492 0.161290
|
||||||
|
vt 0.063492 0.032258
|
||||||
|
vt 0.031746 0.161290
|
||||||
|
vt 0.126984 0.032258
|
||||||
|
vt 0.095238 0.161290
|
||||||
|
vt 0.126984 0.032258
|
||||||
|
vt 0.095238 0.161290
|
||||||
|
vt 0.031746 0.193548
|
||||||
|
vt 0.031746 0.000000
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 0.031746 0.000000
|
||||||
|
vt 0.031746 0.193548
|
||||||
|
vt 0.126984 0.161290
|
||||||
|
vt 0.126984 0.161290
|
||||||
|
vt 0.126984 0.161290
|
||||||
|
vt 0.126984 0.161290
|
||||||
|
vn 0.0000 1.0000 0.0000
|
||||||
|
vn 0.0000 -1.0000 0.0000
|
||||||
|
vn -1.0000 0.0000 0.0000
|
||||||
|
vn 0.0000 0.0000 -1.0000
|
||||||
|
vn -0.0000 0.0000 1.0000
|
||||||
|
vn 1.0000 0.0000 0.0000
|
||||||
|
s off
|
||||||
|
f 27/41/11 26/42/11 28/43/11
|
||||||
|
f 31/44/12 30/45/12 29/46/12
|
||||||
|
f 33/47/12 36/48/12 34/49/12
|
||||||
|
f 37/50/12 40/51/12 38/52/12
|
||||||
|
f 43/53/12 42/54/12 41/55/12
|
||||||
|
f 45/56/11 48/57/11 47/58/11
|
||||||
|
f 49/59/11 52/60/11 51/61/11
|
||||||
|
f 54/62/11 55/63/11 53/64/11
|
||||||
|
f 31/65/13 25/66/13 32/67/13
|
||||||
|
f 39/68/13 52/69/13 40/70/13
|
||||||
|
f 32/67/14 27/41/14 30/45/14
|
||||||
|
f 40/70/14 50/71/14 38/52/14
|
||||||
|
f 29/72/15 26/73/15 31/65/15
|
||||||
|
f 37/74/15 51/75/15 39/68/15
|
||||||
|
f 34/49/16 45/56/16 33/47/16
|
||||||
|
f 42/54/16 53/64/16 41/55/16
|
||||||
|
f 35/76/13 48/77/13 36/78/13
|
||||||
|
f 43/79/13 56/80/13 44/81/13
|
||||||
|
f 36/78/14 46/82/14 34/49/14
|
||||||
|
f 44/81/14 54/62/14 42/54/14
|
||||||
|
f 33/83/15 47/84/15 35/76/15
|
||||||
|
f 30/45/16 28/43/16 29/46/16
|
||||||
|
f 41/85/15 55/86/15 43/79/15
|
||||||
|
f 38/52/16 49/59/16 37/50/16
|
||||||
|
f 27/41/11 25/87/11 26/42/11
|
||||||
|
f 31/44/12 32/88/12 30/45/12
|
||||||
|
f 33/47/12 35/89/12 36/48/12
|
||||||
|
f 37/50/12 39/90/12 40/51/12
|
||||||
|
f 43/53/12 44/91/12 42/54/12
|
||||||
|
f 45/56/11 46/82/11 48/57/11
|
||||||
|
f 49/59/11 50/71/11 52/60/11
|
||||||
|
f 54/62/11 56/92/11 55/63/11
|
||||||
|
f 31/65/13 26/73/13 25/66/13
|
||||||
|
f 39/68/13 51/75/13 52/69/13
|
||||||
|
f 32/67/14 25/66/14 27/41/14
|
||||||
|
f 40/70/14 52/69/14 50/71/14
|
||||||
|
f 29/72/15 28/93/15 26/73/15
|
||||||
|
f 37/74/15 49/94/15 51/75/15
|
||||||
|
f 34/49/16 46/82/16 45/56/16
|
||||||
|
f 42/54/16 54/62/16 53/64/16
|
||||||
|
f 35/76/13 47/84/13 48/77/13
|
||||||
|
f 43/79/13 55/86/13 56/80/13
|
||||||
|
f 36/78/14 48/77/14 46/82/14
|
||||||
|
f 44/81/14 56/80/14 54/62/14
|
||||||
|
f 33/83/15 45/95/15 47/84/15
|
||||||
|
f 30/45/16 27/41/16 28/43/16
|
||||||
|
f 41/85/15 53/96/15 55/86/15
|
||||||
|
f 38/52/16 50/71/16 49/59/16
|
||||||
|
o Platform
|
||||||
|
v -1.500000 0.750000 1.250000
|
||||||
|
v -1.250000 0.750000 1.250000
|
||||||
|
v -1.250000 0.750000 1.500000
|
||||||
|
v 1.500000 0.750000 1.250000
|
||||||
|
v 1.250000 0.750000 1.500000
|
||||||
|
v 1.250000 0.750000 1.250000
|
||||||
|
v -1.250000 0.750000 -1.250000
|
||||||
|
v -1.250000 0.750000 -1.500000
|
||||||
|
v -1.500000 0.750000 -1.250000
|
||||||
|
v 1.500000 0.750000 -1.250000
|
||||||
|
v 1.250000 0.750000 -1.250000
|
||||||
|
v 1.250000 0.750000 -1.500000
|
||||||
|
v -1.000000 0.750000 1.250000
|
||||||
|
v -1.000000 0.750000 -1.250000
|
||||||
|
v 1.000000 0.750000 1.250000
|
||||||
|
v 1.000000 0.750000 -1.250000
|
||||||
|
v 1.250000 0.750000 1.000000
|
||||||
|
v -1.250000 0.750000 1.000000
|
||||||
|
v 1.250000 0.750000 -1.000000
|
||||||
|
v -1.250000 0.750000 -1.000000
|
||||||
|
v -1.250000 1.000000 1.250000
|
||||||
|
v -1.500000 1.000000 1.250000
|
||||||
|
v -1.250000 1.000000 1.500000
|
||||||
|
v 1.250000 1.000000 1.500000
|
||||||
|
v 1.250000 1.000000 1.250000
|
||||||
|
v 1.500000 1.000000 1.250000
|
||||||
|
v -1.250000 1.000000 -1.250000
|
||||||
|
v -1.250000 1.000000 -1.500000
|
||||||
|
v -1.500000 1.000000 -1.250000
|
||||||
|
v 1.250000 1.000000 -1.250000
|
||||||
|
v 1.250000 1.000000 -1.500000
|
||||||
|
v 1.500000 1.000000 -1.250000
|
||||||
|
v -1.000000 1.000000 1.250000
|
||||||
|
v 1.000000 1.000000 1.250000
|
||||||
|
v 1.250000 1.000000 1.000000
|
||||||
|
v 1.250000 1.000000 -1.000000
|
||||||
|
v 1.000000 1.000000 -1.250000
|
||||||
|
v -1.000000 1.000000 -1.250000
|
||||||
|
v -1.250000 1.000000 -1.000000
|
||||||
|
v -1.250000 1.000000 1.000000
|
||||||
|
v -1.000000 0.781250 1.250000
|
||||||
|
v 1.000000 0.781250 1.250000
|
||||||
|
v 1.250000 0.781250 1.000000
|
||||||
|
v 1.250000 0.781250 -1.000000
|
||||||
|
v 1.000000 0.781250 -1.250000
|
||||||
|
v -1.000000 0.781250 -1.250000
|
||||||
|
v -1.250000 0.781250 -1.000000
|
||||||
|
v -1.250000 0.781250 1.000000
|
||||||
|
v -1.000000 0.968750 1.250000
|
||||||
|
v 1.000000 0.968750 1.250000
|
||||||
|
v 1.250000 0.968750 1.000000
|
||||||
|
v 1.250000 0.968750 -1.000000
|
||||||
|
v 1.000000 0.968750 -1.250000
|
||||||
|
v -1.000000 0.968750 -1.250000
|
||||||
|
v -1.250000 0.968750 -1.000000
|
||||||
|
v -1.250000 0.968750 1.000000
|
||||||
|
v -0.500000 0.750000 -0.250000
|
||||||
|
v -0.250000 0.750000 -0.500000
|
||||||
|
v -0.250000 0.750000 0.500000
|
||||||
|
v -0.500000 0.750000 0.250000
|
||||||
|
v 0.250000 0.750000 -0.500000
|
||||||
|
v 0.500000 0.750000 -0.250000
|
||||||
|
v 0.500000 0.750000 0.250000
|
||||||
|
v 0.250000 0.750000 0.500000
|
||||||
|
v 0.500000 1.000000 -0.250000
|
||||||
|
v 0.250000 1.000000 -0.500000
|
||||||
|
v -0.250000 1.000000 -0.500000
|
||||||
|
v -0.500000 1.000000 -0.250000
|
||||||
|
v -0.500000 1.000000 0.250000
|
||||||
|
v -0.250000 1.000000 0.500000
|
||||||
|
v 0.250000 1.000000 0.500000
|
||||||
|
v 0.500000 1.000000 0.250000
|
||||||
|
vt 0.936508 0.322581
|
||||||
|
vt 0.968254 0.032258
|
||||||
|
vt 0.968254 0.354839
|
||||||
|
vt 0.619048 0.387097
|
||||||
|
vt 0.904762 0.354839
|
||||||
|
vt 0.936508 0.387097
|
||||||
|
vt 0.587302 0.354839
|
||||||
|
vt 0.619048 0.064516
|
||||||
|
vt 0.619048 0.322581
|
||||||
|
vt 0.904762 0.032258
|
||||||
|
vt 0.619048 -0.000000
|
||||||
|
vt 0.936508 0.000000
|
||||||
|
vt 0.936508 0.032258
|
||||||
|
vt 0.936508 0.064516
|
||||||
|
vt 0.936508 0.354839
|
||||||
|
vt 0.619048 0.354839
|
||||||
|
vt 0.650794 0.354839
|
||||||
|
vt 0.650794 0.032258
|
||||||
|
vt 0.619048 0.032258
|
||||||
|
vt 0.968254 0.774194
|
||||||
|
vt 0.936508 0.483871
|
||||||
|
vt 0.968254 0.451613
|
||||||
|
vt 0.904762 0.451613
|
||||||
|
vt 0.619048 0.419355
|
||||||
|
vt 0.936508 0.419355
|
||||||
|
vt 0.619048 0.741935
|
||||||
|
vt 0.587302 0.451613
|
||||||
|
vt 0.619048 0.483871
|
||||||
|
vt 0.619048 0.806452
|
||||||
|
vt 0.904762 0.774194
|
||||||
|
vt 0.936508 0.806452
|
||||||
|
vt 0.936508 0.741935
|
||||||
|
vt 0.936508 0.774194
|
||||||
|
vt 0.936508 0.451613
|
||||||
|
vt 0.619048 0.451613
|
||||||
|
vt 0.619048 0.774194
|
||||||
|
vt 0.650794 0.774194
|
||||||
|
vt 0.555556 0.451613
|
||||||
|
vt 0.587302 0.774194
|
||||||
|
vt 0.555556 0.774194
|
||||||
|
vt 0.587302 0.419355
|
||||||
|
vt 0.555556 0.354839
|
||||||
|
vt 0.587302 0.354839
|
||||||
|
vt 0.650794 0.516129
|
||||||
|
vt 0.904762 0.483871
|
||||||
|
vt 0.904762 0.516129
|
||||||
|
vt 0.428571 0.419355
|
||||||
|
vt 0.460317 0.322581
|
||||||
|
vt 0.936508 0.516129
|
||||||
|
vt 0.396825 0.354839
|
||||||
|
vt 0.396825 0.419355
|
||||||
|
vt 0.523810 0.290323
|
||||||
|
vt 0.460317 0.290323
|
||||||
|
vt 0.619048 0.838710
|
||||||
|
vt 0.936508 0.838710
|
||||||
|
vt 0.650794 0.322581
|
||||||
|
vt 0.904762 0.064516
|
||||||
|
vt 1.000000 0.774194
|
||||||
|
vt 1.000000 0.451613
|
||||||
|
vt 0.460317 0.483871
|
||||||
|
vt 0.523810 0.451613
|
||||||
|
vt 0.523810 0.483871
|
||||||
|
vt 0.936508 0.709677
|
||||||
|
vt 0.904762 0.741935
|
||||||
|
vt 0.904762 0.709677
|
||||||
|
vt 0.126984 0.677419
|
||||||
|
vt 0.380952 0.677419
|
||||||
|
vt 0.126984 1.000000
|
||||||
|
vt 0.650794 0.709677
|
||||||
|
vt 0.619048 0.709677
|
||||||
|
vt 0.619048 0.516129
|
||||||
|
vt 0.650794 0.483871
|
||||||
|
vt 0.126984 0.677419
|
||||||
|
vt 0.380952 0.677419
|
||||||
|
vt 0.412698 0.709677
|
||||||
|
vt 0.650794 0.741935
|
||||||
|
vt 0.428571 0.290323
|
||||||
|
vt 0.428571 0.451613
|
||||||
|
vt 0.460317 0.451613
|
||||||
|
vt 0.555556 0.483871
|
||||||
|
vt 0.555556 0.322581
|
||||||
|
vt 0.523810 0.322581
|
||||||
|
vt 0.428571 0.258065
|
||||||
|
vt 0.460317 0.161290
|
||||||
|
vt 0.968254 0.387097
|
||||||
|
vt 1.000000 0.419355
|
||||||
|
vt 1.000000 0.806452
|
||||||
|
vt 0.968254 0.806452
|
||||||
|
vt 0.968254 0.838710
|
||||||
|
vt 0.587302 0.838710
|
||||||
|
vt 0.587302 0.806452
|
||||||
|
vt 0.555556 0.806452
|
||||||
|
vt 0.587302 0.419355
|
||||||
|
vt 0.555556 0.419355
|
||||||
|
vt 0.587302 0.387097
|
||||||
|
vt 0.587302 0.032258
|
||||||
|
vt 0.650794 0.451613
|
||||||
|
vt 0.555556 0.419355
|
||||||
|
vt 0.428571 0.354839
|
||||||
|
vt 0.650794 0.064516
|
||||||
|
vt 0.904762 0.322581
|
||||||
|
vt 0.412698 0.709677
|
||||||
|
vt 0.412698 0.967742
|
||||||
|
vt 0.380952 1.000000
|
||||||
|
vt 0.095238 0.967742
|
||||||
|
vt 0.095238 0.709677
|
||||||
|
vt 0.412698 0.967742
|
||||||
|
vt 0.095238 0.967742
|
||||||
|
vt 0.380952 1.000000
|
||||||
|
vt 0.126984 1.000000
|
||||||
|
vt 0.095238 0.709677
|
||||||
|
vt 0.428571 0.322581
|
||||||
|
vt 0.428571 0.483871
|
||||||
|
vt 0.555556 0.451613
|
||||||
|
vt 0.555556 0.290323
|
||||||
|
vt 0.523810 0.161290
|
||||||
|
vt 0.555556 0.193548
|
||||||
|
vt 0.555556 0.258065
|
||||||
|
vt 0.428571 0.193548
|
||||||
|
vt 0.968254 0.419355
|
||||||
|
vn 0.0000 -1.0000 0.0000
|
||||||
|
vn 0.0000 1.0000 0.0000
|
||||||
|
vn 0.0000 0.0000 1.0000
|
||||||
|
vn 0.0000 0.0000 -1.0000
|
||||||
|
vn -1.0000 0.0000 0.0000
|
||||||
|
vn -0.7071 0.0000 0.7071
|
||||||
|
vn 1.0000 0.0000 0.0000
|
||||||
|
vn 0.7071 0.0000 0.7071
|
||||||
|
vn 0.7071 0.0000 -0.7071
|
||||||
|
vn -0.7071 0.0000 -0.7071
|
||||||
|
s off
|
||||||
|
f 72/97/17 64/98/17 68/99/17
|
||||||
|
f 60/100/17 75/101/17 66/102/17
|
||||||
|
f 61/103/17 69/104/17 71/105/17
|
||||||
|
f 76/106/17 57/107/17 65/108/17
|
||||||
|
f 63/109/17 70/110/17 76/106/17
|
||||||
|
f 67/111/17 75/101/17 72/97/17
|
||||||
|
f 62/112/17 71/105/17 73/113/17
|
||||||
|
f 74/114/17 69/104/17 58/115/17
|
||||||
|
f 84/116/18 93/117/18 87/118/18
|
||||||
|
f 92/119/18 82/120/18 88/121/18
|
||||||
|
f 89/122/18 80/123/18 90/124/18
|
||||||
|
f 78/125/18 95/126/18 85/127/18
|
||||||
|
f 94/128/18 84/116/18 83/129/18
|
||||||
|
f 92/119/18 88/121/18 86/130/18
|
||||||
|
f 90/124/18 80/123/18 81/131/18
|
||||||
|
f 77/132/18 89/122/18 96/133/18
|
||||||
|
f 61/134/19 79/135/19 59/136/19
|
||||||
|
f 114/137/20 122/138/20 117/139/20
|
||||||
|
f 73/140/21 92/141/21 75/142/21
|
||||||
|
f 126/143/18 128/144/18 122/138/18
|
||||||
|
f 75/142/22 93/117/22 72/145/22
|
||||||
|
f 120/146/19 126/143/19 115/147/19
|
||||||
|
f 118/148/23 128/144/23 119/149/23
|
||||||
|
f 57/150/21 85/127/21 65/151/21
|
||||||
|
f 69/104/20 90/152/20 71/105/20
|
||||||
|
f 72/97/19 94/153/19 70/110/19
|
||||||
|
f 64/154/20 87/118/20 68/155/20
|
||||||
|
f 116/156/21 124/157/21 113/158/21
|
||||||
|
f 70/159/24 95/160/24 76/161/24
|
||||||
|
f 66/102/23 82/120/23 60/100/23
|
||||||
|
f 107/162/18 108/163/18 112/164/18
|
||||||
|
f 74/165/25 89/122/25 69/166/25
|
||||||
|
f 71/167/26 91/168/26 73/140/26
|
||||||
|
f 104/169/17 103/170/17 102/171/17
|
||||||
|
f 76/161/23 96/172/23 74/165/23
|
||||||
|
f 128/144/24 120/173/24 119/149/24
|
||||||
|
f 116/156/22 126/174/22 125/175/22
|
||||||
|
f 124/157/26 114/176/26 113/158/26
|
||||||
|
f 118/148/25 122/177/25 121/178/25
|
||||||
|
f 118/148/17 120/179/17 116/180/17
|
||||||
|
f 67/181/20 88/121/20 66/102/20
|
||||||
|
f 87/118/23 67/182/23 68/155/23
|
||||||
|
f 63/183/21 84/116/21 64/154/21
|
||||||
|
f 65/151/20 83/184/20 63/185/20
|
||||||
|
f 58/186/19 78/125/19 57/150/19
|
||||||
|
f 59/136/21 77/187/21 58/188/21
|
||||||
|
f 81/189/23 61/134/23 62/190/23
|
||||||
|
f 60/100/19 81/189/19 62/191/19
|
||||||
|
f 72/97/17 70/110/17 64/98/17
|
||||||
|
f 60/100/17 73/113/17 75/101/17
|
||||||
|
f 61/103/17 59/192/17 69/104/17
|
||||||
|
f 76/106/17 74/114/17 57/107/17
|
||||||
|
f 63/109/17 64/98/17 70/110/17
|
||||||
|
f 76/106/17 65/108/17 63/109/17
|
||||||
|
f 67/111/17 66/102/17 75/101/17
|
||||||
|
f 72/97/17 68/99/17 67/111/17
|
||||||
|
f 62/112/17 61/103/17 71/105/17
|
||||||
|
f 73/113/17 60/100/17 62/112/17
|
||||||
|
f 58/115/17 57/107/17 74/114/17
|
||||||
|
f 69/104/17 59/192/17 58/115/17
|
||||||
|
f 84/116/18 94/128/18 93/117/18
|
||||||
|
f 92/119/18 91/193/18 82/120/18
|
||||||
|
f 89/122/18 79/135/18 80/123/18
|
||||||
|
f 78/125/18 96/133/18 95/126/18
|
||||||
|
f 83/129/18 85/127/18 95/126/18
|
||||||
|
f 95/126/18 94/128/18 83/129/18
|
||||||
|
f 86/130/18 87/118/18 93/117/18
|
||||||
|
f 93/117/18 92/119/18 86/130/18
|
||||||
|
f 81/131/18 82/120/18 91/193/18
|
||||||
|
f 91/193/18 90/124/18 81/131/18
|
||||||
|
f 96/133/18 78/125/18 77/132/18
|
||||||
|
f 77/132/18 79/135/18 89/122/18
|
||||||
|
f 61/134/19 80/123/19 79/135/19
|
||||||
|
f 114/137/20 123/194/20 122/138/20
|
||||||
|
f 73/140/21 91/168/21 92/141/21
|
||||||
|
f 122/138/18 123/194/18 124/157/18
|
||||||
|
f 124/157/18 125/175/18 126/143/18
|
||||||
|
f 126/143/18 127/195/18 128/144/18
|
||||||
|
f 128/144/18 121/178/18 122/138/18
|
||||||
|
f 122/138/18 124/157/18 126/143/18
|
||||||
|
f 75/142/22 92/141/22 93/117/22
|
||||||
|
f 120/146/19 127/195/19 126/143/19
|
||||||
|
f 118/148/23 121/178/23 128/144/23
|
||||||
|
f 57/150/21 78/125/21 85/127/21
|
||||||
|
f 69/104/20 89/196/20 90/152/20
|
||||||
|
f 72/97/19 93/197/19 94/153/19
|
||||||
|
f 64/154/20 84/116/20 87/118/20
|
||||||
|
f 116/156/21 125/175/21 124/157/21
|
||||||
|
f 70/159/24 94/128/24 95/160/24
|
||||||
|
f 66/102/23 88/121/23 82/120/23
|
||||||
|
f 108/163/18 109/198/18 110/199/18
|
||||||
|
f 110/199/18 111/200/18 108/163/18
|
||||||
|
f 111/200/18 112/164/18 108/163/18
|
||||||
|
f 112/164/18 105/201/18 106/202/18
|
||||||
|
f 106/202/18 107/162/18 112/164/18
|
||||||
|
f 74/165/25 96/172/25 89/122/25
|
||||||
|
f 71/167/26 90/124/26 91/168/26
|
||||||
|
f 102/171/17 101/203/17 98/204/17
|
||||||
|
f 101/203/17 100/205/17 98/204/17
|
||||||
|
f 100/205/17 99/206/17 98/204/17
|
||||||
|
f 98/204/17 97/207/17 102/171/17
|
||||||
|
f 97/207/17 104/169/17 102/171/17
|
||||||
|
f 76/161/23 95/160/23 96/172/23
|
||||||
|
f 128/144/24 127/208/24 120/173/24
|
||||||
|
f 116/156/22 115/209/22 126/174/22
|
||||||
|
f 124/157/26 123/210/26 114/176/26
|
||||||
|
f 118/148/25 117/211/25 122/177/25
|
||||||
|
f 116/180/17 113/212/17 114/213/17
|
||||||
|
f 114/213/17 117/214/17 118/148/17
|
||||||
|
f 118/148/17 119/149/17 120/179/17
|
||||||
|
f 120/179/17 115/215/17 116/180/17
|
||||||
|
f 116/180/17 114/213/17 118/148/17
|
||||||
|
f 67/181/20 86/216/20 88/121/20
|
||||||
|
f 87/118/23 86/216/23 67/182/23
|
||||||
|
f 63/183/21 83/184/21 84/116/21
|
||||||
|
f 65/151/20 85/127/20 83/184/20
|
||||||
|
f 58/186/19 77/187/19 78/125/19
|
||||||
|
f 59/136/21 79/135/21 77/187/21
|
||||||
|
f 81/189/23 80/123/23 61/134/23
|
||||||
|
f 60/100/19 82/120/19 81/189/19
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,57 +0,0 @@
|
|||||||
# Blender v2.76 (sub 0) OBJ File: 'vault_label.blend'
|
|
||||||
# www.blender.org
|
|
||||||
o Cylinder
|
|
||||||
v 0.450000 2.978691 -0.083927
|
|
||||||
v 0.450000 2.920645 -0.243406
|
|
||||||
v 0.450000 2.021473 -0.084857
|
|
||||||
v 0.450000 2.078882 -0.242588
|
|
||||||
v 0.450000 2.812752 -0.371988
|
|
||||||
v 0.450000 2.665775 -0.456845
|
|
||||||
v 0.450000 2.500473 -0.485992
|
|
||||||
v 0.450000 2.333337 -0.456522
|
|
||||||
v 0.450000 2.665775 0.456845
|
|
||||||
v 0.450000 2.812752 0.371988
|
|
||||||
v 0.450000 2.187972 -0.372596
|
|
||||||
v 0.450000 2.920646 0.243405
|
|
||||||
v 0.450000 2.978691 0.083926
|
|
||||||
v 0.450000 2.021473 0.084857
|
|
||||||
v 0.450000 2.078882 0.242587
|
|
||||||
v 0.450000 2.187972 0.372596
|
|
||||||
v 0.450000 2.333337 0.456522
|
|
||||||
v 0.450000 2.500473 0.485992
|
|
||||||
vt 0.037266 0.323502
|
|
||||||
vt 0.586012 0.007394
|
|
||||||
vt 0.992606 0.492912
|
|
||||||
vt 0.877051 0.809440
|
|
||||||
vt 0.746718 0.918803
|
|
||||||
vt 0.585069 0.977638
|
|
||||||
vt 0.414932 0.977638
|
|
||||||
vt 0.253283 0.918803
|
|
||||||
vt 0.122950 0.809441
|
|
||||||
vt 0.036938 0.660464
|
|
||||||
vt 0.007394 0.492912
|
|
||||||
vt 0.122334 0.176159
|
|
||||||
vt 0.254112 0.065584
|
|
||||||
vt 0.413988 0.007394
|
|
||||||
vt 0.745889 0.065585
|
|
||||||
vt 0.877666 0.176159
|
|
||||||
vt 0.962735 0.323502
|
|
||||||
vt 0.963062 0.660464
|
|
||||||
vn 1.000000 -0.000000 -0.000000
|
|
||||||
s off
|
|
||||||
f 17/1/1 3/2/1 7/3/1
|
|
||||||
f 5/4/1 2/5/1 1/6/1
|
|
||||||
f 1/6/1 13/7/1 5/4/1
|
|
||||||
f 12/8/1 10/9/1 17/1/1
|
|
||||||
f 9/10/1 18/11/1 17/1/1
|
|
||||||
f 17/1/1 16/12/1 15/13/1
|
|
||||||
f 15/13/1 14/14/1 3/2/1
|
|
||||||
f 3/2/1 4/15/1 11/16/1
|
|
||||||
f 11/16/1 8/17/1 7/3/1
|
|
||||||
f 7/3/1 6/18/1 12/8/1
|
|
||||||
f 5/4/1 13/7/1 12/8/1
|
|
||||||
f 10/9/1 9/10/1 17/1/1
|
|
||||||
f 17/1/1 15/13/1 3/2/1
|
|
||||||
f 3/2/1 11/16/1 7/3/1
|
|
||||||
f 6/18/1 5/4/1 12/8/1
|
|
||||||
f 12/8/1 17/1/1 7/3/1
|
|
||||||
@ -1,316 +0,0 @@
|
|||||||
# Blender v2.76 (sub 0) OBJ File: 'vault_teeth.blend'
|
|
||||||
# www.blender.org
|
|
||||||
o Cylinder
|
|
||||||
v -0.500000 0.762429 0.308123
|
|
||||||
v 0.500000 0.762428 0.308123
|
|
||||||
v -0.500000 0.762429 -0.308124
|
|
||||||
v 0.500000 0.762429 -0.308124
|
|
||||||
v -0.500000 0.327325 0.574589
|
|
||||||
v 0.500000 0.327325 0.574589
|
|
||||||
v 0.499999 0.327326 -0.574590
|
|
||||||
v -0.500001 0.327326 -0.574590
|
|
||||||
v -0.500000 0.762429 -1.261877
|
|
||||||
v 0.500000 0.762428 -1.261877
|
|
||||||
v -0.500000 0.762429 -1.878124
|
|
||||||
v 0.500000 0.762429 -1.878124
|
|
||||||
v -0.500000 0.327325 -0.995411
|
|
||||||
v 0.500000 0.327325 -0.995411
|
|
||||||
v 0.499999 0.327326 -2.144590
|
|
||||||
v -0.500001 0.327326 -2.144590
|
|
||||||
v -0.500000 0.762429 1.878123
|
|
||||||
v 0.500000 0.762428 1.878123
|
|
||||||
v -0.500000 0.762429 1.261876
|
|
||||||
v 0.500000 0.762429 1.261876
|
|
||||||
v -0.500000 0.327325 2.144589
|
|
||||||
v 0.500000 0.327325 2.144589
|
|
||||||
v 0.499999 0.327326 0.995410
|
|
||||||
v -0.500001 0.327326 0.995410
|
|
||||||
v -0.500000 0.762429 3.448123
|
|
||||||
v 0.500000 0.762428 3.448123
|
|
||||||
v -0.500000 0.762429 2.831876
|
|
||||||
v 0.500000 0.762429 2.831876
|
|
||||||
v -0.500000 0.327325 3.714589
|
|
||||||
v 0.500000 0.327325 3.714589
|
|
||||||
v 0.499999 0.327326 2.565410
|
|
||||||
v -0.500001 0.327326 2.565410
|
|
||||||
v -0.500000 0.762429 5.018124
|
|
||||||
v 0.500000 0.762428 5.018124
|
|
||||||
v -0.500000 0.762429 4.401876
|
|
||||||
v 0.500000 0.762429 4.401876
|
|
||||||
v -0.500000 0.327325 5.284589
|
|
||||||
v 0.500000 0.327325 5.284589
|
|
||||||
v 0.499999 0.327326 4.135410
|
|
||||||
v -0.500001 0.327326 4.135410
|
|
||||||
v -0.500000 0.762429 6.588124
|
|
||||||
v 0.500000 0.762428 6.588124
|
|
||||||
v -0.500000 0.762429 5.971876
|
|
||||||
v 0.500000 0.762429 5.971876
|
|
||||||
v -0.500000 0.327325 6.854589
|
|
||||||
v 0.500000 0.327325 6.854589
|
|
||||||
v 0.499999 0.327326 5.705410
|
|
||||||
v -0.500001 0.327326 5.705410
|
|
||||||
v -0.500000 0.000000 7.000000
|
|
||||||
v 0.500000 0.000000 7.000000
|
|
||||||
v -0.500000 0.000000 -2.250000
|
|
||||||
v 0.500000 0.000000 -2.250000
|
|
||||||
vt 0.691404 0.444331
|
|
||||||
vt 0.622542 0.444331
|
|
||||||
vt 0.622542 0.342186
|
|
||||||
vt 0.610683 0.758938
|
|
||||||
vt 0.610683 0.656793
|
|
||||||
vt 0.667687 0.656793
|
|
||||||
vt 0.926074 0.342186
|
|
||||||
vt 0.926074 0.444331
|
|
||||||
vt 0.869093 0.444331
|
|
||||||
vt 0.691404 0.499489
|
|
||||||
vt 0.691404 0.601634
|
|
||||||
vt 0.622542 0.601634
|
|
||||||
vt 0.728029 0.758938
|
|
||||||
vt 0.728029 0.656793
|
|
||||||
vt 0.785033 0.656793
|
|
||||||
vt 0.587947 0.287028
|
|
||||||
vt 0.530966 0.287028
|
|
||||||
vt 0.530966 0.184883
|
|
||||||
vt 0.562200 0.499489
|
|
||||||
vt 0.562200 0.601634
|
|
||||||
vt 0.493337 0.601634
|
|
||||||
vt 0.751747 0.499489
|
|
||||||
vt 0.808750 0.499489
|
|
||||||
vt 0.808750 0.601634
|
|
||||||
vt 0.845375 0.758938
|
|
||||||
vt 0.845375 0.656793
|
|
||||||
vt 0.902356 0.656793
|
|
||||||
vt 0.717152 0.287028
|
|
||||||
vt 0.648290 0.287028
|
|
||||||
vt 0.648290 0.184883
|
|
||||||
vt 0.751747 0.444331
|
|
||||||
vt 0.751747 0.342186
|
|
||||||
vt 0.808750 0.342186
|
|
||||||
vt 0.953962 0.129724
|
|
||||||
vt 0.896981 0.129724
|
|
||||||
vt 0.896981 0.027579
|
|
||||||
vt 0.493337 0.342186
|
|
||||||
vt 0.562200 0.342186
|
|
||||||
vt 0.562200 0.444331
|
|
||||||
vt 0.550341 0.656793
|
|
||||||
vt 0.550341 0.758938
|
|
||||||
vt 0.493337 0.758938
|
|
||||||
vt 0.869093 0.499489
|
|
||||||
vt 0.926074 0.499489
|
|
||||||
vt 0.926074 0.601634
|
|
||||||
vt 0.650453 0.027579
|
|
||||||
vt 0.719315 0.027579
|
|
||||||
vt 0.719315 0.129724
|
|
||||||
vt 0.590111 0.027579
|
|
||||||
vt 0.590111 0.129724
|
|
||||||
vt 0.533107 0.129724
|
|
||||||
vt 0.836639 0.129724
|
|
||||||
vt 0.779658 0.129724
|
|
||||||
vt 0.779658 0.027579
|
|
||||||
vt 0.141916 0.972421
|
|
||||||
vt 0.030171 0.972421
|
|
||||||
vt 0.030171 0.027579
|
|
||||||
vt 0.533107 0.027579
|
|
||||||
vt 0.493337 0.129724
|
|
||||||
vt 0.969829 0.916241
|
|
||||||
vt 0.922804 0.916241
|
|
||||||
vt 0.922804 0.814096
|
|
||||||
vt 0.493337 0.814096
|
|
||||||
vt 0.540362 0.814096
|
|
||||||
vt 0.540362 0.916241
|
|
||||||
vt 0.862462 0.916241
|
|
||||||
vt 0.815438 0.916241
|
|
||||||
vt 0.815438 0.814096
|
|
||||||
vt 0.708071 0.814096
|
|
||||||
vt 0.755096 0.814096
|
|
||||||
vt 0.755096 0.916241
|
|
||||||
vt 0.600704 0.814096
|
|
||||||
vt 0.647729 0.814096
|
|
||||||
vt 0.647729 0.916241
|
|
||||||
vt 0.493337 0.287028
|
|
||||||
vt 0.493337 0.184883
|
|
||||||
vt 0.432995 0.128511
|
|
||||||
vt 0.384375 0.155729
|
|
||||||
vt 0.384375 0.038346
|
|
||||||
vt 0.432995 0.288879
|
|
||||||
vt 0.384375 0.316097
|
|
||||||
vt 0.384375 0.198714
|
|
||||||
vt 0.432995 0.930349
|
|
||||||
vt 0.384375 0.957568
|
|
||||||
vt 0.384375 0.840185
|
|
||||||
vt 0.432995 0.769982
|
|
||||||
vt 0.384375 0.797200
|
|
||||||
vt 0.384375 0.679817
|
|
||||||
vt 0.432995 0.609614
|
|
||||||
vt 0.384375 0.636832
|
|
||||||
vt 0.384375 0.519449
|
|
||||||
vt 0.432995 0.449246
|
|
||||||
vt 0.384375 0.476465
|
|
||||||
vt 0.384375 0.359082
|
|
||||||
vt 0.347798 0.027579
|
|
||||||
vt 0.347798 0.972421
|
|
||||||
vt 0.238835 0.159815
|
|
||||||
vt 0.238835 0.042432
|
|
||||||
vt 0.287456 0.069650
|
|
||||||
vt 0.238835 0.320183
|
|
||||||
vt 0.238835 0.202800
|
|
||||||
vt 0.287456 0.230018
|
|
||||||
vt 0.238835 0.480550
|
|
||||||
vt 0.238835 0.363168
|
|
||||||
vt 0.287456 0.390386
|
|
||||||
vt 0.238835 0.640918
|
|
||||||
vt 0.238835 0.523535
|
|
||||||
vt 0.287456 0.550753
|
|
||||||
vt 0.238835 0.801286
|
|
||||||
vt 0.238835 0.683903
|
|
||||||
vt 0.287456 0.711121
|
|
||||||
vt 0.238835 0.961654
|
|
||||||
vt 0.238835 0.844271
|
|
||||||
vt 0.287456 0.871489
|
|
||||||
vt 0.202258 0.972421
|
|
||||||
vt 0.202258 0.027579
|
|
||||||
vt 0.691404 0.342186
|
|
||||||
vt 0.667687 0.758938
|
|
||||||
vt 0.869093 0.342186
|
|
||||||
vt 0.622542 0.499489
|
|
||||||
vt 0.785033 0.758938
|
|
||||||
vt 0.587947 0.184883
|
|
||||||
vt 0.493337 0.499489
|
|
||||||
vt 0.751747 0.601634
|
|
||||||
vt 0.902356 0.758938
|
|
||||||
vt 0.717152 0.184883
|
|
||||||
vt 0.808750 0.444331
|
|
||||||
vt 0.953962 0.027579
|
|
||||||
vt 0.493337 0.444331
|
|
||||||
vt 0.493337 0.656793
|
|
||||||
vt 0.869093 0.601634
|
|
||||||
vt 0.650453 0.129724
|
|
||||||
vt 0.836639 0.027579
|
|
||||||
vt 0.141916 0.027579
|
|
||||||
vt 0.493337 0.027579
|
|
||||||
vt 0.969829 0.814096
|
|
||||||
vt 0.493337 0.916241
|
|
||||||
vt 0.862462 0.814096
|
|
||||||
vt 0.708071 0.916241
|
|
||||||
vt 0.600704 0.916241
|
|
||||||
vt 0.432995 0.065564
|
|
||||||
vt 0.432995 0.225932
|
|
||||||
vt 0.432995 0.867403
|
|
||||||
vt 0.432995 0.707035
|
|
||||||
vt 0.432995 0.546668
|
|
||||||
vt 0.432995 0.386300
|
|
||||||
vt 0.287456 0.132597
|
|
||||||
vt 0.287456 0.292965
|
|
||||||
vt 0.287456 0.453332
|
|
||||||
vt 0.287456 0.613700
|
|
||||||
vt 0.287456 0.774068
|
|
||||||
vt 0.287456 0.934435
|
|
||||||
vn 0.000000 1.000000 0.000000
|
|
||||||
vn 0.000000 0.522300 0.852800
|
|
||||||
vn 0.000000 0.522300 -0.852800
|
|
||||||
vn 0.000000 -1.000000 0.000000
|
|
||||||
vn 0.000000 0.406000 0.913900
|
|
||||||
vn 0.000000 0.306500 -0.951900
|
|
||||||
vn 1.000000 0.000000 -0.000000
|
|
||||||
vn -1.000000 0.000000 0.000000
|
|
||||||
s off
|
|
||||||
f 2/1/1 4/2/1 3/3/1
|
|
||||||
f 2/4/2 1/5/2 5/6/2
|
|
||||||
f 3/7/3 4/8/3 7/9/3
|
|
||||||
f 9/10/1 10/11/1 12/12/1
|
|
||||||
f 10/13/2 9/14/2 13/15/2
|
|
||||||
f 12/16/3 15/17/3 16/18/3
|
|
||||||
f 17/19/1 18/20/1 20/21/1
|
|
||||||
f 17/22/2 21/23/2 22/24/2
|
|
||||||
f 19/25/3 20/26/3 23/27/3
|
|
||||||
f 26/28/1 28/29/1 27/30/1
|
|
||||||
f 26/31/2 25/32/2 29/33/2
|
|
||||||
f 28/34/3 31/35/3 32/36/3
|
|
||||||
f 34/37/1 36/38/1 35/39/1
|
|
||||||
f 34/40/2 33/41/2 37/42/2
|
|
||||||
f 36/43/3 39/44/3 40/45/3
|
|
||||||
f 42/46/1 44/47/1 43/48/1
|
|
||||||
f 42/49/2 41/50/2 45/51/2
|
|
||||||
f 44/52/3 47/53/3 48/54/3
|
|
||||||
f 51/55/4 52/56/4 50/57/4
|
|
||||||
f 46/58/5 45/51/5 49/59/5
|
|
||||||
f 37/60/1 48/61/1 47/62/1
|
|
||||||
f 29/63/1 40/64/1 39/65/1
|
|
||||||
f 21/66/1 32/67/1 31/68/1
|
|
||||||
f 5/69/1 24/70/1 23/71/1
|
|
||||||
f 7/72/1 14/73/1 13/74/1
|
|
||||||
f 15/17/6 52/75/6 51/76/6
|
|
||||||
f 10/77/7 14/78/7 15/79/7
|
|
||||||
f 2/80/7 6/81/7 7/82/7
|
|
||||||
f 42/83/7 46/84/7 47/85/7
|
|
||||||
f 34/86/7 38/87/7 39/88/7
|
|
||||||
f 26/89/7 30/90/7 31/91/7
|
|
||||||
f 18/92/7 22/93/7 23/94/7
|
|
||||||
f 52/95/7 31/91/7 50/96/7
|
|
||||||
f 48/97/8 45/98/8 41/99/8
|
|
||||||
f 40/100/8 37/101/8 33/102/8
|
|
||||||
f 32/103/8 29/104/8 25/105/8
|
|
||||||
f 24/106/8 21/107/8 17/108/8
|
|
||||||
f 8/109/8 5/110/8 1/111/8
|
|
||||||
f 16/112/8 13/113/8 9/114/8
|
|
||||||
f 32/103/8 51/115/8 49/116/8
|
|
||||||
f 1/117/1 2/1/1 3/3/1
|
|
||||||
f 6/118/2 2/4/2 5/6/2
|
|
||||||
f 8/119/3 3/7/3 7/9/3
|
|
||||||
f 11/120/1 9/10/1 12/12/1
|
|
||||||
f 14/121/2 10/13/2 13/15/2
|
|
||||||
f 11/122/3 12/16/3 16/18/3
|
|
||||||
f 19/123/1 17/19/1 20/21/1
|
|
||||||
f 18/124/2 17/22/2 22/24/2
|
|
||||||
f 24/125/3 19/25/3 23/27/3
|
|
||||||
f 25/126/1 26/28/1 27/30/1
|
|
||||||
f 30/127/2 26/31/2 29/33/2
|
|
||||||
f 27/128/3 28/34/3 32/36/3
|
|
||||||
f 33/129/1 34/37/1 35/39/1
|
|
||||||
f 38/130/2 34/40/2 37/42/2
|
|
||||||
f 35/131/3 36/43/3 40/45/3
|
|
||||||
f 41/132/1 42/46/1 43/48/1
|
|
||||||
f 46/58/2 42/49/2 45/51/2
|
|
||||||
f 43/133/3 44/52/3 48/54/3
|
|
||||||
f 49/134/4 51/55/4 50/57/4
|
|
||||||
f 50/135/5 46/58/5 49/59/5
|
|
||||||
f 38/136/1 37/60/1 47/62/1
|
|
||||||
f 30/137/1 29/63/1 39/65/1
|
|
||||||
f 22/138/1 21/66/1 31/68/1
|
|
||||||
f 6/139/1 5/69/1 23/71/1
|
|
||||||
f 8/140/1 7/72/1 13/74/1
|
|
||||||
f 16/18/6 15/17/6 51/76/6
|
|
||||||
f 12/141/7 10/77/7 15/79/7
|
|
||||||
f 4/142/7 2/80/7 7/82/7
|
|
||||||
f 44/143/7 42/83/7 47/85/7
|
|
||||||
f 36/144/7 34/86/7 39/88/7
|
|
||||||
f 28/145/7 26/89/7 31/91/7
|
|
||||||
f 20/146/7 18/92/7 23/94/7
|
|
||||||
f 46/84/7 50/96/7 47/85/7
|
|
||||||
f 52/95/7 15/79/7 14/78/7
|
|
||||||
f 14/78/7 7/82/7 52/95/7
|
|
||||||
f 6/81/7 23/94/7 52/95/7
|
|
||||||
f 22/93/7 31/91/7 52/95/7
|
|
||||||
f 30/90/7 39/88/7 50/96/7
|
|
||||||
f 38/87/7 47/85/7 50/96/7
|
|
||||||
f 52/95/7 7/82/7 6/81/7
|
|
||||||
f 38/87/7 50/96/7 39/88/7
|
|
||||||
f 31/91/7 30/90/7 50/96/7
|
|
||||||
f 52/95/7 23/94/7 22/93/7
|
|
||||||
f 43/147/8 48/97/8 41/99/8
|
|
||||||
f 35/148/8 40/100/8 33/102/8
|
|
||||||
f 27/149/8 32/103/8 25/105/8
|
|
||||||
f 19/150/8 24/106/8 17/108/8
|
|
||||||
f 3/151/8 8/109/8 1/111/8
|
|
||||||
f 11/152/8 16/112/8 9/114/8
|
|
||||||
f 51/115/8 32/103/8 21/107/8
|
|
||||||
f 45/98/8 48/97/8 49/116/8
|
|
||||||
f 37/101/8 40/100/8 49/116/8
|
|
||||||
f 29/104/8 32/103/8 49/116/8
|
|
||||||
f 21/107/8 24/106/8 51/115/8
|
|
||||||
f 5/110/8 8/109/8 51/115/8
|
|
||||||
f 13/113/8 16/112/8 51/115/8
|
|
||||||
f 49/116/8 48/97/8 37/101/8
|
|
||||||
f 40/100/8 29/104/8 49/116/8
|
|
||||||
f 24/106/8 5/110/8 51/115/8
|
|
||||||
f 13/113/8 51/115/8 8/109/8
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1010 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 996 B |
Binary file not shown.
|
Before Width: | Height: | Size: 851 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 7.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 321 B |
Binary file not shown.
|
Before Width: | Height: | Size: 347 B |
Binary file not shown.
|
Before Width: | Height: | Size: 382 B |
Binary file not shown.
|
After Width: | Height: | Size: 357 B |
BIN
src/main/resources/assets/hbm/textures/items/coil_copper2.png
Normal file
BIN
src/main/resources/assets/hbm/textures/items/coil_copper2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 381 B |
BIN
src/main/resources/assets/hbm/textures/items/coil_gold2.png
Normal file
BIN
src/main/resources/assets/hbm/textures/items/coil_gold2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 292 B |
Binary file not shown.
|
After Width: | Height: | Size: 337 B |
Binary file not shown.
|
Before Width: | Height: | Size: 5.8 KiB |
BIN
src/main/resources/assets/hbm/textures/items/coil_tungsten2.png
Normal file
BIN
src/main/resources/assets/hbm/textures/items/coil_tungsten2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 139 B |
Binary file not shown.
|
Before Width: | Height: | Size: 379 B |
Binary file not shown.
|
Before Width: | Height: | Size: 372 B |
Binary file not shown.
|
Before Width: | Height: | Size: 360 B |
Binary file not shown.
|
Before Width: | Height: | Size: 393 B |
Binary file not shown.
|
Before Width: | Height: | Size: 396 B |
Binary file not shown.
|
Before Width: | Height: | Size: 384 B |
Binary file not shown.
|
Before Width: | Height: | Size: 422 B |
Binary file not shown.
|
Before Width: | Height: | Size: 324 B |
Binary file not shown.
|
Before Width: | Height: | Size: 327 B |
Binary file not shown.
|
Before Width: | Height: | Size: 356 B |
Binary file not shown.
|
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 332 B |
Binary file not shown.
|
Before Width: | Height: | Size: 557 B |
Binary file not shown.
|
Before Width: | Height: | Size: 275 B |
Binary file not shown.
|
Before Width: | Height: | Size: 370 B |
Binary file not shown.
|
Before Width: | Height: | Size: 300 B After Width: | Height: | Size: 294 B |
Binary file not shown.
|
Before Width: | Height: | Size: 737 B |
Binary file not shown.
|
Before Width: | Height: | Size: 241 B |
Binary file not shown.
|
Before Width: | Height: | Size: 492 B |
Binary file not shown.
|
Before Width: | Height: | Size: 278 B |
Binary file not shown.
|
Before Width: | Height: | Size: 277 B |
Binary file not shown.
|
Before Width: | Height: | Size: 255 B |
Binary file not shown.
|
Before Width: | Height: | Size: 322 B |
Binary file not shown.
|
Before Width: | Height: | Size: 303 B |
Binary file not shown.
|
Before Width: | Height: | Size: 395 B |
Binary file not shown.
|
Before Width: | Height: | Size: 389 B |
Binary file not shown.
|
Before Width: | Height: | Size: 344 B |
Binary file not shown.
|
Before Width: | Height: | Size: 353 B |
Binary file not shown.
|
Before Width: | Height: | Size: 386 B |
Binary file not shown.
|
Before Width: | Height: | Size: 344 B |
Binary file not shown.
|
Before Width: | Height: | Size: 325 B |
Binary file not shown.
|
Before Width: | Height: | Size: 388 B |
Binary file not shown.
|
Before Width: | Height: | Size: 370 B |
Binary file not shown.
|
Before Width: | Height: | Size: 391 B |
Binary file not shown.
|
Before Width: | Height: | Size: 346 B |
Binary file not shown.
|
Before Width: | Height: | Size: 388 B |
Binary file not shown.
|
Before Width: | Height: | Size: 352 B |
Binary file not shown.
|
Before Width: | Height: | Size: 334 B |
Binary file not shown.
|
Before Width: | Height: | Size: 389 B |
Binary file not shown.
|
Before Width: | Height: | Size: 355 B |
Binary file not shown.
|
Before Width: | Height: | Size: 330 B |
Binary file not shown.
|
Before Width: | Height: | Size: 351 B |
Binary file not shown.
|
Before Width: | Height: | Size: 313 B |
Binary file not shown.
|
Before Width: | Height: | Size: 324 B |
Binary file not shown.
|
Before Width: | Height: | Size: 347 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user