brick by brick, suck my

changelog

@@ -25,6 +25,11 @@
   * This means that multiple tanks in IO mode in the same network will still ping pong, but instead of firing their entire contents over the network, they will even out
 * The stinger is now classified as a special weapon
 * The carbine can now take a scope
+* The battery socket now renders supports when a block is placed on top of it, allowing somewhat aesthetic stacking of sockets
+* The bayonet weapon attachment now uses regular steel plates instead of weapon steel, making them available as early as the blast furnace
+* Adjusted some 528 mode recipes
+* Removed the template crates entirely for being literally useless
+* Oil bubbles can no longer go down to Y:0, they now have a minimum center height of Y:15
 
 ## Fixed
 * Fixed RoR graph showing the wrong name in the GUI

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -624,7 +624,6 @@ public class ModBlocks {
 	public static Block crate_steel;
 	public static Block crate_desh;
 	public static Block crate_tungsten;
-	public static Block crate_template;
 	public static Block safe;
 	public static Block mass_storage;
 
@@ -2170,7 +2169,6 @@ public class ModBlocks {
 		crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		crate_desh = new BlockStorageCrate(Material.iron).setBlockName("crate_desh").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		crate_tungsten = new BlockStorageCrate(Material.iron).setBlockName("crate_tungsten").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(300.0F).setCreativeTab(MainRegistry.machineTab);
-		crate_template = new BlockStorageCrate(Material.iron).setBlockName("crate_template").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(300.0F).setCreativeTab(MainRegistry.machineTab);
 		safe = new BlockStorageCrate(Material.iron).setBlockName("safe").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab);
 		mass_storage = new BlockMassStorage().setBlockName("mass_storage").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 
@@ -2991,7 +2989,6 @@ public class ModBlocks {
 		register(crate_steel, ItemBlockStorageCrate.class);
 		register(crate_desh, ItemBlockStorageCrate.class);
 		register(crate_tungsten, ItemBlockStorageCrate.class);
-		register(crate_template, ItemBlockStorageCrate.class);
 		register(safe, ItemBlockStorageCrate.class);
 		register(mass_storage, ItemBlockStorageCrate.class);
 

src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java

@@ -78,9 +78,6 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":mass_storage_top");
 			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":mass_storage_side");
 		}
-		if(this == ModBlocks.crate_template) {
-			this.iconTop = this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crate_template");
-		}
 	}
 
 	@Override
@@ -99,7 +96,6 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 		if(this == ModBlocks.crate_steel) return new TileEntityCrateSteel();
 		if(this == ModBlocks.crate_desh) return new TileEntityCrateDesh();
 		if(this == ModBlocks.crate_tungsten) return new TileEntityCrateTungsten();
-		if(this == ModBlocks.crate_template) return new TileEntityCrateTemplate();
 		if(this == ModBlocks.safe) return new TileEntitySafe();
 		return null;
 	}

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -147,7 +147,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.FURNITURE_BLACK.ordinal()), new Object[] { "PDS", "  G", 'P', ANY_PLASTIC.ingot(), 'D', KEY_BLACK, 'S', ANY_PLASTIC.stock(), 'G', ANY_PLASTIC.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.SKIN_SATURNITE.ordinal()), new Object[] { "BRM", " P ", 'B', BIGMT.lightBarrel(), 'R', BIGMT.lightReceiver(), 'M', BIGMT.mechanism(), 'P', BIGMT.plate() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.STACK_MAG.ordinal()), new Object[] { "P P", "P P", "PMP", 'P', WEAPONSTEEL.plate(), 'M', BIGMT.mechanism() });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.BAYONET.ordinal()), new Object[] { "  P", "BBB", 'P', WEAPONSTEEL.plate(), 'B', STEEL.bolt() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.BAYONET.ordinal()), new Object[] { "  P", "BBB", 'P', STEEL.plate(), 'B', STEEL.bolt() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.LAS_SHOTGUN.ordinal()), new Object[] { "PPP", "RCR", "PPP", 'P', ANY_HARDPLASTIC.ingot(), 'R', ModItems.crystal_redstone, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.LAS_CAPACITOR.ordinal()), new Object[] { "CCC", "PIP", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR_TANTALIUM), 'P', ANY_HARDPLASTIC.ingot(), 'I', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.weapon_mod_special, 1, EnumModSpecial.LAS_AUTO.ordinal()), new Object[] { " C ", "RFR", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), 'R', ModItems.crystal_redstone, 'F', ANY_BISMOIDBRONZE.heavyReceiver() });
@@ -169,7 +169,7 @@ public class WeaponRecipes {
 		CraftingManager.addShapelessAuto(DictFrame.fromOne(ModItems.ammo_secret, EnumAmmoSecret.BMG50_EQUESTRIAN, 6), new Object[] { DictFrame.fromOne(ModItems.ammo_standard, EnumAmmo.BMG50_FMJ), DictFrame.fromOne(ModItems.item_secret, EnumSecretType.SELENIUM_STEEL) });
 		
 		//Missiles
-		CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_taint, 1), new Object[] { ModItems.missile_assembly, ModItems.bucket_mud, ModItems.powder_spark_mix, ModItems.powder_magic });
+		CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_taint, 1), new Object[] { ModItems.missile_assembly, Fluids.WATZ.getDict(1_000), ModItems.powder_spark_mix, ModItems.powder_magic });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_micro, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, DictFrame.fromOne(ModItems.ammo_standard, EnumAmmo.NUKE_HIGH) });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_bhole, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.black_hole, DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_ADVANCED) });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_schrabidium, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.cell_anti_schrabidium, DictFrame.fromOne(ModItems.circuit, EnumCircuitType.QUANTUM) });

src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java

@@ -1,21 +0,0 @@
-package com.hbm.inventory.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false)
-public class ContainerCrateTemplate extends ContainerCrateBase {
-
-	public ContainerCrateTemplate(InventoryPlayer invPlayer, IInventory tedf) {
-		super(invPlayer,tedf);
-
-		for(int i = 0; i < 3; i++) {
-			for(int j = 0; j < 9; j++) {
-				this.addSlotToContainer(new Slot(tedf, j + i * 9, 8 + j * 18, 18 + i * 18));
-			}
-		}
-
-		this.playerInv(invPlayer, 8, 86, 144);
-	}
-}

src/main/java/com/hbm/inventory/gui/GUICrateTemplate.java

@@ -1,41 +0,0 @@
-package com.hbm.inventory.gui;
-
-import net.minecraft.inventory.IInventory;
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.inventory.container.ContainerCrateTemplate;
-import com.hbm.lib.RefStrings;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-public class GUICrateTemplate extends GuiCrateBase {
-
-	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_crate_template.png");
-	private IInventory diFurnace;
-
-	public GUICrateTemplate(InventoryPlayer invPlayer, IInventory tedf) {
-		super(new ContainerCrateTemplate(invPlayer, tedf));
-		diFurnace = tedf;
-
-		this.xSize = 176;
-		this.ySize = 168;
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(int i, int j) {
-		String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
-
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
-		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
-	}
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
-		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
-	}
-}

src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java

@@ -483,7 +483,7 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
 				.setPools528(GenericRecipes.POOL_PREFIX_528 + "ferrouranium"));
 		this.register(new GenericRecipe("ass.rbmkautoloader").setup(100, 100).outputItems(new ItemStack(ModBlocks.rbmk_autoloader, 1))
 				.inputItems(new OreDictStack(STEEL.plateWelded(), 4), new OreDictStack(PB.plateCast(), 4), new OreDictStack(B.ingot(), 4), new ComparableStack(ModItems.motor, 3))
-				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.motor_desh, 3))
+				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.motor_desh, 3))
 				.setPools528(GenericRecipes.POOL_PREFIX_528 + "ferrouranium"));
 
 		// PWR

src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java

@@ -44,6 +44,7 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		recipes.put(NA.dust(),											new FluidStack(100, Fluids.SODIUM));
 		recipes.put(PB.ingot(),											new FluidStack(100, Fluids.LEAD));
 		recipes.put(PB.dust(),											new FluidStack(100, Fluids.LEAD));
+		recipes.put(PB.block(),											new FluidStack(900, Fluids.LEAD));
 		//general utility recipes because why not
 		recipes.put(new ComparableStack(Blocks.netherrack),				new FluidStack(250, Fluids.LAVA));
 		recipes.put(new ComparableStack(Blocks.cobblestone),			new FluidStack(250, Fluids.LAVA));

src/main/java/com/hbm/inventory/recipes/PrecAssRecipes.java

@@ -53,24 +53,24 @@ public class PrecAssRecipes extends GenericRecipes<GenericRecipe> {
 							new ComparableStack(ModItems.plate_polymer, 8),
 							new OreDictStack(ANY_BISMOID.nugget(), 2),
 							new OreDictStack(GOLD.wireFine(), 4))
-					.inputFluids(new FluidStack(Fluids.PERFLUOROMETHYL, 1_000)).setPools(POOL_PREFIX_528 + "chip_bismoid"),
+					.inputFluids(new FluidStack(Fluids.PERFLUOROMETHYL, 500)).setPools(POOL_PREFIX_528 + "chip_bismoid"),
 					DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), 75, GeneralConfig.enableExpensiveMode ? 50 : 75);
 			
 			registerPair(new GenericRecipe("precass.chip_quantum").setup(300, 20_000L)
 					.inputItems(new ComparableStack(ModItems.circuit, 8, EnumCircuitType.SILICON),
 							new OreDictStack(BSCCO.wireDense(), 2),
-							new OreDictStack(ANY_HARDPLASTIC.ingot(), 8),
+							new OreDictStack(ANY_HARDPLASTIC.ingot(), 4),
 							new ComparableStack(ModItems.pellet_charged, 4),
 							new OreDictStack(GOLD.wireFine(), 8))
-					.inputFluids(new FluidStack(Fluids.HELIUM4, 1_000)).setPools(POOL_PREFIX_528 + "chip_quantum"),
+					.inputFluids(new FluidStack(Fluids.HELIUM4, 250)).setPools(POOL_PREFIX_528 + "chip_quantum"),
-					DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_QUANTUM), 90, GeneralConfig.enableExpensiveMode ? 50 : 50);
+					DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_QUANTUM), 90, GeneralConfig.enableExpensiveMode ? 50 : 75);
 			
 			registerPair(new GenericRecipe("precass.atomic_clock").setup(200, 2_000L)
 					.inputItems(new ComparableStack(ModItems.circuit, 8, EnumCircuitType.CHIP),
 							new OreDictStack(ANY_PLASTIC.ingot(), 4),
 							new OreDictStack(ZR.wireFine(), 8),
 							new OreDictStack(SR.dust(), 1)).setPools(POOL_PREFIX_528 + "strontium"),
-					DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ATOMIC_CLOCK), 50, GeneralConfig.enableExpensiveMode ? 50 : 50);
+					DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ATOMIC_CLOCK), 50, GeneralConfig.enableExpensiveMode ? 50 : 75);
 			
 			registerPair(new GenericRecipe("precass.controller").setup(400, 15_000L)
 					.inputItems(new ComparableStack(ModItems.circuit, 32, EnumCircuitType.CHIP),

src/main/java/com/hbm/items/block/ItemBlockStorageCrate.java

@@ -82,7 +82,6 @@ public class ItemBlockStorageCrate extends ItemBlockBase implements IGUIProvider
 		if(block == ModBlocks.crate_steel) return new ContainerCrateSteel(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.crate_desh) return new ContainerCrateDesh(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.crate_tungsten) return new ContainerCrateTungsten(player.inventory, new InventoryCrate(player, player.getHeldItem()));
-		if(block == ModBlocks.crate_template) return new ContainerCrateTemplate(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.safe) return new ContainerSafe(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		throw new NullPointerException();
 	}
@@ -95,7 +94,6 @@ public class ItemBlockStorageCrate extends ItemBlockBase implements IGUIProvider
 		if(block == ModBlocks.crate_steel) return new GUICrateSteel(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.crate_desh) return new GUICrateDesh(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.crate_tungsten) return new GUICrateTungsten(player.inventory, new InventoryCrate(player, player.getHeldItem()));
-		if(block == ModBlocks.crate_template) return new GUICrateTemplate(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		if(block == ModBlocks.safe) return new GUISafe(player.inventory, new InventoryCrate(player, player.getHeldItem()));
 		throw new NullPointerException();
 	}
@@ -125,7 +123,6 @@ public class ItemBlockStorageCrate extends ItemBlockBase implements IGUIProvider
 			if(block == ModBlocks.crate_steel) return new TileEntityCrateSteel();
 			if(block == ModBlocks.crate_desh) return new TileEntityCrateDesh();
 			if(block == ModBlocks.crate_tungsten) return new TileEntityCrateTungsten();
-			if(block == ModBlocks.crate_template) return new TileEntityCrateTemplate();
 			if(block == ModBlocks.safe) return new TileEntitySafe();
 			throw new NullPointerException();
 		}

src/main/java/com/hbm/main/CraftingManager.java

@@ -269,7 +269,6 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.machine_turbine, 1), new Object[] { "SMS", "PTP", "SMS", 'S', STEEL.ingot(), 'T', ModItems.turbine_titanium, 'M', ModItems.coil_copper, 'P', ANY_PLASTIC.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "RRR", "WWW", "III", 'R', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'W', REDSTONE.dust(), 'I', STEEL.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "RRR", "WWW", "III", 'R', REDSTONE.dust(), 'W', MINGRADE.wireFine(), 'I', STEEL.ingot() });
-		addRecipeAuto(new ItemStack(ModBlocks.crate_template, 1), new Object[] { "IPI", "P P", "IPI", 'I', IRON.ingot(), 'P', Items.paper });
 		addRecipeAuto(new ItemStack(ModBlocks.crate_iron, 1), new Object[] { "PPP", "I I", "III", 'P', IRON.plate(), 'I', IRON.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.crate_steel, 1), new Object[] { "PPP", "I I", "III", 'P', STEEL.plate(), 'I', STEEL.ingot() });
 

src/main/java/com/hbm/main/MainRegistry.java

@@ -1605,6 +1605,7 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:item.weapon_bat_nail");
 		ignoreMappings.add("hbm:item.weapon_golf_club");
 		ignoreMappings.add("hbm:item.weapon_pipe_rusty");
+		ignoreMappings.add("hbm:tile.crate_template");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

src/main/java/com/hbm/render/tileentity/RenderBatterySocket.java

@@ -51,6 +51,10 @@ public class RenderBatterySocket extends TileEntitySpecialRenderer implements II
 		bindTexture(ResourceManager.battery_socket_tex);
 		ResourceManager.battery_socket.renderPart("Socket");
 		
+		if(socket.frame) {
+			ResourceManager.battery_socket.renderPart("Supports");
+		}
+		
 		ItemStack render = socket.syncStack;
 		if(render != null) {
 			

src/main/java/com/hbm/tileentity/TileMappings.java

@@ -120,7 +120,6 @@ public class TileMappings {
 		put(TileEntityMachineTurbofan.class, "tileentity_machine_turbofan");
 		put(TileEntityMachineTurbineGas.class, "tileentity_machine_gasturbine");
 		put(TileEntityMachineLPW2.class, "tileentity_machine_lpw2");
-		put(TileEntityCrateTemplate.class, "tileentity_crate_template");
 		put(TileEntityCrateIron.class, "tileentity_crate_iron");
 		put(TileEntityCrateSteel.class, "tileentity_crate_steel");
 		put(TileEntityCrateDesh.class, "tileentity_crate_desh");

src/main/java/com/hbm/tileentity/machine/storage/TileEntityBatterySocket.java

@@ -45,6 +45,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 public class TileEntityBatterySocket extends TileEntityBatteryBase implements IRORValueProvider, IRORInteractive, IInfoProviderEC {
 
+	public boolean frame = false;
+	
 	public static BulletConfig discharge;
 	public static BiConsumer<EntityBulletBeamBase, MovingObjectPosition> BEAM_DISCHARGE_HIT = (beam, mop) -> {
 		
@@ -111,6 +113,11 @@ public class TileEntityBatterySocket extends TileEntityBatteryBase implements IR
 			}
 
 			this.log[19] = avg;
+		} else {
+			
+			if(worldObj.getTotalWorldTime() % 20 == 0) {
+				frame = !worldObj.getBlock(xCoord, yCoord + 2, zCoord).isAir(worldObj, xCoord, yCoord + 2, zCoord);
+			}
 		}
 	}
 	

src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTemplate.java

@@ -1,33 +0,0 @@
-package com.hbm.tileentity.machine.storage;
-
-import com.hbm.inventory.container.ContainerCrateTemplate;
-import com.hbm.inventory.gui.GUICrateTemplate;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.world.World;
-
-public class TileEntityCrateTemplate extends TileEntityCrateBase {
-
-	public TileEntityCrateTemplate() {
-		super(27);
-	}
-
-	@Override
-	public String getInventoryName() {
-		return this.hasCustomInventoryName() ? this.customName : "container.crateTemplate";
-	}
-
-	@Override
-	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
-		return new ContainerCrateTemplate(player.inventory, this);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public Object provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) {
-		return new GUICrateTemplate(player.inventory, this);
-	}
-}

src/main/java/com/hbm/world/gen/terrain/MapGenBubble.java

@@ -24,7 +24,7 @@ public class MapGenBubble extends MapGenBaseMeta {
 	private int minSize = 8;
 	private int maxSize = 64;
 
-	public int minY = 0;
+	public int minY = 15;
 	public int rangeY = 25;
 
 	public boolean fuzzy;

src/main/resources/assets/hbm/models/machines/battery.obj

@@ -1,5 +1,140 @@
 # Blender v2.79 (sub 0) OBJ File: 'battery.blend'
 # www.blender.org
+o Supports
+v 0.875000 0.250000 -0.875000
+v 1.000000 0.250000 -0.875000
+v 0.875000 0.250000 -1.000000
+v 1.000000 0.250000 -1.000000
+v 0.875000 2.000000 -0.875000
+v 1.000000 2.000000 -0.875000
+v 0.875000 2.000000 -1.000000
+v 1.000000 2.000000 -1.000000
+v -0.875000 0.250000 0.875000
+v -1.000000 0.250000 0.875000
+v -0.875000 0.250000 1.000000
+v -1.000000 0.250000 1.000000
+v -0.875000 2.000000 0.875000
+v -1.000000 2.000000 0.875000
+v -0.875000 2.000000 1.000000
+v -1.000000 2.000000 1.000000
+v -0.875000 0.250000 -0.875000
+v -0.875000 0.250000 -1.000000
+v -1.000000 0.250000 -0.875000
+v -1.000000 0.250000 -1.000000
+v -0.875000 2.000000 -0.875000
+v -0.875000 2.000000 -1.000000
+v -1.000000 2.000000 -0.875000
+v -1.000000 2.000000 -1.000000
+v 0.875000 0.250000 0.875000
+v 0.875000 0.250000 1.000000
+v 1.000000 0.250000 0.875000
+v 1.000000 0.250000 1.000000
+v 0.875000 2.000000 0.875000
+v 0.875000 2.000000 1.000000
+v 1.000000 2.000000 0.875000
+v 1.000000 2.000000 1.000000
+vt 0.864865 0.694444
+vt 0.486486 0.722222
+vt 0.486486 0.694444
+vt 0.864865 0.722222
+vt 0.486486 0.750000
+vt 0.864865 0.777778
+vt 0.486486 0.805556
+vt 0.486486 0.777778
+vt 0.864865 0.750000
+vt 0.702703 0.777778
+vt 0.729730 0.805556
+vt 0.702703 0.805556
+vt 0.864865 0.694444
+vt 0.486486 0.722222
+vt 0.486486 0.694444
+vt 0.864865 0.722222
+vt 0.486486 0.750000
+vt 0.864865 0.777778
+vt 0.486486 0.805556
+vt 0.486486 0.777778
+vt 0.864865 0.750000
+vt 0.702703 0.777778
+vt 0.729730 0.805556
+vt 0.702703 0.805556
+vt 0.864865 0.694444
+vt 0.486486 0.722222
+vt 0.486486 0.694444
+vt 0.864865 0.722222
+vt 0.486486 0.750000
+vt 0.864865 0.777778
+vt 0.486486 0.805556
+vt 0.486486 0.777778
+vt 0.864865 0.750000
+vt 0.702703 0.777778
+vt 0.729730 0.805556
+vt 0.702703 0.805556
+vt 0.864865 0.694444
+vt 0.486486 0.722222
+vt 0.486486 0.694444
+vt 0.864865 0.722222
+vt 0.486486 0.750000
+vt 0.864865 0.777778
+vt 0.486486 0.805556
+vt 0.486486 0.777778
+vt 0.864865 0.750000
+vt 0.702703 0.777778
+vt 0.729730 0.805556
+vt 0.702703 0.805556
+vt 0.864865 0.805556
+vt 0.729730 0.777778
+vt 0.864865 0.805556
+vt 0.729730 0.777778
+vt 0.864865 0.805556
+vt 0.729730 0.777778
+vt 0.864865 0.805556
+vt 0.729730 0.777778
+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
+vn 0.0000 1.0000 0.0000
+s off
+f 5/1/1 3/2/1 1/3/1
+f 7/4/2 4/5/2 3/2/2
+f 6/6/3 1/7/3 2/8/3
+f 8/9/4 2/8/4 4/5/4
+f 5/10/5 8/11/5 7/12/5
+f 13/13/4 11/14/4 9/15/4
+f 15/16/3 12/17/3 11/14/3
+f 14/18/2 9/19/2 10/20/2
+f 16/21/1 10/20/1 12/17/1
+f 13/22/5 16/23/5 15/24/5
+f 21/25/3 19/26/3 17/27/3
+f 23/28/1 20/29/1 19/26/1
+f 22/30/4 17/31/4 18/32/4
+f 24/33/2 18/32/2 20/29/2
+f 21/34/5 24/35/5 23/36/5
+f 29/37/2 27/38/2 25/39/2
+f 31/40/4 28/41/4 27/38/4
+f 30/42/1 25/43/1 26/44/1
+f 32/45/3 26/44/3 28/41/3
+f 29/46/5 32/47/5 31/48/5
+f 5/1/1 7/4/1 3/2/1
+f 7/4/2 8/9/2 4/5/2
+f 6/6/3 5/49/3 1/7/3
+f 8/9/4 6/6/4 2/8/4
+f 5/10/5 6/50/5 8/11/5
+f 13/13/4 15/16/4 11/14/4
+f 15/16/3 16/21/3 12/17/3
+f 14/18/2 13/51/2 9/19/2
+f 16/21/1 14/18/1 10/20/1
+f 13/22/5 14/52/5 16/23/5
+f 21/25/3 23/28/3 19/26/3
+f 23/28/1 24/33/1 20/29/1
+f 22/30/4 21/53/4 17/31/4
+f 24/33/2 22/30/2 18/32/2
+f 21/34/5 22/54/5 24/35/5
+f 29/37/2 31/40/2 27/38/2
+f 31/40/4 32/45/4 28/41/4
+f 30/42/1 29/55/1 25/43/1
+f 32/45/3 30/42/3 26/44/3
+f 29/46/5 30/56/5 32/47/5
 o Capacitor
 v -0.875000 0.125000 0.875000
 v 0.875000 0.125000 0.875000
@@ -17,14 +152,6 @@ v -0.750000 1.750000 -0.750000
 v -0.750000 1.750000 0.750000
 v 0.750000 1.750000 0.750000
 v 0.750000 1.750000 -0.750000
-v -0.875000 0.125000 0.875000
-v 0.875000 0.125000 0.875000
-v -0.875000 0.125000 -0.875000
-v 0.875000 0.125000 -0.875000
-v -0.875000 1.875000 -0.875000
-v -0.875000 1.875000 0.875000
-v 0.875000 1.875000 0.875000
-v 0.875000 1.875000 -0.875000
 vt 0.269231 0.000000
 vt 0.000000 0.333333
 vt 0.000000 0.000000
@@ -53,26 +180,10 @@ vt 1.000000 0.285714
 vt 0.769231 0.571429
 vt 1.000000 0.285714
 vt 0.769231 0.571429
-vt 0.000000 0.333333
-vt 0.269231 0.000000
-vt 0.000000 0.000000
-vt 0.269231 1.000000
-vt 0.000000 0.666667
-vt 0.000000 1.000000
-vt -0.000000 0.666667
-vt 0.269231 0.333333
-vt -0.000000 0.333333
-vt 0.269231 0.666667
-vt 0.538462 0.333333
-vt 0.269231 0.333333
-vt 0.269231 0.666667
-vt 0.538462 0.333333
 vt 0.538462 0.666667
 vt 0.538462 0.666667
 vt 1.000000 0.571429
 vt 1.000000 0.571429
-vt 0.538462 0.666667
-vt 0.538462 0.666667
 vn 0.0000 -1.0000 0.0000
 vn 0.0000 1.0000 0.0000
 vn -1.0000 0.0000 0.0000
@@ -80,42 +191,30 @@ vn 0.0000 0.0000 -1.0000
 vn 0.0000 0.0000 1.0000
 vn 1.0000 0.0000 0.0000
 s off
-f 3/1/1 2/2/1 1/3/1
+f 35/57/6 34/58/6 33/59/6
-f 7/4/2 5/5/2 6/6/2
+f 39/60/7 37/61/7 38/62/7
-f 1/7/3 5/8/3 3/9/3
+f 33/63/8 37/64/8 35/65/8
-f 3/10/4 8/11/4 4/12/4
+f 35/66/9 40/67/9 36/68/9
-f 2/13/5 6/14/5 1/7/5
+f 34/69/10 38/70/10 33/63/10
-f 4/12/6 7/4/6 2/2/6
+f 36/68/11 39/60/11 34/58/11
-f 11/15/1 10/16/1 9/17/1
+f 43/71/6 42/72/6 41/73/6
-f 15/18/2 13/19/2 14/20/2
+f 47/74/7 45/75/7 46/76/7
-f 12/21/6 15/18/6 10/16/6
+f 44/77/11 47/74/11 42/72/11
-f 9/22/3 13/23/3 11/24/3
+f 41/78/8 45/79/8 43/80/8
-f 11/25/4 16/26/4 12/21/4
+f 43/81/9 48/82/9 44/77/9
-f 10/27/5 14/28/5 9/22/5
+f 42/83/10 46/84/10 41/78/10
-f 18/29/2 19/30/2 17/31/2
+f 35/57/6 36/68/6 34/58/6
-f 21/32/1 23/33/1 22/34/1
+f 39/60/7 40/67/7 37/61/7
-f 21/35/6 17/36/6 19/37/6
+f 33/63/8 38/70/8 37/64/8
-f 24/38/5 19/39/5 20/40/5
+f 35/66/9 37/85/9 40/67/9
-f 22/41/4 18/42/4 17/36/4
+f 34/69/10 39/86/10 38/70/10
-f 23/33/3 20/40/3 18/29/3
+f 36/68/11 40/67/11 39/60/11
-f 3/1/1 4/12/1 2/2/1
+f 43/71/6 44/77/6 42/72/6
-f 7/4/2 8/11/2 5/5/2
+f 47/74/7 48/82/7 45/75/7
-f 1/7/3 6/14/3 5/8/3
+f 44/77/11 48/82/11 47/74/11
-f 3/10/4 5/43/4 8/11/4
+f 41/78/8 46/84/8 45/79/8
-f 2/13/5 7/44/5 6/14/5
+f 43/81/9 45/87/9 48/82/9
-f 4/12/6 8/11/6 7/4/6
+f 42/83/10 47/88/10 46/84/10
-f 11/15/1 12/21/1 10/16/1
-f 15/18/2 16/26/2 13/19/2
-f 12/21/6 16/26/6 15/18/6
-f 9/22/3 14/28/3 13/23/3
-f 11/25/4 13/45/4 16/26/4
-f 10/27/5 15/46/5 14/28/5
-f 18/29/2 20/40/2 19/30/2
-f 21/32/1 24/38/1 23/33/1
-f 21/35/6 22/41/6 17/36/6
-f 24/38/5 21/47/5 19/39/5
-f 22/41/4 23/48/4 18/42/4
-f 23/33/3 24/38/3 20/40/3
 o Battery
 v 0.687500 1.875000 -0.875000
 v 0.875000 1.875000 -0.687500
@@ -384,158 +483,158 @@ vn 1.0000 0.0000 0.0000
 vn 0.0000 0.0000 -1.0000
 vn -1.0000 0.0000 0.0000
 s off
-f 32/49/7 38/50/7 46/51/7
+f 56/89/12 62/90/12 70/91/12
-f 59/52/8 50/53/8 27/54/8
+f 83/92/13 74/93/13 51/94/13
-f 44/55/9 27/56/9 50/57/9
+f 68/95/14 51/96/14 74/97/14
-f 44/58/10 40/59/10 34/60/10
+f 68/98/15 64/99/15 58/100/15
-f 48/61/10 39/62/10 50/63/10
+f 72/101/15 63/102/15 74/103/15
-f 34/64/11 36/65/11 41/66/11
+f 58/104/16 60/105/16 65/106/16
-f 34/64/8 32/49/8 31/67/8
+f 58/104/13 56/89/13 55/107/13
-f 36/68/9 42/69/9 41/70/9
+f 60/108/14 66/109/14 65/110/14
-f 46/71/12 44/72/12 43/73/12
+f 70/111/17 68/112/17 67/113/17
-f 38/74/13 40/59/13 39/75/13
+f 62/114/18 64/99/18 63/115/18
-f 40/59/14 32/49/14 33/76/14
+f 64/99/19 56/89/19 57/116/19
-f 51/77/13 49/78/13 54/79/13
+f 75/117/18 73/118/18 78/119/18
-f 53/80/15 47/81/15 52/82/15
+f 77/120/20 71/121/20 76/122/20
-f 39/83/8 30/84/8 38/85/8
+f 63/123/13 54/124/13 62/125/13
-f 51/77/10 60/86/10 68/87/10
+f 75/117/15 84/126/15 92/127/15
-f 38/88/7 26/89/7 53/90/7
+f 62/128/12 50/129/12 77/130/12
-f 66/91/16 62/92/16 57/93/16
+f 90/131/21 86/132/21 81/133/21
-f 54/94/12 52/82/12 51/95/12
+f 78/134/17 76/122/17 75/135/17
-f 25/96/13 48/61/13 47/81/13
+f 49/136/18 72/101/18 71/121/18
-f 48/61/14 30/84/14 29/97/14
+f 72/101/19 54/124/19 53/137/19
-f 64/98/9 28/99/9 68/100/9
+f 88/138/14 52/139/14 92/140/14
-f 35/101/8 56/102/8 42/103/8
+f 59/141/13 80/142/13 66/143/13
-f 56/102/11 58/104/11 61/105/11
+f 80/142/16 82/144/16 85/145/16
-f 59/106/7 54/79/7 71/107/7
+f 83/146/12 78/119/12 95/147/12
-f 58/108/9 62/92/9 61/109/9
+f 82/148/14 86/132/14 85/149/14
-f 66/91/12 64/110/12 63/111/12
+f 90/131/17 88/150/17 87/151/17
-f 43/112/13 59/113/13 46/114/13
+f 67/152/18 83/153/18 70/154/18
-f 61/115/10 63/116/10 60/117/10
+f 85/155/15 87/156/15 84/157/15
-f 72/118/16 68/100/16 28/99/16
+f 96/158/21 92/140/21 52/139/21
-f 71/119/15 67/120/15 70/121/15
+f 95/159/20 91/160/20 94/161/20
-f 65/122/7 57/123/7 55/124/7
+f 89/162/12 81/163/12 79/164/12
-f 72/118/12 70/121/12 69/125/12
+f 96/158/17 94/161/17 93/165/17
-f 84/126/15 80/127/15 81/128/15
+f 108/166/20 104/167/20 105/168/20
-f 76/129/7 80/127/7 78/130/7
+f 100/169/12 104/167/12 102/170/12
-f 84/131/10 82/132/10 86/133/10
+f 108/171/15 106/172/15 110/173/15
-f 88/134/16 78/130/16 83/135/16
+f 112/174/21 102/170/21 107/175/21
-f 82/132/14 76/129/14 85/136/14
+f 106/172/19 100/169/19 109/176/19
-f 82/132/13 80/137/13 79/138/13
+f 106/172/18 104/177/18 103/178/18
-f 78/139/12 84/126/12 83/140/12
+f 102/179/17 108/166/17 107/180/17
-f 88/134/9 74/141/9 73/142/9
+f 112/174/14 98/181/14 97/182/14
-f 76/143/8 86/144/8 85/145/8
+f 100/183/13 110/184/13 109/185/13
-f 86/144/11 74/146/11 87/147/11
+f 110/184/16 98/186/16 111/187/16
-f 100/148/15 96/149/15 97/150/15
+f 124/188/20 120/189/20 121/190/20
-f 92/151/7 96/149/7 94/152/7
+f 116/191/12 120/189/12 118/192/12
-f 100/153/10 98/154/10 102/155/10
+f 124/193/15 122/194/15 126/195/15
-f 104/156/16 94/152/16 99/157/16
+f 128/196/21 118/192/21 123/197/21
-f 98/154/14 92/151/14 101/158/14
+f 122/194/19 116/191/19 125/198/19
-f 98/154/13 96/159/13 95/160/13
+f 122/194/18 120/199/18 119/200/18
-f 94/161/12 100/148/12 99/162/12
+f 118/201/17 124/188/17 123/202/17
-f 104/156/9 90/163/9 89/164/9
+f 128/196/14 114/203/14 113/204/14
-f 92/165/8 102/166/8 101/167/8
+f 116/205/13 126/206/13 125/207/13
-f 102/166/11 90/168/11 103/169/11
+f 126/206/16 114/208/16 127/209/16
-f 46/51/7 35/170/7 36/171/7
+f 70/91/12 59/210/12 60/211/12
-f 36/171/7 31/172/7 32/49/7
+f 60/211/12 55/212/12 56/89/12
-f 32/49/7 37/173/7 38/50/7
+f 56/89/12 61/213/12 62/90/12
-f 38/50/7 45/174/7 46/51/7
+f 62/90/12 69/214/12 70/91/12
-f 46/51/7 36/171/7 32/49/7
+f 70/91/12 60/211/12 56/89/12
-f 59/52/8 60/175/8 50/53/8
+f 83/92/13 84/215/13 74/93/13
-f 44/55/9 45/176/9 27/56/9
+f 68/95/14 69/216/14 51/96/14
-f 34/60/10 41/177/10 42/178/10
+f 58/100/15 65/217/15 66/218/15
-f 42/178/10 43/179/10 44/58/10
+f 66/218/15 67/219/15 68/98/15
-f 44/58/10 39/180/10 40/59/10
+f 68/98/15 63/220/15 64/99/15
-f 40/59/10 33/76/10 34/60/10
+f 64/99/15 57/116/15 58/100/15
-f 34/60/10 42/178/10 44/58/10
+f 58/100/15 66/218/15 68/98/15
-f 50/63/10 51/181/10 52/182/10
+f 74/103/15 75/221/15 76/222/15
-f 52/182/10 47/183/10 48/61/10
+f 76/222/15 71/223/15 72/101/15
-f 48/61/10 29/97/10 39/62/10
+f 72/101/15 53/137/15 63/102/15
-f 39/62/10 44/184/10 50/63/10
+f 63/102/15 68/224/15 74/103/15
-f 50/63/10 52/182/10 48/61/10
+f 74/103/15 76/222/15 72/101/15
-f 34/64/11 31/67/11 36/65/11
+f 58/104/16 55/107/16 60/105/16
-f 34/64/8 33/76/8 32/49/8
+f 58/104/13 57/116/13 56/89/13
-f 36/68/9 35/185/9 42/69/9
+f 60/108/14 59/225/14 66/109/14
-f 46/71/12 45/186/12 44/72/12
+f 70/111/17 69/226/17 68/112/17
-f 38/74/13 37/173/13 40/59/13
+f 62/114/18 61/213/18 64/99/18
-f 40/59/14 37/173/14 32/49/14
+f 64/99/19 61/213/19 56/89/19
-f 51/77/13 67/120/13 49/78/13
+f 75/117/18 91/160/18 73/118/18
-f 53/80/15 25/96/15 47/81/15
+f 77/120/20 49/136/20 71/121/20
-f 39/83/8 29/97/8 30/84/8
+f 63/123/13 53/137/13 54/124/13
-f 68/87/10 69/187/10 70/188/10
+f 92/127/15 93/227/15 94/228/15
-f 70/188/10 67/189/10 51/77/10
+f 94/228/15 91/229/15 75/117/15
-f 51/77/10 50/53/10 60/86/10
+f 75/117/15 74/93/15 84/126/15
-f 60/86/10 64/190/10 68/87/10
+f 84/126/15 88/230/15 92/127/15
-f 68/87/10 70/188/10 51/77/10
+f 92/127/15 94/228/15 75/117/15
-f 53/90/7 54/191/7 27/192/7
+f 77/130/12 78/231/12 51/232/12
-f 27/192/7 45/193/7 38/88/7
+f 51/232/12 69/233/12 62/128/12
-f 38/88/7 30/84/7 26/89/7
+f 62/128/12 54/124/12 50/129/12
-f 26/89/7 25/194/7 53/90/7
+f 50/129/12 49/234/12 77/130/12
-f 53/90/7 27/192/7 38/88/7
+f 77/130/12 51/232/12 62/128/12
-f 66/91/16 63/111/16 62/92/16
+f 90/131/21 87/151/21 86/132/21
-f 54/94/12 53/80/12 52/82/12
+f 78/134/17 77/120/17 76/122/17
-f 25/96/13 26/89/13 48/61/13
+f 49/136/18 50/129/18 72/101/18
-f 48/61/14 26/89/14 30/84/14
+f 72/101/19 50/129/19 54/124/19
-f 64/98/9 65/195/9 28/99/9
+f 88/138/14 89/235/14 52/139/14
-f 35/101/8 55/196/8 56/102/8
+f 59/141/13 79/236/13 80/142/13
-f 56/102/11 55/196/11 58/104/11
+f 80/142/16 79/236/16 82/144/16
-f 71/107/7 72/197/7 28/198/7
+f 95/147/12 96/237/12 52/238/12
-f 28/198/7 65/199/7 59/106/7
+f 52/238/12 89/239/12 83/146/12
-f 59/106/7 27/54/7 54/79/7
+f 83/146/12 51/94/12 78/119/12
-f 54/79/7 49/200/7 71/107/7
+f 78/119/12 73/240/12 95/147/12
-f 71/107/7 28/198/7 59/106/7
+f 95/147/12 52/238/12 83/146/12
-f 58/108/9 57/93/9 62/92/9
+f 82/148/14 81/133/14 86/132/14
-f 66/91/12 65/201/12 64/110/12
+f 90/131/17 89/241/17 88/150/17
-f 43/112/13 60/202/13 59/113/13
+f 67/152/18 84/242/18 83/153/18
-f 60/117/10 43/112/10 42/103/10
+f 84/157/15 67/152/15 66/143/15
-f 42/103/10 56/203/10 61/115/10
+f 66/143/15 80/243/15 85/155/15
-f 61/115/10 62/204/10 63/116/10
+f 85/155/15 86/244/15 87/156/15
-f 63/116/10 64/205/10 60/117/10
+f 87/156/15 88/245/15 84/157/15
-f 60/117/10 42/103/10 61/115/10
+f 84/157/15 66/143/15 85/155/15
-f 72/118/16 69/125/16 68/100/16
+f 96/158/21 93/165/21 92/140/21
-f 71/119/15 49/78/15 67/120/15
+f 95/159/20 73/118/20 91/160/20
-f 55/124/7 35/101/7 46/114/7
+f 79/164/12 59/141/12 70/154/12
-f 46/114/7 59/206/7 65/122/7
+f 70/154/12 83/246/12 89/162/12
-f 65/122/7 66/207/7 57/123/7
+f 89/162/12 90/247/12 81/163/12
-f 57/123/7 58/208/7 55/124/7
+f 81/163/12 82/248/12 79/164/12
-f 55/124/7 46/114/7 65/122/7
+f 79/164/12 70/154/12 89/162/12
-f 72/118/12 71/119/12 70/121/12
+f 96/158/17 95/159/17 94/161/17
-f 84/126/15 77/209/15 80/127/15
+f 108/166/20 101/249/20 104/167/20
-f 78/130/7 73/142/7 74/146/7
+f 102/170/12 97/182/12 98/186/12
-f 74/146/7 75/210/7 76/129/7
+f 98/186/12 99/250/12 100/169/12
-f 76/129/7 79/138/7 80/127/7
+f 100/169/12 103/178/12 104/167/12
-f 80/127/7 77/209/7 78/130/7
+f 104/167/12 101/249/12 102/170/12
-f 78/130/7 74/146/7 76/129/7
+f 102/170/12 98/186/12 100/169/12
-f 86/133/10 87/211/10 88/212/10
+f 110/173/15 111/251/15 112/252/15
-f 88/212/10 83/213/10 84/131/10
+f 112/252/15 107/253/15 108/171/15
-f 84/131/10 81/214/10 82/132/10
+f 108/171/15 105/254/15 106/172/15
-f 82/132/10 85/136/10 86/133/10
+f 106/172/15 109/176/15 110/173/15
-f 86/133/10 88/212/10 84/131/10
+f 110/173/15 112/252/15 108/171/15
-f 88/134/16 73/142/16 78/130/16
+f 112/174/21 97/182/21 102/170/21
-f 82/132/14 79/138/14 76/129/14
+f 106/172/19 103/178/19 100/169/19
-f 82/132/13 81/215/13 80/137/13
+f 106/172/18 105/255/18 104/177/18
-f 78/139/12 77/209/12 84/126/12
+f 102/179/17 101/249/17 108/166/17
-f 88/134/9 87/216/9 74/141/9
+f 112/174/14 111/256/14 98/181/14
-f 76/143/8 75/210/8 86/144/8
+f 100/183/13 99/250/13 110/184/13
-f 86/144/11 75/210/11 74/146/11
+f 110/184/16 99/250/16 98/186/16
-f 100/148/15 93/217/15 96/149/15
+f 124/188/20 117/257/20 120/189/20
-f 94/152/7 89/164/7 90/168/7
+f 118/192/12 113/204/12 114/208/12
-f 90/168/7 91/218/7 92/151/7
+f 114/208/12 115/258/12 116/191/12
-f 92/151/7 95/160/7 96/149/7
+f 116/191/12 119/200/12 120/189/12
-f 96/149/7 93/217/7 94/152/7
+f 120/189/12 117/257/12 118/192/12
-f 94/152/7 90/168/7 92/151/7
+f 118/192/12 114/208/12 116/191/12
-f 102/155/10 103/219/10 104/220/10
+f 126/195/15 127/259/15 128/260/15
-f 104/220/10 99/221/10 100/153/10
+f 128/260/15 123/261/15 124/193/15
-f 100/153/10 97/222/10 98/154/10
+f 124/193/15 121/262/15 122/194/15
-f 98/154/10 101/158/10 102/155/10
+f 122/194/15 125/198/15 126/195/15
-f 102/155/10 104/220/10 100/153/10
+f 126/195/15 128/260/15 124/193/15
-f 104/156/16 89/164/16 94/152/16
+f 128/196/21 113/204/21 118/192/21
-f 98/154/14 95/160/14 92/151/14
+f 122/194/19 119/200/19 116/191/19
-f 98/154/13 97/223/13 96/159/13
+f 122/194/18 121/263/18 120/199/18
-f 94/161/12 93/217/12 100/148/12
+f 118/201/17 117/257/17 124/188/17
-f 104/156/9 103/224/9 90/163/9
+f 128/196/14 127/264/14 114/203/14
-f 92/165/8 91/218/8 102/166/8
+f 116/205/13 115/258/13 126/206/13
-f 102/166/11 91/218/11 90/168/11
+f 126/206/16 115/258/16 114/208/16
 o Socket
 v -1.000000 0.000000 1.000000
 v 1.000000 0.000000 1.000000
@@ -938,199 +1037,199 @@ vn -0.7099 0.7043 0.0000
 vn 0.7099 -0.7043 0.0000
 vn -0.7071 -0.7071 0.0000
 s off
-f 107/225/17 106/226/17 105/227/17
+f 131/265/22 130/266/22 129/267/22
-f 112/228/18 127/229/18 110/230/18
+f 136/268/23 151/269/23 134/270/23
-f 107/225/19 116/231/19 108/232/19
+f 131/265/24 140/271/24 132/272/24
-f 106/226/20 114/233/20 105/227/20
+f 130/266/25 138/273/25 129/267/25
-f 108/232/21 115/234/21 106/226/21
+f 132/272/26 139/274/26 130/266/26
-f 105/227/18 113/235/18 107/225/18
+f 129/267/23 137/275/23 131/265/23
-f 111/236/22 114/237/22 109/238/22
+f 135/276/27 138/277/27 133/278/27
-f 109/238/22 115/234/22 110/239/22
+f 133/278/27 139/274/27 134/279/27
-f 110/239/22 116/240/22 112/241/22
+f 134/279/27 140/280/27 136/281/27
-f 112/241/22 113/242/22 111/236/22
+f 136/281/27 137/282/27 135/276/27
-f 118/243/21 119/244/21 117/245/21
+f 142/283/26 143/284/26 141/285/26
-f 121/246/18 123/247/18 122/248/18
+f 145/286/23 147/287/23 146/288/23
-f 127/229/22 125/249/22 126/250/22
+f 151/269/27 149/289/27 150/290/27
-f 119/244/22 122/248/22 117/245/22
+f 143/284/27 146/288/27 141/285/27
-f 120/251/19 121/246/19 119/244/19
+f 144/291/24 145/286/24 143/284/24
-f 117/245/20 123/252/20 118/253/20
+f 141/285/25 147/292/25 142/293/25
-f 109/254/21 125/249/21 111/255/21
+f 133/294/26 149/289/26 135/295/26
-f 111/256/20 128/257/20 112/258/20
+f 135/296/25 152/297/25 136/298/25
-f 110/259/19 126/250/19 109/260/19
+f 134/299/24 150/290/24 133/300/24
-f 130/261/21 131/262/21 129/263/21
+f 154/301/26 155/302/26 153/303/26
-f 133/264/18 135/265/18 134/266/18
+f 157/304/23 159/305/23 158/306/23
-f 131/262/22 134/266/22 129/263/22
+f 155/302/27 158/306/27 153/303/27
-f 132/267/19 133/264/19 131/262/19
+f 156/307/24 157/304/24 155/302/24
-f 129/263/20 135/268/20 130/269/20
+f 153/303/25 159/308/25 154/309/25
-f 138/270/18 139/271/18 137/272/18
+f 162/310/23 163/311/23 161/312/23
-f 141/273/21 143/274/21 142/275/21
+f 165/313/26 167/314/26 166/315/26
-f 139/271/22 142/275/22 137/272/22
+f 163/311/27 166/315/27 161/312/27
-f 140/276/20 141/273/20 139/271/20
+f 164/316/25 165/313/25 163/311/25
-f 137/272/19 143/277/19 138/278/19
+f 161/312/24 167/317/24 162/318/24
-f 146/279/18 147/280/18 145/281/18
+f 170/319/23 171/320/23 169/321/23
-f 149/282/21 151/283/21 150/284/21
+f 173/322/26 175/323/26 174/324/26
-f 147/280/22 150/284/22 145/281/22
+f 171/320/27 174/324/27 169/321/27
-f 148/285/20 149/282/20 147/280/20
+f 172/325/25 173/322/25 171/320/25
-f 145/281/19 151/286/19 146/287/19
+f 169/321/24 175/326/24 170/327/24
-f 154/288/19 155/289/19 153/290/19
+f 178/328/24 179/329/24 177/330/24
-f 157/291/20 159/292/20 158/293/20
+f 181/331/25 183/332/25 182/333/25
-f 155/289/22 158/293/22 153/290/22
+f 179/329/27 182/333/27 177/330/27
-f 156/294/18 157/291/18 155/289/18
+f 180/334/23 181/331/23 179/329/23
-f 153/290/21 159/295/21 154/296/21
+f 177/330/26 183/335/26 178/336/26
-f 162/297/19 163/298/19 161/299/19
+f 186/337/24 187/338/24 185/339/24
-f 165/300/20 167/301/20 166/302/20
+f 189/340/25 191/341/25 190/342/25
-f 163/298/22 166/302/22 161/299/22
+f 187/338/27 190/342/27 185/339/27
-f 164/303/18 165/300/18 163/298/18
+f 188/343/23 189/340/23 187/338/23
-f 161/299/21 167/304/21 162/305/21
+f 185/339/26 191/344/26 186/345/26
-f 170/306/20 171/307/20 169/308/20
+f 194/346/25 195/347/25 193/348/25
-f 173/309/19 175/310/19 174/311/19
+f 197/349/24 199/350/24 198/351/24
-f 171/307/22 174/311/22 169/308/22
+f 195/347/27 198/351/27 193/348/27
-f 172/312/21 173/309/21 171/307/21
+f 196/352/26 197/349/26 195/347/26
-f 169/308/18 175/313/18 170/314/18
+f 193/348/23 199/353/23 194/354/23
-f 178/315/20 179/316/20 177/317/20
+f 202/355/25 203/356/25 201/357/25
-f 181/318/19 183/319/19 182/320/19
+f 205/358/24 207/359/24 206/360/24
-f 179/316/22 182/320/22 177/317/22
+f 203/356/27 206/360/27 201/357/27
-f 180/321/21 181/318/21 179/316/21
+f 204/361/26 205/358/26 203/356/26
-f 177/317/18 183/322/18 178/323/18
+f 201/357/23 207/362/23 202/363/23
-f 186/324/19 201/325/19 185/326/19
+f 210/364/24 225/365/24 209/366/24
-f 200/327/22 198/328/22 199/329/22
+f 224/367/27 222/368/27 223/369/27
-f 196/330/22 194/331/22 195/332/22
+f 220/370/27 218/371/27 219/372/27
-f 192/333/19 197/334/19 193/335/19
+f 216/373/24 221/374/24 217/375/24
-f 191/336/20 195/337/20 190/338/20
+f 215/376/25 219/377/25 214/378/25
-f 193/335/21 196/330/21 191/336/21
+f 217/375/26 220/370/26 215/376/26
-f 190/339/18 194/340/18 192/333/18
+f 214/379/23 218/380/23 216/373/23
-f 187/341/20 199/342/20 188/343/20
+f 211/381/25 223/382/25 212/383/25
-f 185/326/21 200/327/21 187/341/21
+f 209/366/26 224/367/26 211/381/26
-f 188/344/18 198/345/18 186/324/18
+f 212/384/23 222/385/23 210/364/23
-f 203/346/19 217/347/19 202/348/19
+f 227/386/24 241/387/24 226/388/24
-f 216/349/22 214/350/22 215/351/22
+f 240/389/27 238/390/27 239/391/27
-f 212/352/22 210/353/22 211/354/22
+f 236/392/27 234/393/27 235/394/27
-f 208/355/19 213/356/19 209/357/19
+f 232/395/24 237/396/24 233/397/24
-f 207/358/20 211/359/20 206/360/20
+f 231/398/25 235/399/25 230/400/25
-f 209/357/21 212/352/21 207/358/21
+f 233/397/26 236/392/26 231/398/26
-f 206/361/18 210/362/18 208/355/18
+f 230/401/23 234/402/23 232/395/23
-f 204/363/20 215/364/20 205/365/20
+f 228/403/25 239/404/25 229/405/25
-f 202/348/21 216/349/21 204/363/21
+f 226/388/26 240/389/26 228/403/26
-f 205/366/18 214/367/18 203/346/18
+f 229/406/23 238/407/23 227/386/23
-f 218/368/22 219/369/22 189/370/22
+f 242/408/27 243/409/27 213/410/27
-f 218/368/23 222/371/23 220/372/23
+f 242/408/28 246/411/28 244/412/28
-f 221/373/21 224/374/21 222/371/21
+f 245/413/26 248/414/26 246/411/26
-f 219/369/24 225/375/24 189/370/24
+f 243/409/29 249/415/29 213/410/29
-f 226/376/18 227/377/18 225/375/18
+f 250/416/23 251/417/23 249/415/23
-f 230/378/22 231/379/22 229/380/22
+f 254/418/27 255/419/27 253/420/27
-f 230/378/23 234/381/23 232/382/23
+f 254/418/28 258/421/28 256/422/28
-f 233/383/21 236/384/21 234/381/21
+f 257/423/26 260/424/26 258/421/26
-f 231/379/24 237/385/24 229/380/24
+f 255/419/29 261/425/29 253/420/29
-f 238/386/18 239/387/18 237/385/18
+f 262/426/23 263/427/23 261/425/23
-f 193/335/17 190/388/17 192/389/17
+f 217/375/22 214/428/22 216/429/22
-f 209/357/17 206/390/17 208/391/17
+f 233/397/22 230/430/22 232/431/22
-f 204/363/17 203/392/17 202/348/17
+f 228/403/22 227/432/22 226/388/22
-f 187/341/17 186/393/17 185/326/17
+f 211/381/22 210/433/22 209/366/22
-f 242/394/21 243/395/21 244/396/21
+f 266/434/26 267/435/26 268/436/26
-f 244/396/25 250/397/25 252/398/25
+f 268/436/30 274/437/30 276/438/30
-f 245/399/18 248/400/18 247/401/18
+f 269/439/23 272/440/23 271/441/23
-f 247/401/26 251/402/26 249/403/26
+f 271/441/31 275/442/31 273/443/31
-f 250/397/17 251/402/17 252/398/17
+f 274/437/22 275/442/22 276/438/22
-f 254/404/21 255/405/21 256/406/21
+f 278/444/26 279/445/26 280/446/26
-f 256/406/25 262/407/25 264/408/25
+f 280/446/30 286/447/30 288/448/30
-f 257/409/18 260/410/18 259/411/18
+f 281/449/23 284/450/23 283/451/23
-f 259/411/26 263/412/26 261/413/26
+f 283/451/31 287/452/31 285/453/31
-f 262/407/17 263/412/17 264/408/17
+f 286/447/22 287/452/22 288/448/22
-f 107/225/17 108/232/17 106/226/17
+f 131/265/22 132/272/22 130/266/22
-f 112/228/18 128/257/18 127/229/18
+f 136/268/23 152/297/23 151/269/23
-f 107/225/19 113/414/19 116/231/19
+f 131/265/24 137/454/24 140/271/24
-f 106/226/20 115/415/20 114/233/20
+f 130/266/25 139/455/25 138/273/25
-f 108/232/21 116/240/21 115/234/21
+f 132/272/26 140/280/26 139/274/26
-f 105/227/18 114/416/18 113/235/18
+f 129/267/23 138/456/23 137/275/23
-f 111/236/22 113/242/22 114/237/22
+f 135/276/27 137/282/27 138/277/27
-f 109/238/22 114/237/22 115/234/22
+f 133/278/27 138/277/27 139/274/27
-f 110/239/22 115/234/22 116/240/22
+f 134/279/27 139/274/27 140/280/27
-f 112/241/22 116/240/22 113/242/22
+f 136/281/27 140/280/27 137/282/27
-f 118/243/21 120/417/21 119/244/21
+f 142/283/26 144/457/26 143/284/26
-f 121/246/18 124/418/18 123/247/18
+f 145/286/23 148/458/23 147/287/23
-f 127/229/22 128/257/22 125/249/22
+f 151/269/27 152/297/27 149/289/27
-f 119/244/22 121/246/22 122/248/22
+f 143/284/27 145/286/27 146/288/27
-f 120/251/19 124/419/19 121/246/19
+f 144/291/24 148/459/24 145/286/24
-f 117/245/20 122/248/20 123/252/20
+f 141/285/25 146/288/25 147/292/25
-f 109/254/21 126/250/21 125/249/21
+f 133/294/26 150/290/26 149/289/26
-f 111/256/20 125/249/20 128/257/20
+f 135/296/25 149/289/25 152/297/25
-f 110/259/19 127/229/19 126/250/19
+f 134/299/24 151/269/24 150/290/24
-f 130/261/21 132/420/21 131/262/21
+f 154/301/26 156/460/26 155/302/26
-f 133/264/18 136/421/18 135/265/18
+f 157/304/23 160/461/23 159/305/23
-f 131/262/22 133/264/22 134/266/22
+f 155/302/27 157/304/27 158/306/27
-f 132/267/19 136/422/19 133/264/19
+f 156/307/24 160/462/24 157/304/24
-f 129/263/20 134/266/20 135/268/20
+f 153/303/25 158/306/25 159/308/25
-f 138/270/18 140/423/18 139/271/18
+f 162/310/23 164/463/23 163/311/23
-f 141/273/21 144/424/21 143/274/21
+f 165/313/26 168/464/26 167/314/26
-f 139/271/22 141/273/22 142/275/22
+f 163/311/27 165/313/27 166/315/27
-f 140/276/20 144/425/20 141/273/20
+f 164/316/25 168/465/25 165/313/25
-f 137/272/19 142/275/19 143/277/19
+f 161/312/24 166/315/24 167/317/24
-f 146/279/18 148/426/18 147/280/18
+f 170/319/23 172/466/23 171/320/23
-f 149/282/21 152/427/21 151/283/21
+f 173/322/26 176/467/26 175/323/26
-f 147/280/22 149/282/22 150/284/22
+f 171/320/27 173/322/27 174/324/27
-f 148/285/20 152/428/20 149/282/20
+f 172/325/25 176/468/25 173/322/25
-f 145/281/19 150/284/19 151/286/19
+f 169/321/24 174/324/24 175/326/24
-f 154/288/19 156/429/19 155/289/19
+f 178/328/24 180/469/24 179/329/24
-f 157/291/20 160/430/20 159/292/20
+f 181/331/25 184/470/25 183/332/25
-f 155/289/22 157/291/22 158/293/22
+f 179/329/27 181/331/27 182/333/27
-f 156/294/18 160/431/18 157/291/18
+f 180/334/23 184/471/23 181/331/23
-f 153/290/21 158/293/21 159/295/21
+f 177/330/26 182/333/26 183/335/26
-f 162/297/19 164/432/19 163/298/19
+f 186/337/24 188/472/24 187/338/24
-f 165/300/20 168/433/20 167/301/20
+f 189/340/25 192/473/25 191/341/25
-f 163/298/22 165/300/22 166/302/22
+f 187/338/27 189/340/27 190/342/27
-f 164/303/18 168/434/18 165/300/18
+f 188/343/23 192/474/23 189/340/23
-f 161/299/21 166/302/21 167/304/21
+f 185/339/26 190/342/26 191/344/26
-f 170/306/20 172/435/20 171/307/20
+f 194/346/25 196/475/25 195/347/25
-f 173/309/19 176/436/19 175/310/19
+f 197/349/24 200/476/24 199/350/24
-f 171/307/22 173/309/22 174/311/22
+f 195/347/27 197/349/27 198/351/27
-f 172/312/21 176/437/21 173/309/21
+f 196/352/26 200/477/26 197/349/26
-f 169/308/18 174/311/18 175/313/18
+f 193/348/23 198/351/23 199/353/23
-f 178/315/20 180/438/20 179/316/20
+f 202/355/25 204/478/25 203/356/25
-f 181/318/19 184/439/19 183/319/19
+f 205/358/24 208/479/24 207/359/24
-f 179/316/22 181/318/22 182/320/22
+f 203/356/27 205/358/27 206/360/27
-f 180/321/21 184/440/21 181/318/21
+f 204/361/26 208/480/26 205/358/26
-f 177/317/18 182/320/18 183/322/18
+f 201/357/23 206/360/23 207/362/23
-f 186/324/19 198/345/19 201/325/19
+f 210/364/24 222/385/24 225/365/24
-f 200/327/22 201/325/22 198/328/22
+f 224/367/27 225/365/27 222/368/27
-f 196/330/22 197/334/22 194/331/22
+f 220/370/27 221/374/27 218/371/27
-f 192/333/19 194/340/19 197/334/19
+f 216/373/24 218/380/24 221/374/24
-f 191/336/20 196/330/20 195/337/20
+f 215/376/25 220/370/25 219/377/25
-f 193/335/21 197/334/21 196/330/21
+f 217/375/26 221/374/26 220/370/26
-f 190/339/18 195/441/18 194/340/18
+f 214/379/23 219/481/23 218/380/23
-f 187/341/20 200/327/20 199/342/20
+f 211/381/25 224/367/25 223/382/25
-f 185/326/21 201/325/21 200/327/21
+f 209/366/26 225/365/26 224/367/26
-f 188/344/18 199/442/18 198/345/18
+f 212/384/23 223/482/23 222/385/23
-f 203/346/19 214/367/19 217/347/19
+f 227/386/24 238/407/24 241/387/24
-f 216/349/22 217/347/22 214/350/22
+f 240/389/27 241/387/27 238/390/27
-f 212/352/22 213/356/22 210/353/22
+f 236/392/27 237/396/27 234/393/27
-f 208/355/19 210/362/19 213/356/19
+f 232/395/24 234/402/24 237/396/24
-f 207/358/20 212/352/20 211/359/20
+f 231/398/25 236/392/25 235/399/25
-f 209/357/21 213/356/21 212/352/21
+f 233/397/26 237/396/26 236/392/26
-f 206/361/18 211/443/18 210/362/18
+f 230/401/23 235/483/23 234/402/23
-f 204/363/20 216/349/20 215/364/20
+f 228/403/25 240/389/25 239/404/25
-f 202/348/21 217/347/21 216/349/21
+f 226/388/26 241/387/26 240/389/26
-f 205/366/18 215/444/18 214/367/18
+f 229/406/23 239/484/23 238/407/23
-f 218/368/22 220/372/22 219/369/22
+f 242/408/27 244/412/27 243/409/27
-f 218/368/23 221/373/23 222/371/23
+f 242/408/28 245/413/28 246/411/28
-f 221/373/21 223/445/21 224/374/21
+f 245/413/26 247/485/26 248/414/26
-f 219/369/24 226/376/24 225/375/24
+f 243/409/29 250/416/29 249/415/29
-f 226/376/18 228/446/18 227/377/18
+f 250/416/23 252/486/23 251/417/23
-f 230/378/22 232/382/22 231/379/22
+f 254/418/27 256/422/27 255/419/27
-f 230/378/23 233/383/23 234/381/23
+f 254/418/28 257/423/28 258/421/28
-f 233/383/21 235/447/21 236/384/21
+f 257/423/26 259/487/26 260/424/26
-f 231/379/24 238/386/24 237/385/24
+f 255/419/29 262/426/29 261/425/29
-f 238/386/18 240/448/18 239/387/18
+f 262/426/23 264/488/23 263/427/23
-f 193/335/17 191/336/17 190/388/17
+f 217/375/22 215/376/22 214/428/22
-f 209/357/17 207/358/17 206/390/17
+f 233/397/22 231/398/22 230/430/22
-f 204/363/17 205/449/17 203/392/17
+f 228/403/22 229/489/22 227/432/22
-f 187/341/17 188/450/17 186/393/17
+f 211/381/22 212/490/22 210/433/22
-f 242/394/21 241/451/21 243/395/21
+f 266/434/26 265/491/26 267/435/26
-f 244/396/25 243/395/25 250/397/25
+f 268/436/30 267/435/30 274/437/30
-f 245/399/18 246/452/18 248/400/18
+f 269/439/23 270/492/23 272/440/23
-f 247/401/26 248/400/26 251/402/26
+f 271/441/31 272/440/31 275/442/31
-f 250/397/17 249/403/17 251/402/17
+f 274/437/22 273/443/22 275/442/22
-f 254/404/21 253/453/21 255/405/21
+f 278/444/26 277/493/26 279/445/26
-f 256/406/25 255/405/25 262/407/25
+f 280/446/30 279/445/30 286/447/30
-f 257/409/18 258/454/18 260/410/18
+f 281/449/23 282/494/23 284/450/23
-f 259/411/26 260/410/26 263/412/26
+f 283/451/31 284/450/31 287/452/31
-f 262/407/17 261/413/17 263/412/17
+f 286/447/22 285/453/22 287/452/22